.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: inputmice
+liberapay: inputmice
+custom: https://gultsch.de/donate.html

.github/workflows/android.yml

@@ -1,38 +0,0 @@
-name: Android CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Download WebRTC
-      run: mkdir libs && wget -O libs/libwebrtc-m92.aar https://gultsch.de/files/libwebrtc-m92.aar
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build Quicksy (Compat)
-      run: ./gradlew assembleQuicksyFreeCompatDebug
-    - name: Build Quicksy (System)
-      run: ./gradlew assembleQuicksyFreeSystemDebug
-    - name: Build Conversations (Compat)
-      run: ./gradlew assembleConversationsFreeCompatDebug
-    - name: Build Conversations (System)
-      run: ./gradlew assembleConversationsFreeSystemDebug
-    - uses: actions/upload-artifact@v2
-      with:
-        name: Conversations all-flavors (debug)
-        path: ./build/outputs/apk/**/debug/Conversations-*.apk
-
-      

.gitlab-ci.yml

@@ -1,54 +0,0 @@
-image: registry.gitlab.com/fdroid/ci-images-client:latest
-
-cache:
-  paths:
-    - .gradle/wrapper
-    - .gradle/caches
-
-stages:
-  - build
-
-before_script:
-  - export GRADLE_USER_HOME=$PWD/.gradle
-  - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle`
-  - echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
-
-build:
-  stage: build
-  except:
-  - develop
-  script:
-  - ./gradlew assembleConversationsFreeCompatDebug
-  artifacts:
-    paths:
-    - build/outputs/
-
-publish:
-  stage: build
-  only:
-  - develop
-  script:
-  - find -type d -name "siacs" -print0 | xargs --null -I{} bash -c 'x="{}"; mv "$x" "${x/siacs/sum7}" '
-  - find -type f -name "*.java" -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \;
-  - find -type f -name "*.xml"  -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \;
-  # workaround for bug in fdroid nightly
-  - sed -i "s/-debug.apk/-unsigned.apk/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
-  - sed -i "s/servergitmirror = 'git@' +/servergitmirror = 'gitlab@' +/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
-  - sed -i "s/git@/gitlab@/" /usr/lib/python3/dist-packages/fdroidserver/index.py
-  # generate new version
-  - export versionCode="$CI_JOB_ID"
-  - export versionName="$(git describe --tag --abbrev=0)-${CI_JOB_ID}_${CI_COMMIT_REF_NAME}"
-  - echo "set VersionCode '${versionCode}' and VersonName '${versionName}'"
-  - sed -i "s/^\(\s*versionCode\s*\).*$/\1$versionCode/" build.gradle
-  - sed -i "0,/versionName/s/^\(\s*versionName\).*/\1 \"$versionName\"/" build.gradle
-  - cat -n build.gradle
-  # build free version
-  - ./gradlew assembleConversationsFreeCompatRelease
-  - ls build/outputs/apk/conversationsFreeCompat/*
-  # publish on nightly fdroid repo
-  - fdroid nightly -v
-
-after_script:
-  # this file changes every time but should not be cached
-  - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
-  - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/

.travis.yml

@@ -0,0 +1,22 @@
+language: android
+jdk:
+  - oraclejdk8
+android:
+  components:
+    - platform-tools
+    - tools
+    - build-tools-28.0.3
+    - extra-google-google_play_services
+  licenses:
+    - '.+'
+before_script:
+    - mkdir libs
+    - wget -O libs/libwebrtc-m90.aar https://gultsch.de/files/libwebrtc-m90.aar
+script:
+    - ./gradlew assembleQuicksyFreeCompatDebug
+    - ./gradlew assembleQuicksyFreeSystemDebug
+    - ./gradlew assembleConversationsFreeCompatDebug
+    - ./gradlew assembleConversationsFreeSystemDebug
+
+before_install:
+    - yes | sdkmanager "platforms;android-28"

CHANGELOG.md

@@ -1,21 +1,5 @@
 # Changelog
 
-### Version 2.10.2
-
-* Fix crash when rendering some quotes
-* Fix crash in welcome screen
-
-### Version 2.10.1
-
-* Fix issue with some videos not being compressed
-* Fix rare crash when opening notification
-
-### Version 2.10.0
-
-* Show black bars when remote video does not match aspect ratio of screen
-* Improve search performance
-* Add setting to prevent screenshots
-
 ### Version 2.9.13
 
 * minor A/V improvements

README.md

@@ -1,36 +1,25 @@
-<h1 align="center">Conv6ations for Sum7 is a fork of <a href="https://f-droid.org/packages/eu.siacs.conversations/">Conversations</a></h1>
+<h1 align="center">Conversations</h1>
 
-<p align="center">A Jabber/XMPP chat client which is fair to IPv6</p>
+<p align="center">Conversations: the very last word in instant messaging</p>
 
 <p align="center">
-  <a href="https://conversations.im/j/support@conference.chat.sum7.eu">
+    <a href="https://conversations.im/j/conversations@conference.siacs.eu">
-    <img src="https://inverse.chat/badge.svg?room=support@conference.chat.sum7.eu"
+        <img src="https://inverse.chat/badge.svg?room=conversations@conference.siacs.eu"
              alt="chat on our conference room">
     </a>
-  <a href="https://dev.sum7.eu/sum7/Conversations/pipelines">
+    <a href="https://travis-ci.org/inputmice/Conversations">
-    <img src="https://dev.sum7.eu/sum7/Conversations/badges/develop/pipeline.svg"
+        <img src="https://travis-ci.org/inputmice/Conversations.svg?branch=master"
              alt="build status">
     </a>
-</a>
-<p align="center">
-  <img src="metadata/en-US/phoneScreenshots/1.jpg" width="19%" alt="screenshot 1"/>
-  <img src="metadata/en-US/phoneScreenshots/2.jpg" width="19%" alt="screenshot 2"/>
-  <img src="metadata/en-US/phoneScreenshots/3.jpg" width="19%" alt="screenshot 3"/>
-  <img src="metadata/en-US/phoneScreenshots/4.jpg" width="19%" alt="screenshot 4"/>
-  <img src="metadata/en-US/phoneScreenshots/5.jpg" width="19%" alt="screenshot 5"/>
 </p>
 
-[<img src="https://f-droid.org/badge/get-it-on.png"
+<p align="center">
-      alt="Get it on F-Droid"
+    <a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations&amp;referrer=utm_source%3Dgithub">
-      height="80">](https://f-droid.org/en/packages/eu.sum7.conversations)
+       <img src="https://conversations.im/images/en-play-badge.png" alt="Google Play">
-
+    </a>
-### Nightly:
+</p>
-[![https://dev.sum7.eu/sum7/Conversations-nightly/raw/master/fdroid/repo](https://dev.sum7.eu/sum7/Conversations-nightly/raw/master/icon.png)](https://dev.sum7.eu/sum7/Conversations-nightly/raw/master/fdroid/repo)
-
-## Changes to origin:
-* replace the hardcoded IPv4 preference to easy Happy Eyeball, for faster connection and fair to both IP version.
-* rebrands it as chat.sum7.eu (to run both version together)
 
+![screenshots](https://raw.githubusercontent.com/inputmice/Conversations/master/screenshots.png)
 
 ## Design principles
 
@@ -96,8 +85,23 @@ Conversations is entirely open source and licensed under GPLv3. So if you are a
 software developer you can check out the sources from GitHub and use Gradle to
 build your apk file.
 
+The more convenient way — which not only gives you automatic updates but also
+supports the further development of Conversations — is to buy the App in the
+Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations&referrer=utm_source%3Dgithub).
+
+Buying the App from the Play Store will also give you access to our [beta test](#beta).
+
+#### I don't have a Google Account but I would still like to make a donation
+
+I’m listing several options to support me financially on [my website](https://gultsch.de/donate.html). Among other things [Liberapay](https://liberapay.com/iNPUTmice/donate), [GitHub Sponsors](https://github.com/sponsors/inputmice) and bank transfer.
+
 #### How do I create an account?
-XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [chat.sum7.eu](https://chat.sum7.eu). If you don’t like to use *chat.sum7.eu* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.
+XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.
+
+##### Domain hosting
+Using your own domain not only gives you a more recognizable Jabber ID, it also gives you the flexibility to migrate your account between different XMPP providers. This is a good compromise between the responsibilities of having to operate your own server and the downsides of being dependent on a single provider.
+
+Learn more about [conversations.im Jabber/XMPP domain hosting](https://account.conversations.im/domain/). 
 
 ##### Running your own
 If you already have a server somewhere and are willing and able to put the necessary work in you can run your own XMPP server.
@@ -177,12 +181,16 @@ FCM (Google Push) allows an app to wake up from *Doze* which is (as the name sug
 
 #### Conversations doesn’t work for me. Where can I get help?
 
-You can join our conference room on [`support@conference.chat.sum7.eu`](https://conversations.im/j/support@conference.chat.sum7.eu).
+You can join our conference room on [`conversations@conference.siacs.eu`](https://conversations.im/j/conversations@conference.siacs.eu).
 A lot of people in there are able to answer basic questions about the usage of
 Conversations or can provide you with tips on running your own XMPP server. If
 you found a bug or your app crashes please read the Developer / Report Bugs
 section of this document.
 
+#### I need professional support with Conversations or setting up my server
+
+I'm available for hire. Contact information can be found on [my website](https://gultsch.de).
+
 #### How does the address book integration work?
 
 The address book integration was designed to protect your privacy. Conversations
@@ -292,6 +300,10 @@ will it accelerate the development.
 Just write it yourself and send me a pull request. If I like it I will happily
 merge it if I don't at least you and like minded people get to enjoy it.
 
+#### I need a feature and I need it now!
+
+I am available for hire. Find contact information on [my website](https://gultsch.de).
+
 ### Security
 
 #### Why are there two end-to-end encryption methods and which one should I choose?
@@ -366,12 +378,17 @@ Unfortunately we don‘t have a recommendation for iPhones right now. There are
 
 ### Development
 
+<a name="beta"></a>
+#### Beta testing
+If you bought the App on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations)
+you can get access to the the latest beta version by signing up using [this link](https://play.google.com/apps/testing/eu.siacs.conversations).
+
 #### How do I build Conversations
 
 **Note:** Starting with version 2.8.0 you will need to compile libwebrtc.
 [Instructions](https://webrtc.github.io/webrtc-org/native-code/android/) can be found on the WebRTC
 website. Place the resulting libwebrtc.aar in the `libs/` directory. The PlayStore release currently
-uses the stable M90 release and renamed the file name to `libwebrtc-m90.aar` put potentially you can
+uses the stable M81 release and renamed the file name to `libwebrtc-m81.aar` put potentially you can
 reference any file name by modifying `build.gradle`.
 
 Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Manager to install missing dependencies.
@@ -383,7 +400,7 @@ Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Ma
 There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*.
 
 
-[![Build Status](https://dev.sum7.eu/sum7/Conversations/badges/develop/build.svg)](https://dev.sum7.eu/sum7/Conversations/pipelines)
+[![Build Status](https://travis-ci.org/inputmice/Conversations.svg?branch=development)](https://travis-ci.org/inputmice/Conversations)
 
 #### How do I debug Conversations
 
@@ -400,7 +417,7 @@ Debian/Ubuntu for example it is called `android-tools-adb`.
 Furthermore you might have to enable 'USB debugging' in the Developer options of your
 phone. After that you can just execute the following on your computer:
 
-    adb -d logcat -v time -s conver6ations
+    adb -d logcat -v time -s conversations
 
 If need be there are also some Apps on the PlayStore that can be used to show the logcat
 directly on your rooted phone. (Search for logcat). However in regards to further processing
@@ -415,4 +432,4 @@ Play Store version or the current HEAD. If you are having problems connecting to
 your XMPP server your file transfer doesn’t work as expected please always
 include a logcat debug output with your issue (see above).
 
-[issues]: https://dev.sum7.eu/sum7/Conversations/issues
+[issues]: https://github.com/inputmice/Conversations/issues

art/date_bubble_grey.svg

@@ -155,9 +155,9 @@
        inkscape:connector-curvature="0"
        id="path3805"
        d="m 8,8 c 2,2 4,6 4,10 L 16,8 Z"
-       style="display:none;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)" />
+       style="display:none;fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)" />
     <rect
-       style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)"
+       style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)"
        id="rect2987"
        width="20"
        height="20"

art/ic_launcher.svg

@@ -147,15 +147,15 @@
          inkscape:export-xdpi="100"
          transform="matrix(0.3835576,0,0,0.3835576,-246.60108,-156.11013)"
          id="g5317"
-         style="display:inline;fill:#EF6C00;fill-opacity:1">
+         style="display:inline;fill:#00a000;fill-opacity:1">
         <path
-           style="display:inline;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           style="display:inline;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 1120.8042,772.36056 -118.0025,103.66316 118.5792,46.01918 c 8.4859,3.29325 19.6524,7.94481 27.2622,0.71376 7.3868,-7.01907 5.6502,-14.13839 3.0935,-24.54095 z"
            id="path5319"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccsssc" />
         <circle
-           style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="circle5321"
            cx="883.16943"
            cy="677.19611"
@@ -171,7 +171,7 @@
          inkscape:connector-curvature="0"
          id="path6884"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -180,7 +180,7 @@
          inkscape:connector-curvature="0"
          id="path6888"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -189,7 +189,7 @@
          inkscape:connector-curvature="0"
          id="path6892"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -198,7 +198,7 @@
          inkscape:connector-curvature="0"
          id="path6896"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -207,7 +207,7 @@
          inkscape:connector-curvature="0"
          id="path6900"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -216,7 +216,7 @@
          inkscape:connector-curvature="0"
          id="path6904"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -225,7 +225,7 @@
          inkscape:connector-curvature="0"
          id="path6908"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -234,7 +234,7 @@
          inkscape:connector-curvature="0"
          id="path6912"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <filter
        inkscape:collect="always"
@@ -256,7 +256,7 @@
          inkscape:connector-curvature="0"
          id="path5747"
          d="M 99.908581,-2.3831968e-4 A 95.889392,95.889392 0 0 0 4.0199102,95.888436 95.889392,95.889392 0 0 0 99.908581,191.77906 95.889392,95.889392 0 0 0 142.61366,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 183.8285,142.24002 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.79921,95.888466 95.889392,95.889392 0 0 0 99.908581,-2.0831968e-4 Z"
-         style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
   </defs>
   <metadata
@@ -290,7 +290,7 @@
      inkscape:groupmode="layer"
      transform="translate(-4,2.6816348)">
     <path
-       style="display:inline;opacity:1;fill:#EF6C00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 104.88867,-1.9377566 A 95.889392,95.889392 0 0 0 8.9999996,93.950918 95.889392,95.889392 0 0 0 104.88867,189.84154 95.889392,95.889392 0 0 0 147.59375,179.76341 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 188.80859,140.3025 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 200.7793,93.950948 95.889392,95.889392 0 0 0 104.88867,-1.9377266 Z"
        id="circle6661"
        inkscape:connector-curvature="0" />
@@ -313,7 +313,7 @@
      style="display:inline"
      transform="translate(-4,2.6816164)">
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6910)"
        d="m 145.16406,11.183594 -5.13232,9.649402 c -0.77924,1.465076 -0.65974,2.41396 0.66876,3.18097 9.66686,5.488467 18.12303,12.874168 24.86104,21.711122 1.05534,1.616079 2.08054,1.713076 3.67763,0.571565 L 178.04883,40 C 169.45271,27.990203 158.19857,18.128379 145.16406,11.183594 Z"
        id="path7364"
@@ -321,7 +321,7 @@
        sodipodi:nodetypes="csccscc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6906)"
        d="m 193.80469,75.615234 -9.62713,2.062751 c -2.66266,0.570512 -3.40763,1.172953 -2.90593,3.917433 0.85823,4.714633 1.30424,9.497137 1.33189,14.293254 -0.028,5.578758 -0.62194,11.137108 -1.77093,16.589918 -0.86591,3.23162 0.13682,3.77092 3.16149,4.58138 l 8.98639,2.30136 c 1.98177,-7.66828 3.00584,-15.55255 3.04883,-23.472658 -0.0187,-6.817681 -0.76446,-13.613926 -2.22461,-20.273438 z"
        id="path7366"
@@ -329,7 +329,7 @@
        sodipodi:nodetypes="csccccccc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6902)"
        d="m 14.264281,102.76512 -10.2076406,0.87943 c 1.2093798,14.83154 5.8540346,29.17808 13.5664056,41.90429 l 8.544301,-5.23239 c 2.394983,-1.46665 1.895406,-3.37834 0.986202,-5.04513 -5.118253,-9.40257 -8.359018,-19.71635 -9.536202,-30.36553 0,-2.09418 -1.881577,-2.26744 -3.353066,-2.14067 z"
        id="path7372"
@@ -337,7 +337,7 @@
        sodipodi:nodetypes="sccsccs"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6898)"
        d="m 51.504371,166.60235 -5.82273,8.50898 c 12.710503,8.71282 27.333669,14.23394 42.630859,16.0957 l 1.220329,-9.90843 c 0.355066,-2.88295 -1.085712,-3.52946 -3.332252,-3.90256 -10.402329,-1.73697 -20.373956,-5.45322 -29.373754,-10.94516 -1.647505,-1.06744 -3.639993,-2.30718 -5.322452,0.15147 z"
        id="path7370"
@@ -345,7 +345,7 @@
        sodipodi:nodetypes="sccsccs"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6894)"
        d="M 32.208984,27.683594 C 21.779177,38.079001 13.883707,50.736882 9.1347656,64.675781 L 19.33617,68.090365 c 1.658147,0.55501 2.832564,-0.120955 3.374272,-1.591979 3.777598,-10.021698 9.470788,-19.210103 16.759132,-27.052307 1.561136,-1.561136 1.567283,-2.960058 0.447507,-4.076606 z"
        id="path7374"
@@ -353,7 +353,7 @@
        sodipodi:nodetypes="ccsccsc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6890)"
        d="M 99.888672,-0.25 C 87.701045,-0.2239408 75.630114,2.1252837 64.322266,6.671875 l 3.530435,8.74898 c 1.063314,2.635062 1.616754,3.526314 4.973913,2.352259 8.692057,-3.031338 17.839027,-4.588849 27.062058,-4.599286 5.555828,0 6.486278,0.350026 6.780788,-3.4460223 l 0.74851,-9.64772758 C 104.9135,-0.12857239 102.40179,-0.23868346 99.888672,-0.25 Z"
        id="path7376"
@@ -361,7 +361,7 @@
        sodipodi:nodetypes="ccsccscc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="display:inline;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6886)"
        d="m 138.72416,168.48439 c -4.17634,2.25458 -8.55959,4.09055 -13.0504,5.63418 -1.00363,0.34498 -1.20742,1.18222 -0.8682,2.27372 l 3.44056,11.0706 c 4.92985,-1.53124 9.72799,-3.45808 14.34766,-5.76172 l 0.12695,0.0137 14.0293,5.44532 4.12174,-10.20577 c 0.7548,-1.86894 -0.0184,-2.7016 -1.59462,-3.31324 l -14.72114,-5.71251 c -1.86679,-0.7244 -3.68834,-0.60144 -5.83185,0.55572 z"
        id="path5005"
@@ -369,7 +369,7 @@
        sodipodi:nodetypes="cssccccsssc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="display:inline;fill:#FF9800;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6882)"
        d="m 186.53125,152.80469 -10.6386,2.70888 c -0.78879,0.20085 -1.67397,1.02386 -1.35494,2.33801 l 9.75918,40.15428 c 8.56713,5.97538 15.30408,3.06731 11.01563,-9.47266 z"
        id="path5071"

art/logo.png

@@ -1 +0,0 @@
-new_logo.png

art/marker.svg

@@ -94,7 +94,7 @@
   <path
      d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
      id="path4"
-     style="fill:#EF6C00;fill-opacity:1;stroke:none;stroke-opacity:0.53333336;stroke-width:1.70000002;stroke-miterlimit:4;stroke-dasharray:none" />
+     style="fill:#00a000;fill-opacity:1;stroke:none;stroke-opacity:0.53333336;stroke-width:1.70000002;stroke-miterlimit:4;stroke-dasharray:none" />
   <path
      style="display:inline;opacity:0.19211821;fill:url(#radialGradient3883);fill-opacity:1;stroke:none"
      d="m 53.884912,1.7373006 c -18.322492,0 -33.173092,14.5823714 -33.173092,32.5686504 0,3.794038 0.661899,7.436601 1.877335,10.821463 1.505391,0.209531 3.044508,0.317391 4.607513,0.317391 5.584539,0 9.890238,-1.147853 14.805425,-2.934259 l 15.611481,6.295152 a 2.0568126,2.0577227 0 0 0 2.766588,-2.403594 l -4.227888,-17.09591 c 2.717518,-4.771967 3.645449,-10.205846 3.645449,-15.810885 0,-4.0761111 -0.781533,-7.9714274 -2.20495,-11.5551094 -1.217366,-0.132888 -2.454715,-0.202899 -3.707861,-0.202899 z"

art/message_bubble_received.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#FF9800;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#4d8e50;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"

art/message_bubble_received_dark.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#BF360C;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#295e2d;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"

art/message_bubble_received_grey.svg

@@ -140,9 +140,9 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#282828;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
-         style="display:none;fill:#282828;fill-opacity:1"
+         style="display:none;fill:#424242;fill-opacity:1"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
          id="path3805"
          inkscape:connector-curvature="0"
@@ -153,7 +153,7 @@
          id="path2989"
          d="M 4,4 16,16 16,4 z"
          sodipodi:nodetypes="cccc"
-         style="fill:#282828;fill-opacity:1" />
+         style="fill:#424242;fill-opacity:1" />
       <rect
          ry="2"
          y="4"
@@ -161,7 +161,7 @@
          height="20"
          width="20"
          id="rect2987"
-         style="fill:#282828;fill-opacity:1" />
+         style="fill:#424242;fill-opacity:1" />
     </g>
   </g>
 </svg>

art/message_bubble_sent_grey.svg

@@ -140,9 +140,9 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#282828;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
-         style="display:none;fill:#282828;fill-opacity:1"
+         style="display:none;fill:#424242;fill-opacity:1"
          d="M 28,18 C 26,16 24,12 24,8 l -4,10 z"
          id="path3809"
          inkscape:connector-curvature="0"
@@ -153,7 +153,7 @@
          id="path2989"
          d="m 20,12 0,12 12,0 z"
          sodipodi:nodetypes="cccc"
-         style="fill:#282828;fill-opacity:1" />
+         style="fill:#424242;fill-opacity:1" />
       <rect
          ry="2"
          y="4"
@@ -161,7 +161,7 @@
          height="20"
          width="20"
          id="rect2987"
-         style="fill:#282828;fill-opacity:1" />
+         style="fill:#424242;fill-opacity:1" />
     </g>
   </g>
 </svg>

build.gradle

@@ -1,12 +1,14 @@
+import com.android.build.OutputFile
+
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
 buildscript {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 
@@ -14,8 +16,8 @@ apply plugin: 'com.android.application'
 
 repositories {
     google()
-    mavenCentral()
     jcenter()
+    mavenCentral()
 }
 
 configurations {
@@ -33,23 +35,23 @@ configurations {
 dependencies {
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:22.0.0') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:21.0.1') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
     conversationsPlaystoreCompatImplementation("com.android.installreferrer:installreferrer:2.2")
     conversationsPlaystoreSystemImplementation("com.android.installreferrer:installreferrer:2.2")
-    quicksyPlaystoreCompatImplementation 'com.google.android.gms:play-services-auth-api-phone:17.5.1'
+    quicksyPlaystoreCompatImplementation 'com.google.android.gms:play-services-auth-api-phone:17.5.0'
-    quicksyPlaystoreSystemImplementation 'com.google.android.gms:play-services-auth-api-phone:17.5.1'
+    quicksyPlaystoreSystemImplementation 'com.google.android.gms:play-services-auth-api-phone:17.5.0'
     implementation 'org.sufficientlysecure:openpgp-api:10.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation 'androidx.exifinterface:exifinterface:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.emoji:emoji:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.3.0'
     compatImplementation 'androidx.emoji:emoji-appcompat:1.1.0'
     conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
     quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
@@ -62,23 +64,21 @@ dependencies {
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation "com.wefika:flowlayout:0.4.1"
-    implementation 'com.otaliastudios:transcoder:0.10.4'
+    implementation 'net.ypresto.androidtranscoder:android-transcoder:0.3.0'
-
+    implementation 'org.jxmpp:jxmpp-jid:0.6.4'
-    implementation 'org.jxmpp:jxmpp-jid:1.0.2'
     implementation 'org.osmdroid:osmdroid-android:6.1.10'
     implementation 'org.hsluv:hsluv:0.2'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+    implementation 'org.conscrypt:conscrypt-android:2.2.1'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
-    implementation "com.leinardi.android:speed-dial:3.2.0"
+    implementation "com.leinardi.android:speed-dial:2.0.1"
 
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-    implementation "com.squareup.okhttp3:okhttp:4.9.2"
+    implementation "com.squareup.okhttp3:okhttp:4.9.1"
 
-    implementation 'com.google.guava:guava:30.1.1-android'
+    implementation 'com.google.guava:guava:30.1-android'
-    quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.36'
+    quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.18'
-    // implementation fileTree(include: ['libwebrtc-m92.aar'], dir: 'libs')
+    implementation fileTree(include: ['libwebrtc-m90.aar'], dir: 'libs')
-    implementation 'org.webrtc:google-webrtc:1.0.32006'
 }
 
 ext {
@@ -93,25 +93,37 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 4202301
+        versionCode 42015
-        versionName "2.10.2"
+        versionName "2.9.13"
         archivesBaseName += "-$versionName"
-        applicationId "eu.sum7.conversations"
+        applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
-        def appName = "Conv6ations"
+        def appName = "Conversations"
         resValue "string", "app_name", appName
         buildConfigField "String", "APP_NAME", "\"$appName\"";
     }
 
+    splits {
+        abi {
+            universalApk true
+            enable true
+        }
+    }
 
     configurations {
-        implementation.exclude group: 'org.jetbrains' , module:'annotations'
+        compile.exclude group: 'org.jetbrains' , module:'annotations'
     }
 
     dataBinding {
         enabled true
     }
 
+    dexOptions {
+        // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
+        preDexLibraries = preDexEnabled && !travisBuild
+        jumboMode true
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -137,15 +149,19 @@ android {
 
         playstore {
             dimension "distribution"
+            versionNameSuffix "+p"
         }
         free {
             dimension "distribution"
+            versionNameSuffix "+f"
         }
         system {
             dimension "emoji"
+            versionNameSuffix "s"
         }
         compat {
             dimension "emoji"
+            versionNameSuffix "c"
         }
     }
 
@@ -215,11 +231,13 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            versionNameSuffix "r"
         }
         debug {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            versionNameSuffix "d"
         }
     }
 
@@ -240,8 +258,7 @@ android {
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource'
+        disable 'MissingTranslation', 'InvalidPackage','AppCompatResource'
-        abortOnError false
     }
 
     subprojects {
@@ -262,4 +279,14 @@ android {
         exclude 'META-INF/BCKEY.DSA'
         exclude 'META-INF/BCKEY.SF'
     }
+
+    android.applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+            if (baseAbiVersionCode != null) {
+                output.versionCodeOverride = (100 * variant.versionCode) + baseAbiVersionCode
+            }
+        }
+
+    }
 }

conversations.doap

@@ -453,19 +453,12 @@
             <xmpp:version>0.2.0</xmpp:version>
         </xmpp:SupportedXep>
     </implements>
-    <implements>
-        <xmpp:SupportedXep>
-            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0454.html"/>
-            <xmpp:status>complete</xmpp:status>
-            <xmpp:version>0.1.0</xmpp:version>
-        </xmpp:SupportedXep>
-    </implements>
 
     <release>
         <Version>
-            <revision>2.9.13</revision>
+            <revision>2.5.8</revision>
-            <created>2021-05-03</created>
+            <created>2019-09-12</created>
-            <file-release rdf:resource="https://github.com/iNPUTmice/Conversations/archive/2.9.13.tar.gz"/>
+            <file-release rdf:resource="https://github.com/iNPUTmice/Conversations/archive/2.5.8.tar.gz"/>
         </Version>
     </release>
 </Project>

fastlane/metadata/android/en-US/changelogs/349.txt

@@ -0,0 +1,4 @@
+* Introduce expert setting to perform channel discovery on local server instead of search.jabber.network
+* Enable delivery check marks by default and remove setting
+* Enable ‘Send button indicates status’ by default and remove setting
+* Move Backup and Foreground Service settings to main screen

fastlane/metadata/android/en-US/changelogs/351.txt

@@ -0,0 +1,3 @@
+* fixes for Jingle IBB file transfer
+* fixes for repeated corrections filling up the database
+* switched to Last Message Correction v1.1

fastlane/metadata/android/en-US/changelogs/353.txt

@@ -0,0 +1,4 @@
+* let users set their own nick name
+* resume download of OMEMO encrypted files
+* Channels now use '#' as symbol in avatar
+* Quicksy uses 'always' as OMEMO encryption default (hides lock icon)

fastlane/metadata/android/en-US/changelogs/360.txt

@@ -0,0 +1 @@
+* Support for ?register and ?register;preauth XMPP uri parameters

fastlane/metadata/android/en-US/changelogs/362.txt

@@ -0,0 +1 @@
+* Support automatic theme switching on Android 10

fastlane/metadata/android/en-US/changelogs/364.txt

@@ -0,0 +1,2 @@
+* Provide PDF preview on Android 5+
+* Use 12 byte IVs for OMEMO

fastlane/metadata/android/en-US/changelogs/367.txt

@@ -0,0 +1,2 @@
+* Fix avatar selection on some Android 10 devices
+* Fix file transfer for larger files

fastlane/metadata/android/en-US/changelogs/379.txt

@@ -0,0 +1 @@
+* Audio/Video calls (Requires server support in form of STUN and TURN servers discoverable via XEP-0215)

fastlane/metadata/android/en-US/changelogs/381.txt

@@ -0,0 +1,2 @@
+* Audible feedback (dialing, call started, call ended) for voice calls.
+* Fixed issue with retrying failed video call

fastlane/metadata/android/en-US/changelogs/382.txt

@@ -0,0 +1,2 @@
+* Add button to switch camea during video call
+* Fixed voice calls on tablets

fastlane/metadata/android/en-US/changelogs/383.txt

@@ -0,0 +1,3 @@
+* Move call icon to the left in order to keep other toolbar icons in a consistent place
+* Show call duration during audio calls
+* Tie breaking for A/V calls (the same two people calling each other at the same time)

fastlane/metadata/android/en-US/changelogs/387.txt

@@ -0,0 +1,2 @@
+* Rework Login with certificate UI
+* Add ability to pin chats on top (add to favorites)

fastlane/metadata/android/en-US/changelogs/388.txt

@@ -0,0 +1,3 @@
+* Reduce echo during calls on some devices
+* Fix login when passwords contains special characters
+* Play dial and busy tones on speaker during video calls

fastlane/metadata/android/en-US/changelogs/390.txt

@@ -0,0 +1 @@
+* Offer to record voice message when callee is busy

fastlane/metadata/android/en-US/changelogs/393.txt

@@ -0,0 +1,3 @@
+* Show help button if A/V call fails
+* Fixed some annoying crashes
+* Fixed Jingle connections (file transfer + calls) with bare JIDs

fastlane/metadata/android/en-US/changelogs/394.txt

@@ -0,0 +1,2 @@
+* Fixed notifications not showing up under certain conditions
+* Fixed compatibility issues and crashes related to A/V calls

fastlane/metadata/android/en-US/changelogs/395.txt

@@ -0,0 +1,3 @@
+* add 'Return to chat' to audio call screen
+* Improve keyboard shortcuts
+* bug fixes

fastlane/metadata/android/en-US/changelogs/397.txt

@@ -0,0 +1,3 @@
+* Handle GPX files
+* Improve performance for backup restore
+* bug fixes

fastlane/metadata/android/en-US/changelogs/398.txt

@@ -0,0 +1,4 @@
+* Search individual conversations
+* Notify user if message delivery fails
+* Remember display names (nicks) from Quicksy users across restarts
+* Add button to start Orbot (Tor) from notification if necessary

fastlane/metadata/android/en-US/changelogs/401.txt

@@ -0,0 +1,3 @@
+* fixed search on Android <= 5
+* optimize memory consumption
+

fastlane/metadata/android/en-US/changelogs/402.txt

@@ -0,0 +1,3 @@
+* Offer Easy Invite generation on supporting servers
+* Display GIFs send from Movim
+* store avatars in cache

fastlane/metadata/android/en-US/changelogs/403.txt

@@ -0,0 +1,3 @@
+* Fixed connectivity issues when different accounts used different SCRAM mechanisms
+* Add support for SCRAM-SHA-512
+* Allow P2P (Jingle) file transfer with self contact

fastlane/metadata/android/en-US/changelogs/404.txt

@@ -0,0 +1 @@
+* minor stability improvements for A/V calls

fastlane/metadata/android/en-US/changelogs/405.txt

@@ -0,0 +1 @@
+* Quicksy: Automatically receive verification SMS

fastlane/metadata/android/en-US/changelogs/407.txt

@@ -0,0 +1,3 @@
+* Show call button for offline contacts if they previously announced support
+* Back button no longer ends call when call is connected
+* bug fixes

fastlane/metadata/android/en-US/changelogs/42000.txt

@@ -0,0 +1,4 @@
+* Ability to select incoming call ringtone
+* Fix OpenPGP key id discovery for OpenKeychain 5.6+
+* Properly verify punycode TLS certificates
+* Improve stability of RTP session establishment (calling)

fastlane/metadata/android/en-US/changelogs/42006.txt

@@ -0,0 +1,2 @@
+* Verify A/V calls with preexisting OMEMO sessions
+* Improve compatibility with non libwebrtc WebRTC implementations

fastlane/metadata/android/en-US/changelogs/42010.txt

@@ -0,0 +1,2 @@
+* Various bug fixes around Tor support
+* Improve call compatibility with Dino

fastlane/metadata/android/en-US/changelogs/42012.txt

@@ -0,0 +1 @@
+* fix HTTP up/download for users that don’t trust system CAs

fastlane/metadata/android/en-US/changelogs/42013.txt

@@ -0,0 +1 @@
+* Fixed 'No Connectivity' issues on Android 7.1

fastlane/metadata/android/en-US/changelogs/42014.txt

@@ -0,0 +1,2 @@
+* Always verify domain name. No user overwrite
+* Support roster pre authentication

fastlane/metadata/android/en-US/changelogs/42015.txt

@@ -0,0 +1 @@
+* minor A/V improvements 

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,39 @@
+Easy to use, reliable, battery friendly. With built-in support for images, group chats and e2e encryption.
+
+Design principles:
+
+* Be as beautiful and easy to use as possible without sacrificing security or privacy
+* Rely on existing, well established protocols
+* Do not require a Google Account or specifically Google Cloud Messaging (GCM)
+* Require as few permissions as possible
+
+Features:
+
+* End-to-end encryption with either <a href="http://conversations.im/omemo/">OMEMO</a> or <a href="http://openpgp.org/about/">OpenPGP</a>
+* Sending and receiving images
+* Encrypted audio and video calls (DTLS-SRTP)
+* Intuitive UI that follows Android Design guidelines
+* Pictures / Avatars for your Contacts
+* Syncs with desktop client
+* Conferences (with support for bookmarks)
+* Address book integration
+* Multiple accounts / unified inbox
+* Very low impact on battery life
+
+Conversations makes it very easy to create an account on the conversations.im server. Using that server comes with an annual fee of 8 Euro after a 6 month trial period. However Conversations will work with any other XMPP server as well. A lot of XMPP servers are run by volunteers and are free of charge.
+
+XMPP Features:
+
+Conversations works with every XMPP server out there. However XMPP is an extensible protocol. These extensions are standardized as well in so called XEP’s. Conversations supports a couple of those to make the overall user experience better. There is a chance that your current XMPP server does not support these extensions. Therefore to get the most out of Conversations you should consider either switching to an XMPP server that does or - even better - run your own XMPP server for you and your friends.
+
+These XEPs are - as of now:
+
+* XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer files if both parties are behind a firewall (NAT).
+* XEP-0163: Personal Eventing Protocol for avatars
+* XEP-0191: Blocking command lets you blacklist spammers or block contacts without removing them from your roster.
+* XEP-0198: Stream Management allows XMPP to survive small network outages and changes of the underlying TCP connection.
+* XEP-0280: Message Carbons which automatically syncs the messages you send to your desktop client and thus allows you to switch seamlessly from your mobile client to your desktop client and back within one conversation.
+* XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections
+* XEP-0313: Message Archive Management synchronize message history with the server. Catch up with messages that were sent while Conversations was offline.
+* XEP-0352: Client State Indication lets the server know whether or not Conversations is in the background. Allows the server to save bandwidth by withholding unimportant packages.
+* XEP-0363: HTTP File Upload allows you to share files in conferences and with offline contacts. Requires an additional component on your server.

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+An encrypted, user friendly XMPP instant messaging client optimized for mobile

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

metadata/en-US/changelogs/330.txt

@@ -1,2 +0,0 @@
-• bug fixes for peer to peer file transfer (Jingle)
-• fixed server info for unlimited/unknown max file size

metadata/en-US/changelogs/333.txt

@@ -1 +0,0 @@
-• stability improvements for group chats and channels

metadata/en-US/changelogs/334.txt

@@ -1,2 +0,0 @@
-• allow backups to be restored from anywhere
-• bug fixes

metadata/en-US/changelogs/336.txt

@@ -1,3 +0,0 @@
-• fix light themen composing fied
-• fixes for Jingle file transfer
-• fixed some rare crashes

metadata/en-US/changelogs/337.txt

@@ -1,3 +0,0 @@
-• fixed crash when scanning QR codes on Android 6 and lower
-• when sharing a message from and to Conversations insert it as quote
-

metadata/en-US/changelogs/338.txt

@@ -1,3 +0,0 @@
-• fixed connection issues over Tor
-• P2P file transfer (Jingle) now offers direct candidates
-• Support XEP-0396: Jingle Encrypted Transports - OMEMO

metadata/en-US/changelogs/341.txt

@@ -1,4 +0,0 @@
-• Fixed crash on Android <5.0
-• Fixed crash on Xiaomi devices running Android 8.0 + 8.1
-• fixed minor security issues
-• Share XMPP uri from channel search by long pressing a result

metadata/en-US/changelogs/342.txt

@@ -1 +0,0 @@
-• Fixed crash on internal database update

metadata/en-US/changelogs/346.txt

@@ -1,3 +0,0 @@
-• rename app 'Conversations with IPv6' to 'Conv6ations for Sum7'
-• Jingle file transfer fixes
-• Fixed OMEMO self healing (after backup restore) on servers w/o MAM

metadata/en-US/changelogs/349.txt

@@ -1,4 +0,0 @@
-• Introduce expert setting to perform channel discovery on local server instead of [search.jabber.network](https://search.jabber.network)
-• Enable delivery check marks by default and remove setting
-• Enable ‘Send button indicates status’ by default and remove setting
-• Move Backup and Foreground Service settings to main screen

metadata/en-US/changelogs/350.txt

@@ -1 +0,0 @@
-• changes in Networkstack 'let OS decide IPv4 or IPv6' to own 'Happy Eyeball' for faster connection and fair to both IP version.

metadata/en-US/changelogs/351.txt

@@ -1,3 +0,0 @@
-• fixes for Jingle IBB file transfer
-• fixes for repeated corrections filling up the database
-• switched to Last Message Correction v1.1

metadata/en-US/changelogs/360.txt

@@ -1,4 +0,0 @@
-• support for ?register and ?register;preauth XMPP uri parameters
-• let users set their own nick name
-• resume download of OMEMO encrypted files
-• channels now use '#' as symbol in avatar

metadata/en-US/changelogs/362.txt

@@ -1 +0,0 @@
-• Support automatic theme switching on Android 10 

metadata/en-US/changelogs/363.txt

@@ -1,2 +0,0 @@
-• improve logging of happy eyeball 
-• fix several NullPointer bugs

metadata/en-US/changelogs/364.txt

@@ -1,5 +0,0 @@
-• Provide PDF preview on Android 5+
-• Use 12 byte IVs for OMEMO
-• Happy Eyeball: cacheing of addresses
-• Happy Eyeball: fix DNSSEC im special cases and NPE
-• Happy Eyeball: revert dns-server selection

metadata/en-US/changelogs/367.txt

@@ -1,2 +0,0 @@
-• Fix avatar selection on some Android 10 devices
-• Fix file transfer for larger files

metadata/en-US/changelogs/379.txt

@@ -1,2 +0,0 @@
-•  Audio/Video calls (Requires server support in form of STUN and TURN servers discoverable via XEP-0215)
-•  Rename App to only Conv6sation 

metadata/en-US/changelogs/381.txt

@@ -1,2 +0,0 @@
-•  Audible feedback (dialing, call started, call ended) for voice calls.
-•  Fixed issue with retrying failed video call

metadata/en-US/changelogs/382.txt

@@ -1,2 +0,0 @@
-• Add button to switch camea during video call
-• Fixed voice calls on tablets

metadata/en-US/changelogs/383.txt

@@ -1,3 +0,0 @@
-• Move call icon to the left in order to keep other toolbar icons in a consistent place
-• Show call duration during audio calls
-• Tie breaking for A/V calls (the same two people calling each other at the same time)

metadata/en-US/changelogs/387.txt

@@ -1,2 +0,0 @@
-• Rework Login with certificate UI
-• Add ability to pin chats on top (add to favorites)

metadata/en-US/changelogs/388.txt

@@ -1,3 +0,0 @@
-• Reduce echo during calls on some devices
-• Fix login when passwords contains special characters
-• Play dial and busy tones on speaker during video calls

metadata/en-US/changelogs/390.txt

@@ -1 +0,0 @@
-• Offer to record voice message when callee is busy

metadata/en-US/changelogs/393.txt

@@ -1,3 +0,0 @@
-• Show help button if A/V call fails
-• Fixed some annoying crashes
-• Fixed Jingle connections (file transfer + calls) with bare JIDs

metadata/en-US/changelogs/394.txt

@@ -1,2 +0,0 @@
-• Fixed notifications not showing up under certain conditions
-• Fixed compatibility issues and crashes related to A/V calls

metadata/en-US/changelogs/395.txt

@@ -1,3 +0,0 @@
-• add 'Return to chat' to audio call screen
-• Improve keyboard shortcuts
-• bug fixes

metadata/en-US/changelogs/397.txt

@@ -1,3 +0,0 @@
-• Handle GPX files
-• Improve performance for backup restore
-• bug fixes

metadata/en-US/changelogs/398.txt

@@ -1 +0,0 @@
-• WebRTC update (with security fixes)

metadata/en-US/changelogs/399.txt

@@ -1,4 +0,0 @@
-• Search individual conversations
-• Notify user if message delivery fails
-• Remember display names (nicks) from Quicksy users across restarts
-• Add button to start Orbot (Tor) from notification if necessary

metadata/en-US/changelogs/402.txt

@@ -1,3 +0,0 @@
-• Offer Easy Invite generation on supporting servers
-• Display GIFs send from Movim
-• store avatars in cache

metadata/en-US/changelogs/404.txt

@@ -1,4 +0,0 @@
-• Fixed connectivity issues when different accounts used different SCRAM mechanisms
-• Add support for SCRAM-SHA-512
-• Allow P2P (Jingle) file transfer with self contact
-• minor stability improvements for A/V calls

metadata/en-US/changelogs/407.txt

@@ -1,3 +0,0 @@
-• Show call button for offline contacts if they previously announced support
-• Back button no longer ends call when call is connected
-• bug fixes