fix usage directTLS of manuelle enter an address

This is fairly unlikely to happen in practice

.github/CONTRIBUTING.md

@@ -1,11 +0,0 @@
-### Reporting Bugs and getting help
-
-The issue tracker on Github is for bug reports only. It is not a general support forum.
-
-**A bug is everything you can reproduce. ie *if I do this that happens but something else should happen instead*.**
-
-Please search the issue tracker (including closed issues). Your bug might be a server bug that has already been addressed.
-
-Please fill in the template when creating new issues and provide information about your device and your server. The [adb logcat](https://wiki.cyanogenmod.org/w/Doc:_debugging_with_logcat) can be omitted if you can reproduce the bug under every condition. (ie *click button X and the application crashes*) But the adb logcat is required if the bug happens only under certain conditions or involves network problem (Server not found, messages not arriving) 
-
-**If you are seeking help or are unable to reproduce the exact problem please join our MUC at conversations@conference.siacs.eu**

.github/ISSUE_TEMPLATE.md

@@ -1,35 +0,0 @@
-#### General information
-
-* **Version:** eg 1.21.0
-* **Device:** eg Google Nexus 5
-* **Android Version:** eg Android 6.0 Stock or Android 5.1 Cyanogenmod
-* **Server name:** eg conversations.im, jabber.at or self hosted
-* **Server software:** ejabberd 16.04 or prosody 0.10 (if known)
-* **Installed server modules:** eg Stream Managment, CSI, MAM
-* **Conversations source:** eg PlayStore, PlayStore Beta Channel, F-Droid, self build (latest HEAD)
-
-
-#### Steps to reproduce
-
-1. …
-2. …
-
-
-#### Expected result
-
-What is the expected output? 
-
-
-#### Actual result
-
-What do you see instead?
-
-
-#### Debug output
-
-Please post the output of adb logcat. The log should begin with the start of Conversations and include all the
-steps it takes to reproduce the problem.
-
-````
-adb logcat -s conversations
-````

.github/workflows/android.yml

@@ -0,0 +1,38 @@
+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
+
+      

.gitignore

@@ -2,7 +2,9 @@
 *.swp
 .settings
 
-src/playstore/res/values/gcm.xml
+src/conversationsPlaystore/res/values/push.xml
+src/quicksyPlaystore/res/values/push.xml
+
 
 # https://github.com/github/gitignore/blob/master/Gradle.gitignore
 .gradle/
@@ -12,6 +14,8 @@ signing.properties
 # Ignore Gradle GUI config
 gradle-app.setting
 
+libs/*.aar
+
 # https://github.com/github/gitignore/blob/master/Android.gitignore
 # Built application files
 *.apk

.gitlab-ci.yml

@@ -0,0 +1,54 @@
+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

@@ -1,16 +0,0 @@
-language: android
-jdk:
-  - oraclejdk8
-android:
-  components:
-    - platform-tools
-    - tools
-    - build-tools-27.0.3
-    - extra-google-google_play_services
-  licenses:
-    - '.+'
-script:
-    - ./gradlew assembleFreeRelease
-
-before_install:
-    - yes | sdkmanager "platforms;android-27"

.tx/config

@@ -2,7 +2,20 @@
 host = https://www.transifex.com
 lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw
 
-[conversations.strings]
+[conversations.main-strings]
 file_filter = src/main/res/values-<lang>/strings.xml
 source_file = src/main/res/values/strings.xml
 source_lang = en
+
+[conversations.quicksy-strings]
+file_filter = src/quicksy/res/values-<lang>/strings.xml
+source_file = src/quicksy/res/values/strings.xml
+source_lang = en
+type = ANDROID
+
+[conversations.conversations-strings]
+file_filter = src/conversations/res/values-<lang>/strings.xml
+source_file = src/conversations/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CHANGELOG.md

@@ -1,5 +1,395 @@
 # 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
+
+### Version 2.9.12
+
+* Always verify domain name. No user overwrite
+* Support roster pre authentication
+
+### Version 2.9.11
+
+* Fixed 'No Connectivity' issues on Android 7.1
+
+### Version 2.9.10
+* fix HTTP up/download for users that don’t trust system CAs
+
+### Version 2.9.9
+
+* Various bug fixes around Tor support
+* Improve call compatibility with Dino
+
+### Version 2.9.8
+
+* Verify A/V calls with preexisting OMEMO sessions
+* Improve compatibility with non libwebrtc WebRTC implementations
+
+### Version 2.9.7
+
+* 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)
+
+### Version 2.9.6
+
+* Show call button for offline contacts if they previously announced support
+* Back button no longer ends call when call is connected
+* bug fixes
+
+### Version 2.9.5
+
+* Quicksy: Automatically receive verification SMS
+
+### Version 2.9.4
+* minor stability improvements for A/V calls
+* Conversations releases from here on forward require Android 5
+
+### Version 2.9.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
+
+### Version 2.9.2
+
+* Offer Easy Invite generation on supporting servers
+* Display GIFs send from Movim
+* store avatars in cache
+
+### Version 2.9.1
+
+* fixed search on Android <= 5
+* optimize memory consumption
+
+### Version 2.9.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
+
+### Version 2.8.10
+
+* Handle GPX files
+* Improve performance for backup restore
+* bug fixes
+
+### Version 2.8.9
+
+* add 'Return to chat' to audio call screen
+* Improve keyboard shortcuts
+* bug fixes
+
+### Version 2.8.8
+
+* Fixed notifications not showing up under certain conditions
+* Fixed compatibility issues and crashes related to A/V calls
+
+### Version 2.8.7
+
+* Show help button if A/V call fails
+* Fixed some annoying crashes
+* Fixed Jingle connections (file transfer + calls) with bare JIDs
+
+### Version 2.8.6
+
+* Offer to record voice message when callee is busy
+
+### Version 2.8.5
+
+* Reduce echo during calls on some devices
+* Fix login when passwords contains special characters
+* Play dial and busy tones on speaker during video calls
+
+### Version 2.8.4
+
+* Rework Login with certificate UI
+* Add ability to pin chats on top (add to favorites)
+
+### Version 2.8.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)
+
+### Version 2.8.2
+
+* Add button to switch camera during video call
+* Fixed voice calls on tablets
+
+### Version 2.8.1
+
+* Audible feedback (dialing, call started, call ended) for voice calls.
+* Fixed issue with retrying failed video call
+
+### Version 2.8.0
+
+* Audio/Video calls (Requires server support in form of STUN and TURN servers discoverable via XEP-0215)
+
+
+### Version 2.7.1
+
+* Fix avatar selection on some Android 10 devices
+* Fix file transfer for larger files
+
+### Version 2.7.0
+
+* Provide PDF preview on Android 5+
+* Use 12 byte IVs for OMEMO
+
+### Version 2.6.4
+
+* Support automatic theme switching on Android 10
+
+### Version 2.6.3
+
+* Support for ?register and ?register;preauth XMPP uri parameters
+
+### Version 2.6.2
+* 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)
+
+### Version 2.6.1
+* fixes for Jingle IBB file transfer
+* fixes for repeated corrections filling up the database
+* switched to Last Message Correction v1.1
+
+### Version 2.6.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
+
+### Version 2.5.12
+* Jingle file transfer fixes
+* Fixed OMEMO self healing (after backup restore) on servers w/o MAM
+
+### Version 2.5.11
+* Fixed crash on Android <5.0
+
+### Version 2.5.10
+* Fixed crash on Xiaomi devices running Android 8.0 + 8.1
+
+### Version 2.5.9
+* fixed minor security issues
+* Share XMPP uri from channel search by long pressing a result
+
+### Version 2.5.8
+* fixed connection issues over Tor
+* P2P file transfer (Jingle) now offers direct candidates
+* Support XEP-0396: Jingle Encrypted Transports - OMEMO
+
+### Version 2.5.7
+* fixed crash when scanning QR codes on Android 6 and lower
+* when sharing a message from and to Conversations insert it as quote
+
+### Version 2.5.6
+* fixes for Jingle file transfer
+* fixed some rare crashes
+
+### Version 2.5.5
+* allow backups to be restored from anywhere
+* bug fixes
+
+### Version 2.5.4
+* stability improvements for group chats and channels
+
+### Version 2.5.3
+* bug fixes for peer to peer file transfer (Jingle)
+* fixed server info for unlimited/unknown max file size
+
+### Version 2.5.2
+* bug fixes
+
+### Version 2.5.1
+* minor bug fixes
+* Set own OMEMO devices to inactive after not seeing them for 14 days. (was 7 days)
+
+### Version 2.5.0
+* Added channel search via search.jabbercat.org
+* Reworked onboarding screens
+* Warn when trying to enter domain address or channel address in Add Contact dialog
+
+### Version 2.4.3
+* Fixed display of private messages sent from another client
+* Fixed backup creation on long time installations
+
+### Version 2.4.2
+* Fix image preview on older Android version
+
+### Version 2.4.1
+* Fixed crash in message view
+
+### Version 2.4.0
+* New Backup / Restore feature
+* Clearly distinguish between (private) group chats and (public) channels
+* Redesigned participants view for group chats and channels
+* Redesigned create new contact/group chat/channel flow in Start Conversation screen
+
+
+### Version 2.3.12
+* Fixed rare crash on start up
+* Fixed avatar not being refreshed in group chats
+
+### Version 2.3.11
+* Support for Android 9 'message style' notifications
+* OMEMO stability improvements
+* Added ability to destroy group chats
+* Do not show deleted files in media browser
+* Added 'Keep Original' as video quality choice
+
+### Version 2.3.10
+* lower minimum required Android version to 4.1
+* Synchronize group chat join/leaves across multiple clients
+* Fixed sending PGP encrypted messages from quick reply
+
+### Version 2.3.9
+* OMEMO stability improvements
+* Context menu when long pressing avatar in 1:1 chat
+
+### Version 2.3.8
+* make PEP avatars public to play nice with Prosody 0.11
+* Fixed re-sending failed files in group chats
+
+### Version 2.3.7
+* long press on 'allow' or 'add back' snackbar to bring up 'reject'
+* bug fixes for Android 9
+
+### Version 2.3.6
+* Improved handling of bookmark nicks
+* Show send PM menu entry in anonymous MUCs
+
+### Version 2.3.5
+* Fixed group chat mentions when nick ends in . (dot)
+* Fixed Conversations not asking for permissions after direct share
+* Fixed CVE-2018-18467
+
+### Version 2.3.4
+* Fixed sending OMEMO files to ChatSecure
+
+### Version 2.3.3
+* Fixed connection issues with user@ip type JIDs
+
+### Version 2.3.2
+* Fixed OMEMO on Android 5.1 & 6.0
+* Added setting for video quality
+* bug fixes
+
+### Version 2.3.1
+* Stronger compression for video files
+* Use SNI on STARTTLS to fix gtalk
+* Fix Quiet Hours on Android 8+
+* Use Consistent Color Generation (XEP-0392)
+
+### Version 2.3.0
+* Preview and ask for confirmation before sending media files
+* View per conversation media files in contact and conference details screens
+* Enable foreground service by default for Android 8 (notification can be disabled by long pressing it)
+* Audio player: disable screen and switch to ear piece
+* Support TLSv1.3 (ejabberd ≤ 18.06 is incompatible with openssl 1.1.1 - Update ejabberd or downgrade openssl if you get ›Stream opening error‹)
+
+
+### Version 2.2.9
+* Store bookmarks in PEP if server has ability to convert to old bookmarks
+* Show Jabber IDs from address book in Start Conversation screen
+
+### Version 2.2.8
+* fixed regression that broke XMPP uris
+
+### Version 2.2.7
+* stability improvements
+
+### Version 2.2.6
+* support old MAM version to work with Prosody
+
+### Version 2.2.5
+* Persist MUC avatar across restarts / show in bookmarks
+* Offer Paste as quote for HTML content
+
+### Version 2.2.4
+* Use group chat name as primary identifier
+* Show group name and subject in group chat details
+* Upload group chat avatar on compatible servers
+
+### Version 2.2.3
+* Introduce Expert Setting to enable direct search
+* Introduce Paste As Quote on Android 6+
+* Fixed issues with HTTP Upload
+
+### Version 2.2.2
+* Fixed connection problems with TLS1.3 servers
+* Attempt to delete broken bundles from PEP
+* Use FCM instead of GCM
+
+### Version 2.2.1
+* improved recording quality
+* load map tiles over Tor if enabled 
+
+### Version 2.2.0
+* Integrate Voice Recorder
+* Integrate Share Location
+* Added ability to search messages
+
+### Version 2.1.4
+* bug fixes
+
+### Version 2.1.3
+* Do not process stanzas with invalid JIDs
+
+### Version 2.1.2
+* Fixed avatars not being displayed on new installs
+
+### Version 2.1.1
+* Improved start up performance
+* bug fixes
+
+### Version 2.1.0
+* Added configurable font size
+* Added global OMEMO preference
+* Added scroll to bottom button
+* Only mark visible messages as read
+
+
+### Version 2.0.0
+* OMEMO by default for everything but public group chats
+* Integrate QR code scanner (requires camera permission)
+* Removed support for OTR
+* Removed support for customizable resources
+* Removed slide out panel for conversation overview
+* Add ability to change status message
+* Highlight irregular unicode code blocks in Jabber IDs
+* Conversations now requires Android 4.4+
+
+### Version 1.23.8
+* bug fixes
+
+### Version 1.23.7
+* Improved MAM support + bug fixes
+
+### Version 1.23.6
+* Fixed crash on receiving invalid HTTP slot response
+
 ### Version 1.23.5
 * improved self chat
 
@@ -109,10 +499,9 @@
 * Icons for attach menu
 
 ### Version 1.16.2
-* change mam catchup strategie. support mam:1
+* change mam catchup strategy. support mam:1
 * bug fixes
 
-
 ### Version 1.16.1
 * UI performance fixes
 * bug fixes
@@ -162,7 +551,7 @@
 * bug fixes
 
 ### Version 1.14.6
-* make error notification dismissable
+* make error notification dismissible
 * bug fixes
 
 
@@ -186,7 +575,7 @@
 * bug fixes
 
 ### Version 1.14.0
-* Improvments for N
+* Improvements for N
 * Quick Reply to Notifications on N
 * Don't download avatars and files when data saver is on
 * bug fixes
@@ -359,12 +748,12 @@
 ### Version 1.7.2
 * decode PGP messages in background
 
-####Versrion 1.7.1
+### Version 1.7.1
 * performance improvements when opening a conversation
 
 ### Version 1.7.0
 * CAPTCHA support
-* SASL EXTERNAL (client certifiates)
+* SASL EXTERNAL (client certificates)
 * fetching MUC history via MAM
 * redownload deleted files from HTTP hosts
 * Expert setting to automatically set presence
@@ -472,7 +861,7 @@
 * accept more ciphers
 
 ### Version 1.0
-* MUC controls (Affiliaton changes)
+* MUC controls (Affiliation changes)
 * Added download button to notification
 * Added check box to hide offline contacts
 * Use Material theme and icons on Android L
@@ -578,7 +967,7 @@
 * XEP-0333. Mark whether the other party has read your messages
 * Delayed messages are now tagged properly
 * Share images from the Gallery
-* Infinit history scrolling
+* Infinite history scrolling
 * Mark the last used presence in presence selection dialog
 
 ### Version 0.3

README.md

@@ -1,33 +1,36 @@
-<h1 align="center">Conversations</h1>
+<h1 align="center">Conv6ations for Sum7 is a fork of <a href="https://f-droid.org/packages/eu.siacs.conversations/">Conversations</a></h1>
 
-<p align="center">Conversations: the very last word in instant messaging</p>
+<p align="center">A Jabber/XMPP chat client which is fair to IPv6</p>
 
 <p align="center">
-    <a href="https://conversations.im/j/conversations@conference.siacs.eu">
-        <img src="https://camo.githubusercontent.com/a839cc0a3d4dac7ec82237381b165dd144365b6d/68747470733a2f2f74696e7975726c2e636f6d2f6a6f696e7468656d7563"
-             alt="chat on our conference room">
-    </a>
-    <a href="https://travis-ci.org/siacs/Conversations">
-        <img src="https://travis-ci.org/siacs/Conversations.svg?branch=development"
-             alt="build status">
-    </a>
-    <a href="https://bountysource.com/teams/siacs">
-        <img src="https://api.bountysource.com/badge/tracker?tracker_id=519483" alt="Bountysource">
-    </a>
-</p>
-
+  <a href="https://conversations.im/j/support@conference.chat.sum7.eu">
+    <img src="https://inverse.chat/badge.svg?room=support@conference.chat.sum7.eu"
+     alt="chat on our conference room">
+  </a>
+  <a href="https://dev.sum7.eu/sum7/Conversations/pipelines">
+    <img src="https://dev.sum7.eu/sum7/Conversations/badges/develop/pipeline.svg"
+     alt="build status">
+  </a>
+</a>
 <p align="center">
-    <a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations&amp;referrer=utm_source%3Dgithub">
-       <img src="https://conversations.im/images/en-play-badge.png"
-            alt="Google Play">
-            </a>
-    <a href="http://www.amazon.com/dp/B00WD35AAC/">
-        <img src="https://images-na.ssl-images-amazon.com/images/G/01/AmazonMobileApps/amazon-apps-store-us-black.png"
-             alt="Amazon App Store">
-    </a>
+  <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>
 
-![screenshots](https://raw.githubusercontent.com/siacs/Conversations/master/screenshots.png)
+[<img src="https://f-droid.org/badge/get-it-on.png"
+      alt="Get it on F-Droid"
+      height="80">](https://f-droid.org/en/packages/eu.sum7.conversations)
+
+### Nightly:
+[![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)
+
 
 ## Design principles
 
@@ -35,17 +38,18 @@
   privacy
 * Rely on existing, well established protocols (XMPP)
 * Do not require a Google Account or specifically Google Cloud Messaging (GCM)
-* Require as few permissions as possible
 
 ## Features
 
-* End-to-end encryption with [OMEMO](http://conversations.im/omemo/), [OTR](https://otr.cypherpunks.ca/), or [OpenPGP](http://openpgp.org/about/)
+* End-to-end encryption with [OMEMO](http://conversations.im/omemo/) or [OpenPGP](http://openpgp.org/about/)
 * Send and receive images as well as other kind of files
-* Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub)
+* [Encrypted audio and video calls (DTLS-SRTP)](https://help.conversations.im)
+* Share your location
+* Send voice messages
 * Indication when your contact has read your message
 * Intuitive UI that follows Android Design guidelines
 * Pictures / Avatars for your Contacts
-* Syncs with desktop client
+* Synchronizes with desktop client
 * Conferences (with support for bookmarks)
 * Address book integration
 * Multiple accounts / unified inbox
@@ -92,45 +96,17 @@ 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 contribution
-
-I accept donations over PayPal, bank transfer and various crypto currencies. For donations via PayPal you
-can use the email address `donate@siacs.eu` or the button below.
-
-[![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CW3SYT3KG5PDL)
-
-**Disclaimer:** I'm not a huge fan of PayPal and their business policies. For
-larger contributions please get in touch with me beforehand and we can talk
-about bank transfer (SEPA).
-
-##### Crypto currencies
-
-Bitcoin: `1AeqNAcg85APAZj9BZfAjdFCC5zesqXp2B`
-
-Bitcoin Cash: `16ABkXzYAwWz8Y5DcWFfbBRqL63g3hzEaU`
-
-Ether: `0x5c4e5239cd9c6f4a909e4e8361526e2e3c8ba9fa`
-
 #### 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 [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/). 
+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.
 
 ##### Running your own
-If you already have a server somewhere and are willing and able to put the necessary work in, one alternative-in the spirit of federation-is to run your own. We recommend either [Prosody](https://prosody.im/) or [ejabberd](https://www.ejabberd.im/). Both of which have their own strengths. Ejabberd is slightly more mature nowadays but Prosody is arguably easier to set up.
+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.
 
-For Prosody you need a couple of so called [community modules](https://modules.prosody.im/) most of which are maintained by the same people that develop Prosody.
+As of 2019 we recommend you use [ejabberd](https://ejabberd.im). The default configuration file already enables everything you need to pass the [Conversations Compliance Suite](https://compliance.conversations.im). Make sure your Linux distribution ships a fairly recent version.
 
-If you pick ejabberd make sure you use the latest version. Linux Distributions might bundle some very old versions of it.
+With a little bit of effort [Prosody](https://prosody.im) can be configured to support all necessary extensions as well. However you will have to rely on so called [Community Modules](https://modules.prosody.im/) of varying quality. Prosody can be interesting to people who like to modify their server and create / prototype own modules.
+
+Performance wise - for small deployments - both ejabberd and Prosody should be fine. 
 
 #### Where can I set up a custom hostname / port
 Conversations will automatically look up the SRV records for your domain name
@@ -157,33 +133,56 @@ SCRAM-SHA1, PLAIN, EXTERNAL (client certs) and DIGEST-MD5.
 Some Bind failures are transient and resolve themselves after a reconnect.
 
 When trying to connect to OpenFire the bind failure can be a permanent problem when the domain part of the Jabber ID entered in Conversations doesn’t match the domain the OpenFire server feels responsible for. For example OpenFire is configured to use the domain `a.tld` but the Jabber ID entered is `user@b.tld` where `b.tld` also points to the same host. During bind OpenFire tries to reassign the Jabber to `user@a.tld`. Conversations doesn’t like that.
-This can be fixed by creating a new account in Conversations that uses the Jabber ID `user@a.tld`. 
+This can be fixed by creating a new account in Conversations that uses the Jabber ID `user@a.tld`.
 
 Note: This is kind of a weird quirk in OpenFire. Most other servers would just throw a 'Server not responsible for domain' error instead of attempting to reassign the Jabber ID.
 
 Maybe you attempted to use the Jabber ID `test@b.tld` because `a.tld` doesn’t point to the correct host. In that case you might have to enable the extended connection settings in the expert settings of Conversations and set a host name.
 
+#### I get 'Stream opening error'. What does that mean?
+
+In most cases this error is caused by ejabberd advertising support for TLSv1.3 but not properly supporting it. This can happen if the OpenSSL version on the server already supports TLSv1.3 but the fast\_tls wrapper library used by ejabberd not (properly) support it. Upgrading fast\_tls and ejabberd or - theoretically - downgrading OpenSSL should fix the issue. A work around is to explicitly disable TLSv1.3 support in the ejabberd configuration. More information can be found on [this issue on the ejabberd issue tracker](https://github.com/processone/ejabberd/issues/2614).
+
+
+#### I’m getting this annoying permanent notification
+Starting with Conversations 2.3.6 Conversations releases distributed over the Google Play Store will display a permanent notification if you are running it on Android 8 and above. This is a rule that it is essentially enforced by the Google Play Store. (You won’t have the problem  of a *forced* foreground notification if you are getting your app from F-Droid.)
+
+However you can disable the notification via settings of the operating system. (Not settings in Conversations.)
+
+**The battery consumption and the entire behavior of Conversations will remain the same (as good or as bad as it was before). Why is Google doing this to you? We have no idea.**
+
+##### Android &lt;= 7.1 or Conversations from F-Droid (all Android versions)
+The foreground notification is still controlled over the expert settings within Conversations as it always has been. Whether or not you need to enable it depends on how aggressive the non-standard 'power saving' features are that your phone vendor has built into the operating system.
+
+##### Android 8.x
+Long press the permanent notification and disable that particular type of notification by moving the slider to the left. This will make the notification disappear but create another notification (this time created by the operating system itself.) that will complain about Conversations (and other apps) using battery. Starting with Android 8.1 you can disable that notification again with the same method described above.
+
+##### Android 9.0+
+Long press the permanent notification and press the info `(i)` button to get into the App info screen. In that screen touch the 'Notification' entry. In the next screen remove the checkbox for the 'Foreground service' entry.
+
 #### How do XEP-0357: Push Notifications work?
-You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google Cloud Notifications (GCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the Conversations App server (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through GCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information send from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through GCM even if your server sends this information.)
+You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google’s Firebase Cloud Messaging (FCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the [Conversations App server](https://github.com/iNPUTmice/p2) (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through FCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information sent from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through FCM even if your server sends this information.)
 
 In summary Google will never get hold of any personal information besides that *something* happened. (Which doesn’t even have to be a message but can be some automated event as well.) We - as the operator of the App server - will just get hold of your account name (without being able to tie this to your specific device).
 
 If you don’t want this simply pick a server which does not offer Push Notifications or build Conversations yourself without support for push notifications. (This is available via a gradle build flavor.) Non-play store source of Conversations like the Amazon App store will also offer a version without push notifications. Conversations will just work as before and maintain its own TCP connection in the background.
 
- ¹ Your server only needs to support the server side of [XEP-0357: Push Notifications](http://xmpp.org/extensions/xep-0357.html). If you use the Play Store version you do **not** need to run your own app server. The server modules are called *mod_cloud_notify* on Prosody and *mod_push* on ejabberd.
+You can find a detailed description of how your server, the app server and FCM are interacting with each other in the [README](https://github.com/iNPUTmice/p2/blob/master/README.md) of the Conversations App Server.
+
+ ¹ If you use the Play Store version you do **not** need to run your own app server. Your server only needs to support the server side of [XEP-0357: Push Notifications](http://xmpp.org/extensions/xep-0357.html) and [XEP-0198: Stream Management](https://xmpp.org/extensions/xep-0198.html). The prosody server modules are called *mod_cloud_notify* and *mod_smacks*. The ejabberd server modules are called *mod_push* and *mod_stream_mgmt*.
+
+
+#### But why do I need a permanent notification if I use Google Push?
+FCM (Google Push) allows an app to wake up from *Doze* which is (as the name suggests) a hibernation feature of the Android operating system that cuts the network connection and also reduces the number of times the app is allowed to wake up (to ping the server for example). The app can ask to be excluded from doze. Non push variants of the app (from F-Droid or if the server doesn’t support it) will do this on first start up. So if you get exemption from *Doze*, or if you get regular push events sent to you, Doze should not pose a threat to Conversatons working properly. But even with *Doze* the app is still open in the background (kept in memory); it is just limited in the actions it can do. Conversations needs to stay in memory to hold certain session state (online status of contacts, join status of group chats, …). However with Android 8 Google changed all of this again and now an App that wants to stay in memory needs to have a foreground service which is visible to the user via the annoying notification. But why does Conversations need to hold that state? XMPP is a statefull protocol that has a lot of per-session information; packets need to be counted, presence information needs to be held, some features like Message Carbons get activated once per session, MAM catch-up happens once, service discovery happens only once; the list goes on. When Conversations was created in early 2014 none of this was a problem because apps were just allowed to stay in memory. Basically every XMPP client out there holds that information in memory because it would be a lot more complicated trying to persist it to disk. An entire rewrite of Conversations in the year 2019 would attempt to do that and would probably succeed however it would require exactly that; a complete rewrite which is not feasible right now. That’s by the way also the reason why it is difficult to write an XMPP client on iOS. Or more broadly put this is also the reason why other protocols are designed as or migrated to stateless protocols (often based on HTTP); take for example the migration of IMAP to [JMAP](https://jmap.io/).
 
 #### Conversations doesn’t work for me. Where can I get help?
 
-You can join our conference room on `conversations@conference.siacs.eu`.
+You can join our conference room on [`support@conference.chat.sum7.eu`](https://conversations.im/j/support@conference.chat.sum7.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 me at `inputmice@siacs.eu`.
-
 #### How does the address book integration work?
 
 The address book integration was designed to protect your privacy. Conversations
@@ -259,12 +258,23 @@ Conversations is trying to get rid of old behaviours and set an example for
 other clients.
 
 #### Translations
-Translations are managed on [Transifex](https://www.transifex.com/projects/p/conversations/)
+Translations are managed on [Transifex](https://www.transifex.com/projects/p/conversations/).
+If you want to become a translator  Please register on transifex, apply to join
+the translation team and then step by our group chat on
+[conversations@conference.siacs.eu](https://conversations.im/j/conversations@conference.siacs.eu)
+and introduce yourself to `iNPUTmice` so he can approve your join request.
 
 #### How do I backup / move Conversations to a new device?
 On the one hand Conversations supports Message Archive Management to keep a server side history of your messages so when migrating to a new device that device can display your entire history. However that does not work if you enable OMEMO due to its forward secrecy. (Read [The State of Mobile XMPP in 2016](https://gultsch.de/xmpp_2016.html) especially the section on encryption.)
 
-If you migrate to a new device and would still like to keep your history please use a third party backup tool like [oandbackup](https://github.com/jensstein/oandbackup) (needs root access on the device) or ```adb backup``` (no root access needed) from your computer.  It is important that you deactivate your account before backup and activate it only after a successful restore, otherwise OMEMO might not work afterwards. Also, remember that you can **only** transfer the backup to either the same version of Android or to a newer one (eg. 5.1.1 -> 5.1.1 or 5.1.1 -> 6.0.1).
+As of version 2.4.0 an integrated Backup & Restore function will help with this, go to Settings and you’ll find a setting called Create backup. A notification will pop-up during the creation process that will announce you when it's ready. After the files, one for each account, are created, you can move the **Conversations** folder *(if you want your old media files too)* or only the **Conversations/Backup** folder *(for OMEMO keys and history only)* to your new device (or to a storage place) where a freshly installed Conversations can restore each account. Don't forget to enable the accounts after a successfull restore.
+
+This backup method will include your OMEMO keys. Due to forward secrecy you will not be able to recover messages sent and received between creating the backup and restoring it. If you have a server side archive (MAM) those messages will be retrieved but displayed as *unable to decrypt*. For technical reasons you might also lose the first message you either sent or receive after the restore; for each conversation you have. This message will then also show up as *unable to decrypt*, but this will automatically recover itself as long as both participants are on Conversations 2.3.11+. Note that this doesn’t happen if you just transfer to a new phone and no messages have been exchanged between backup and restore.
+
+In the vast, vast majority of cases you won’t have to manually delete OMEMO keys or do anything like that. Conversations only introduced the official backup feature in 2.4.0 after making sure the *OMEMO self healing* mechanism introduced in 2.3.11 works fine.
+
+**WARNING**: Be sure to know your accounts passwords or find ways to reset them **before** doing the backup as the files are encrypted using those passwords and the Restore process will ask for them.  
+**WARNING**: Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you’ve lost the original device.
 
 #### Conversations is missing a certain feature
 
@@ -282,17 +292,12 @@ 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. Contact me via XMPP: `inputmice@siacs.eu`
-
 ### Security
 
-#### Why are there three end-to-end encryption methods and which one should I choose?
+#### Why are there two end-to-end encryption methods and which one should I choose?
 
-* OTR is a legacy encryption method. It works out of the box with most contacts as long as they are online.
-* OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO is not as widely supported as OTR and is currently implemented only by Conversations and Gajim. OMEMO should be preferred over OTR for contacts who use Conversations.
-* OpenPGP (XEP-0027) is a very old encryption method that has some advantages over OTR but should only be used by experts who know what they are doing.
+* OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO not widely support and is currently implemented only [by a handful of clients](https://omemo.top).
+* OpenPGP (XEP-0027) is a very old encryption method that has some advantages over OMEMO but should only be used by people who know what they are doing.
 
 #### How do I use OpenPGP
 
@@ -303,37 +308,33 @@ The way PGP works is that you trust Key IDs instead of JID's or email addresses.
 So in theory your contact list should consist of Public-Key-IDs instead of
 JID's. But of course no email or XMPP client out there implements these
 concepts. Plus PGP in the context of instant messaging has a couple of
-downsides: It is vulnerable to replay attacks, it is rather verbose, and
-decrypting and encrypting takes longer than OTR. It is however asynchronous and
-works well with message carbons.
+downsides: It is vulnerable to replay attacks and it is rather verbose.
 
 To use OpenPGP you have to install the open source app
 [OpenKeychain](http://www.openkeychain.org) and then long press on the account in
 manage accounts and choose renew PGP announcement from the contextual menu.
 
 #### OMEMO is grayed out. What do I do?
-OMEMO has two requirements: Your server and the server of your contact need to support PEP. Both of you can verify that individually by opening your account details and selecting ```Server info``` from the menu. The appearing table should list PEP as available. The second requirement is mutual presence subscription. You can verify that by opening the contact details and see if both check boxes *Send presence updates* and *Receive presence updates* are checked.
+OMEMO is only available in 1:1 chats and private (members-only, non-anonymous) group chats. Encrypting public group chats makes little to no sense since anyone (including a hypothetical attacker) can join and a user couldn’t possibily verify all participants anyway. Furthermore for a lot of public group chat it is desirable to give new comers access to the full history.
 
-#### How does the encryption for conferences work?
+#### OMEMO doesn’t work. I get a 'Something went wrong' message in the 'Trust OMEMO Fingerprints' screen.
+OMEMO has two requirements: Your server and the server of your contact need to support PEP. Both of you can verify that individually by opening your account details and selecting ```Server info``` from the menu. The appearing table should list PEP as available. The second requirement is that the initial sender needs to have access to the published key material. This can either be achieved by having mutual presence subscription (you can verify that by opening the contact details and see if both check boxes *Send presence updates* and *Receive presence updates* are checked) or by using a server that makes the public key material accessible to anyone. In the [Compliance Tester](https://compliance.conversations.im) this is indicated by the 'OMEMO' feature. Since it is very common that the first messages are exchanged *before* adding each other to the contact list it is desirable to use servers that have 'OMEMO support'.
 
-For conferences only OMEMO and OpenPGP are supported as encryption method. (OTR
-does not work with multiple participants).
+#### How does the encryption for group chats work?
 
 ##### OMEMO
 
-OMEMO encryption works only in private (members only) conferences that are non-anonymous.
-You need to have presence subscription with every member of the conference.
-You can verify that by going into the conference details, long press every member and start
-a conversation with them. (Or select 'contact details' if they are already in your contact
-list)
+OMEMO encryption works only in private (members only) conferences that are non-anonymous. Non-anonymous (being able to discover the real JID of other participants) is a technical requirement to discover the key material. Members only is a sort of arbitrary requirement imposed by Conversations. (see 'OMEMO is grayed out')
+
+The server of all participants need to pass the OMEMO [Compliance Test](https://conversations.im/compliance/).
+In other words they either need to run ejabberd 18.01+ or Prosody 0.11+.
+
+(Alternatively it would also work if all participants had each other in their contact list; But that rarely is the case in larger group chats.)
 
 The owner of a conference can make a public conference private by going into the conference
 details and hit the settings button (the one with the gears) and select both *private* and
 *members only*.
 
-If OMEMO is grayed out long pressing the lock icon will reveal some quick hints on why OMEMO
-is disabled.
-
 ##### OpenPGP
 
 Every participant has to announce their OpenPGP key (see answer above).
@@ -348,61 +349,41 @@ feature is regarded experimental. Conversations is the only client that uses
 XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
 this.)
 
-#### Why is Conversations not end-to-end encrypted by default
-We briefly had OMEMO as the default E2EE but it turned out to be a usability nightmare and thus we reverted that. You can find more information in [the commit message](https://github.com/siacs/Conversations/commit/035d0c79572d5981c53d1bff7f30b484c6542f17) of that change.
-
-Quick reminder that Conversations **always** uses TLS to connect to your server. It won‘t even connect to a server without TLS.
-
 #### What is Blind Trust Before Verification / why are messages marked with a red lock?
 
 Read more about the concept on https://gultsch.de/trust.html
 
+#### What happened to OTR support?
+OTR was removed because it was highly unreliable. It didn’t work with multiple devices and was never really specified to work with XMPP. The codebase was a mess (There was an HTML parser in there for crying out loud to deal with the garbage some OTR clients would send.) Verification was implemented in a non-blocking way. It would tell you if the current session was using an unknown fingerprint but it didn’t actively stopped you from sending messages until you have confirmed the new fingerprint. (Like Conversations would do now with BTBV after verification or when BTBV is turned off.) Considering the previous points there was little to no desire from my point to fix this potential security issue or clean up the code base. Another reason for the removal was that people would use it *accidentally* even to communicate between two Conversations clients because they read somewhere that OTR is good.
+
 ### What clients do I use on other platforms
 There are XMPP Clients available for all major platforms.
 #### Windows / Linux
 For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the plugins `OMEMO`, `HTTP Upload` and `URL image preview` to get the best compatibility with Conversations. Plugins can be installed from within the app.
 #### iOS
-Unfortunately we don‘t have a recommendation for iPhones right now. There are two clients available [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Both with their own pros and cons.
+Unfortunately we don‘t have a recommendation for iPhones right now. There are three clients available [Siskin](https://siskin.im/), [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Each with their own pros and cons.
 
 
 ### 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
+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.
 
-    git clone https://github.com/siacs/Conversations.git
+    git clone https://github.com/inputmice/Conversations.git
     cd Conversations
-    ./gradlew assembleFreeDebug
+    ./gradlew assembleConversationsFreeSystemDebug
 
 There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*.
 
 
-[![Build Status](https://travis-ci.org/siacs/Conversations.svg?branch=development)](https://travis-ci.org/siacs/Conversations)
-
-#### How do I update/add external libraries?
-
-If the library you want to update is in Maven Central or JCenter (or has its own
-Maven repo), add it or update its version in `build.gradle`. If the library is
-in the `libs/` directory, you can update it using a subtree merge by doing the
-following (using `minidns` as an example):
-
-    git remote add minidns https://github.com/rtreffer/minidns.git
-    git fetch minidns
-    git merge -s subtree minidns master
-
-To add a new dependency to the `libs/` directory (replacing "name", "branch" and
-"url" as necessary):
-
-    git remote add name url
-    git merge -s ours --no-commit name/branch
-    git read-tree --prefix=libs/name -u name/branch
-    git commit -m "Subtree merged in name"
+[![Build Status](https://dev.sum7.eu/sum7/Conversations/badges/develop/build.svg)](https://dev.sum7.eu/sum7/Conversations/pipelines)
 
 #### How do I debug Conversations
 
@@ -419,7 +400,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 conversations
+    adb -d logcat -v time -s conver6ations
 
 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
@@ -434,4 +415,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://github.com/siacs/Conversations/issues
+[issues]: https://dev.sum7.eu/sum7/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:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)" />
+       style="display:none;fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)" />
     <rect
-       style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)"
+       style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3811)"
        id="rect2987"
        width="20"
        height="20"

art/flip_camera_android-black-24dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" viewBox="0 0 24 24" fill="black" width="24px" height="24px"><g><rect fill="none" height="24" width="24"/></g><g><g><path d="M9,12c0,1.66,1.34,3,3,3s3-1.34,3-3s-1.34-3-3-3S9,10.34,9,12z"/><path d="M8,10V8H5.09C6.47,5.61,9.05,4,12,4c3.72,0,6.85,2.56,7.74,6h2.06c-0.93-4.56-4.96-8-9.8-8C8.73,2,5.82,3.58,4,6.01V4H2v6 H8z"/><path d="M16,14v2h2.91c-1.38,2.39-3.96,4-6.91,4c-3.72,0-6.85-2.56-7.74-6H2.2c0.93,4.56,4.96,8,9.8,8c3.27,0,6.18-1.58,8-4.01V20 h2v-6H16z"/></g></g></svg>

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:#00a000;fill-opacity:1">
+         style="display:inline;fill:#EF6C00;fill-opacity:1">
         <path
-           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"
+           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"
            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:#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"
+           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"
            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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </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:#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" />
+         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" />
     </clipPath>
   </defs>
   <metadata
@@ -290,7 +290,7 @@
      inkscape:groupmode="layer"
      transform="translate(-4,2.6816348)">
     <path
-       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"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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"
        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/ic_no_results_black.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_no_results_black.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="636"
+     inkscape:window-height="1156"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="1.0169492"
+     inkscape:cy="24"
+     inkscape:window-x="3200"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
+     id="path2"
+     style="fill:#000000;fill-opacity:1" />
+</svg>

art/ic_no_results_white.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_no_results_white.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="636"
+     inkscape:window-height="1156"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="1.0169492"
+     inkscape:cy="24"
+     inkscape:window-x="3200"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>

art/ic_received_indicator.svg

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="95"
-   height="95"
-   id="Yes_check"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_received_indicator.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="956"
-     inkscape:window-height="1156"
-     id="namedview8"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="5.04"
-     inkscape:cx="-4.3215257"
-     inkscape:cy="37.489149"
-     inkscape:window-x="2880"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Yes_check"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <defs
-     id="defs1373">
-    <linearGradient
-       id="linearGradient2250">
-      <stop
-         style="stop-color:#008700;stop-opacity:1"
-         offset="0"
-         id="stop2252" />
-      <stop
-         style="stop-color:#006f00;stop-opacity:1"
-         offset="1"
-         id="stop2254" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 2.3894499,61.412131 c 0,0 16.7473651,20.271938 22.3528491,26.154483 3.648598,3.026816 12.878061,3.83429 14.880462,0 1.64903,-2.636163 2.380404,-5.8348 2.991819,-7.931771 C 49.920898,54.575958 72.297563,22.337321 92.321082,10.50894 96.814837,5.2377522 86.327596,3.5063483 77.217442,6.9958109 63.487006,12.254946 34.107717,59.529917 29.270873,69.192545 22.40265,70.841418 12.518762,52.447046 12.518762,52.447046 7.3805037,52.552428 1.8841059,52.071763 2.3894499,61.412131 z"
-     style="fill:#259b24;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.29981154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="check"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccscsccc" />
-</svg>

art/ic_search_black.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_search_black.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="956"
+     inkscape:window-height="567"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-13.118644"
+     inkscape:cy="24"
+     inkscape:window-x="2880"
+     inkscape:window-y="609"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M31 28h-1.59l-.55-.55C30.82 25.18 32 22.23 32 19c0-7.18-5.82-13-13-13S6 11.82 6 19s5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55V31l10 9.98L40.98 38 31 28zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z"
+     id="path2"
+     style="fill:#000000;fill-opacity:1" />
+</svg>

art/ic_search_white.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_search_white.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1200"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-10.474576"
+     inkscape:cy="22.169492"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M31 28h-1.59l-.55-.55C30.82 25.18 32 22.23 32 19c0-7.18-5.82-13-13-13S6 11.82 6 19s5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55V31l10 9.98L40.98 38 31 28zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.99570817" />
+</svg>

art/ic_send_cancel_online.svg

@@ -50,5 +50,5 @@
   <path
      d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
      id="path4"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/ic_send_location_online.svg

@@ -50,5 +50,5 @@
   <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="stroke:none;stroke-opacity:0;fill:#259b24;fill-opacity:0.627451" />
+     style="stroke:none;stroke-opacity:0;fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/ic_send_photo_online.svg

@@ -52,9 +52,9 @@
      cy="24"
      r="6.4"
      id="circle4"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
   <path
      d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
      id="path6"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/ic_send_picture_online.svg

@@ -51,5 +51,5 @@
   <path
      d="M42 38V10c0-2.21-1.79-4-4-4H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4zM17 27l5 6.01L29 24l9 12H10l7-9z"
      id="path4"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/ic_send_text_online.svg

@@ -58,7 +58,7 @@
        id="grid3631" />
   </sodipodi:namedview>
   <path
-     style="fill:#259b24;fill-opacity:0.62745098;stroke:none"
+     style="fill:#43A047;fill-opacity:0.62745098;stroke:none"
      d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
      id="path3633"
      inkscape:connector-curvature="0"

art/ic_send_videocam_online.svg

@@ -51,5 +51,5 @@
   <path
      d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"
      id="path4"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/ic_send_voice_online.svg

@@ -50,5 +50,5 @@
   <path
      d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
      id="path4"
-     style="fill:#259b24;fill-opacity:0.627451" />
+     style="fill:#43A047;fill-opacity:0.627451" />
 </svg>

art/logo.png

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

art/marker.svg

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="marker.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3913"
+       id="radialGradient3883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2039074,-0.09024614,0.07170697,0.16216229,-92.579229,-90.973095)"
+       cx="262.33273"
+       cy="945.23846"
+       fx="262.33273"
+       fy="945.23846"
+       r="185.49754" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3913">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3915" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3917" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4167">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 24,4.0000001 C 16.27,4.0000001 10,10.27 10,18 10,28.5 24,44 24,44 24,44 38,28.5 38,18 38,10.27 31.73,4.0000001 24,4.0000001 Z M 24,23 c -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 0,2.76 -2.24,5 -5,5 z"
+         id="path4169"
+         style="fill:#000000;fill-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4321">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 24,4.0001492 c -7.73,0 -14,6.2699998 -14,14.0000008 0,10.5 14,26 14,26 0,0 14,-15.5 14,-26 C 38,10.270149 31.73,4.0001492 24,4.0001492 Z M 24,23.00015 c -2.76,0 -5,-2.24 -5,-5 0,-2.760001 2.24,-5.000001 5,-5.000001 2.76,0 5,2.24 5,5.000001 0,2.76 -2.24,5 -5,5 z"
+         id="path4323"
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:18, 3;stroke-dashoffset:0;stroke-opacity:0.53333285" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1010"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-15.254237"
+     inkscape:cy="12.20339"
+     inkscape:window-x="0"
+     inkscape:window-y="41"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <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" />
+  <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"
+     id="path3878"
+     inkscape:connector-curvature="0"
+     clip-path="url(#clipPath4167)" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 24,4.0000003 C 16.27,4.0000003 10,10.27 10,18 10,28.5 24,44 24,44 24,44 38,28.5 38,18 38,10.27 31.73,4.0000003 24,4.0000003 Z M 24,23 c -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 0,2.76 -2.24,5 -5,5 z"
+     id="path4-3"
+     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:30,5;stroke-opacity:0.53333336;stroke-dashoffset:44"
+     clip-path="url(#clipPath4321)" />
+</svg>

art/md_switch_thumb_disable.svg

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_disable_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <g
-       id="g6404">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.499878"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33229253)"
-         id="g4148">
-        <circle
-           style="opacity:1;fill:#bdbdbd;fill-opacity:1;stroke:#bdbdbd;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>

art/md_switch_thumb_off_normal.svg

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_off_normal_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.052965"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6390"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>

art/md_switch_thumb_off_pressed.svg

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_off_pressed_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#313131;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6417"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>

art/md_switch_thumb_on_normal.svg

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_on_normal_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-14.397519"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.499878"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6440"
-       transform="translate(3.3103058e-6,0.33241423)">
-      <circle
-         r="25.916904"
-         cy="62.167587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-12.323334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>

art/md_switch_thumb_on_pressed.svg

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_on_pressed_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-46.31369"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#0093e8;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <g
-       id="g4156">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.5"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33241423)"
-         id="g4149">
-        <circle
-           style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>

art/message_bubble_received.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#4b9b4a;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#FF9800;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:#326130;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#BF360C;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:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#282828;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
-         style="display:none;fill:#424242;fill-opacity:1"
+         style="display:none;fill:#282828;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:#424242;fill-opacity:1" />
+         style="fill:#282828;fill-opacity:1" />
       <rect
          ry="2"
          y="4"
@@ -161,7 +161,7 @@
          height="20"
          width="20"
          id="rect2987"
-         style="fill:#424242;fill-opacity:1" />
+         style="fill:#282828;fill-opacity:1" />
     </g>
   </g>
 </svg>

art/message_bubble_received_warning.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#c64545;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#ad4545;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_sent_grey.svg

@@ -140,9 +140,9 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#282828;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
-         style="display:none;fill:#424242;fill-opacity:1"
+         style="display:none;fill:#282828;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:#424242;fill-opacity:1" />
+         style="fill:#282828;fill-opacity:1" />
       <rect
          ry="2"
          y="4"
@@ -161,7 +161,7 @@
          height="20"
          width="20"
          id="rect2987"
-         style="fill:#424242;fill-opacity:1" />
+         style="fill:#282828;fill-opacity:1" />
     </g>
   </g>
 </svg>

art/open_pdf_black.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="open_pdf_black.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="956"
+     inkscape:window-height="1560"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-6.1016949"
+     inkscape:cy="12"
+     inkscape:window-x="4800"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M12,10.5H13V13.5H12V10.5M7,11.5H8V10.5H7V11.5M20,6V18A2,2 0 0,1 18,20H6A2,2 0 0,1 4,18V6A2,2 0 0,1 6,4H18A2,2 0 0,1 20,6M9.5,10.5A1.5,1.5 0 0,0 8,9H5.5V15H7V13H8A1.5,1.5 0 0,0 9.5,11.5V10.5M14.5,10.5A1.5,1.5 0 0,0 13,9H10.5V15H13A1.5,1.5 0 0,0 14.5,13.5V10.5M18.5,9H15.5V15H17V13H18.5V11.5H17V10.5H18.5V9Z"
+     id="path2"
+     style="fill:#000000;fill-opacity:0.5411765" />
+</svg>

art/open_pdf_white.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="open_pdf_white.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="1600"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-23.084746"
+     inkscape:cy="11.084746"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M12,10.5H13V13.5H12V10.5M7,11.5H8V10.5H7V11.5M20,6V18A2,2 0 0,1 18,20H6A2,2 0 0,1 4,18V6A2,2 0 0,1 6,4H18A2,2 0 0,1 20,6M9.5,10.5A1.5,1.5 0 0,0 8,9H5.5V15H7V13H8A1.5,1.5 0 0,0 9.5,11.5V10.5M14.5,10.5A1.5,1.5 0 0,0 13,9H10.5V15H13A1.5,1.5 0 0,0 14.5,13.5V10.5M18.5,9H15.5V15H17V13H18.5V11.5H17V10.5H18.5V9Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.69803923" />
+</svg>

art/play_gif_black.svg

@@ -64,5 +64,5 @@
      d="M11.5 9H13v6h-1.5zM9 9H6c-.6 0-1 .5-1 1v4c0 .5.4 1 1 1h3c.6 0 1-.5 1-1v-2H8.5v1.5h-2v-3H10V10c0-.5-.4-1-1-1zm10 1.5V9h-4.5v6H16v-2h2v-1.5h-2v-1z"
      clip-path="url(#b)"
      id="path10"
-     style="fill:#ffffff;fill-opacity:0.7019608" />
+     style="fill:#000000;fill-opacity:0.54" />
 </svg>

art/play_gif_white.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="play_gif.svg">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1200"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="1.5762712"
+     inkscape:cy="11.084746"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <path
+       id="a"
+       d="M24 24H0V0h24v24z" />
+  </defs>
+  <clipPath
+     id="b">
+    <use
+       xlink:href="#a"
+       overflow="visible"
+       id="use8" />
+  </clipPath>
+  <path
+     d="M11.5 9H13v6h-1.5zM9 9H6c-.6 0-1 .5-1 1v4c0 .5.4 1 1 1h3c.6 0 1-.5 1-1v-2H8.5v1.5h-2v-3H10V10c0-.5-.4-1-1-1zm10 1.5V9h-4.5v6H16v-2h2v-1.5h-2v-1z"
+     clip-path="url(#b)"
+     id="path10"
+     style="fill:#ffffff;fill-opacity:0.70" />
+</svg>

art/play_video_black.svg

@@ -55,5 +55,5 @@
   <path
      d="M20 33l12-9-12-9v18zm4-29C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm0 36c-8.82 0-16-7.18-16-16S15.18 8 24 8s16 7.18 16 16-7.18 16-16 16z"
      id="path6"
-     style="fill:#ffffff;fill-opacity:0.7019608;opacity:1;stroke:none;stroke-opacity:0.38039216" />
+     style="fill:#000000;fill-opacity:0.54;opacity:1;stroke:none;stroke-opacity:0.38039216" />
 </svg>

art/play_video_white.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="play_video.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1916"
+     inkscape:window-height="1156"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="0.91525424"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M0 0h48v48H0z"
+     fill="none"
+     id="path4" />
+  <path
+     d="M20 33l12-9-12-9v18zm4-29C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm0 36c-8.82 0-16-7.18-16-16S15.18 8 24 8s16 7.18 16 16-7.18 16-16 16z"
+     id="path6"
+     style="fill:#ffffff;fill-opacity:0.70;opacity:1;stroke:none;stroke-opacity:0.38039216" />
+</svg>

art/qrcode-scan.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24.00 24.00"
+   enable-background="new 0 0 24.00 24.00"
+   xml:space="preserve"
+   id="svg4"
+   sodipodi:docname="qrcode-scan.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="636"
+     inkscape:window-height="1156"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="0.50847458"
+     inkscape:cy="12"
+     inkscape:window-x="3200"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" /><path
+     fill="#000000"
+     fill-opacity="1"
+     stroke-width="0.2"
+     stroke-linejoin="miter"
+     d="M 4,4L 10,4L 10,10L 4,10L 4,4 Z M 20,4.00003L 20,10L 14,10L 14,4.00003L 20,4.00003 Z M 14,15L 16,15L 16,13L 14,13L 14,11L 16,11L 16,13L 18,13L 18,11L 20,11L 20,13L 18,13L 18,15L 20,15L 20,18L 18,18L 18,20L 16,20L 16,18L 13,18L 13,20L 11,20L 11,16L 14,16L 14,15 Z M 16,15L 16,18L 18,18L 18,15L 16,15 Z M 3.99999,20L 3.99999,14L 9.99999,14L 9.99999,20L 3.99999,20 Z M 5.99999,6.00003L 5.99999,8.00003L 7.99999,8.00003L 7.99999,6.00003L 5.99999,6.00003 Z M 16,6.00002L 16,8.00003L 18,8.00003L 18,6.00002L 16,6.00002 Z M 5.99999,16L 5.99999,18L 7.99999,18L 7.99999,16L 5.99999,16 Z M 4,11L 6,11L 6,13L 4,13L 4,11 Z M 8.99999,11L 13,11L 13,15L 11,15L 11,13L 8.99999,13L 8.99999,11 Z M 11,6.00002L 13,6.00002L 13,10L 11,10L 11,6.00002 Z M 2,2L 2,6L 0,6L 0,2C 0,0.9 0.900001,0 2,0L 6,0L 6,2L 2,2 Z M 22,1.90735e-006C 23.1,1.90735e-006 24,0.900002 24,2L 24,6L 22,6L 22,2L 18,2L 18,1.90735e-006L 22,1.90735e-006 Z M 2,18L 2,22L 6,22L 6,24L 2,24C 0.900001,24 0,23.1 0,22L 0,18L 2,18 Z M 22,22L 22,18L 24,18L 24,22C 24,23.1 23.1,24 22,24L 18,24L 18,22L 22,22 Z "
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" /></svg>

art/quicksy.svg

@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20.68mm"
+   height="20.68mm"
+   viewBox="0 0 20.680001 20.680001"
+   version="1.1"
+   id="svg14750"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="quicksy.svg"
+   inkscape:export-filename="/home/smagnan/Work/osp/osp.cloud/osp.work.quicksy/package-quicksy/quicksy.png"
+   inkscape:export-xdpi="175"
+   inkscape:export-ydpi="175">
+  <defs
+     id="defs14744">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect963"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect937"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect893"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect998"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect890"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect852"
+       is_visible="true" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6910-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6912-1"
+         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 v -0.008 l 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:#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"
+       id="clipPath6906-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6908-0"
+         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 v -0.008 l 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:#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"
+       id="clipPath6902-3">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6904-6"
+         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 v -0.008 l 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:#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"
+       id="clipPath6898-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6900-9"
+         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 v -0.008 l 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:#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"
+       id="clipPath6894-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6896-2"
+         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 v -0.008 l 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:#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"
+       id="clipPath6886-7">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6888-5"
+         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 v -0.008 l 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:#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"
+       id="clipPath6882-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6884-7"
+         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 v -0.008 l 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:#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"
+       id="clipPath6890-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6892-8"
+         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 v -0.008 l 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:#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"
+       id="clipPath6898-8-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6900-9-1"
+         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 v -0.008 l 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:#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"
+       id="clipPath6886-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6888-5-8"
+         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 v -0.008 l 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:#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"
+       id="clipPath6882-4-9">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6884-7-3"
+         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 v -0.008 l 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:#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"
+       id="clipPath6906-8-6">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6908-0-8"
+         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 v -0.008 l 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:#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"
+       id="clipPath6910-2-0">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6912-1-2"
+         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 v -0.008 l 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:#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"
+       id="clipPath6890-4-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6892-8-0"
+         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 v -0.008 l 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:#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"
+       id="clipPath6894-1-5">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6896-2-1"
+         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 v -0.008 l 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:#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"
+       id="clipPath6902-3-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6904-6-0"
+         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 v -0.008 l 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:#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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="24.499812"
+     inkscape:cy="6.9964144"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g14606"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="3836"
+     inkscape:window-height="1561"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="false"
+     inkscape:pagecheckerboard="true">
+    <sodipodi:guide
+       position="51.630255,101.26165"
+       orientation="0,1"
+       id="guide949"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata14747">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.210196,-206.61407)">
+    <g
+       style="display:inline"
+       id="g14606"
+       transform="matrix(0.28222223,0,0,0.28222223,-479.00124,-301.93764)">
+      <g
+         id="g925"
+         transform="translate(1.2646334,0.03223108)">
+        <g
+           style="stroke-width:2.7252984"
+           transform="matrix(0.3669323,0,0,0.3669323,1317.8763,1202.38)"
+           id="g980">
+          <path
+             style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.90119457;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 2039.9944,1634.1834 a 95.889395,95.889395 0 0 0 -95.8886,95.8887 95.889395,95.889395 0 0 0 95.8886,95.8906 95.889395,95.889395 0 0 0 42.7051,-10.0781 l 0.127,0.014 40.7929,15.832 c 3.2548,1.2632 7.5363,3.047 10.4551,0.2735 2.8333,-2.6923 2.1681,-5.4222 1.1875,-9.4121 l -11.3476,-46.168 v -0.01 0.01 a 95.889395,95.889395 0 0 0 11.9707,-46.3516 95.889395,95.889395 0 0 0 -95.8907,-95.8886 z"
+             id="path964"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 2052.7212,1719.2884 a 11.53697,11.53697 0 0 1 -11.537,11.537 11.53697,11.53697 0 0 1 -11.537,-11.537 11.53697,11.53697 0 0 1 11.537,-11.5369 11.53697,11.53697 0 0 1 11.537,11.5369 z"
+             id="path984" />
+          <path
+             id="path986"
+             d="m 2103.4386,1719.2885 a 11.53697,11.53697 0 0 1 -11.537,11.5369 11.53697,11.53697 0 0 1 -11.537,-11.5369 11.53697,11.53697 0 0 1 11.537,-11.537 11.53697,11.53697 0 0 1 11.537,11.537 z"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccsc"
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 2116.3676,1755.8129 c -12.7133,-0.329 -30.4545,38.6902 -29.8052,0.9297 0,-10.306 7.0406,-18.6606 15.7253,-18.6606 5.0651,0 14.5453,5.3309 14.0799,17.7309 z"
+             id="path988" />
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 1979.1343,1719.2885 a 11.53697,11.53697 0 0 0 11.537,11.5369 11.53697,11.53697 0 0 0 11.537,-11.5369 11.53697,11.53697 0 0 0 -11.537,-11.537 11.53697,11.53697 0 0 0 -11.537,11.537 z"
+             id="path990" />
+          <path
+             inkscape:original-d="m 2078.1216,1783.9664 c -8.7484,6.6613 -24.7952,13.3613 -37.8714,14.0385 -13.0762,0.6772 -23.1816,-4.6682 -36.5745,-13.8341 14.8965,10.484 19.8658,4.8954 20.9617,-7.412 0.5479,-6.1535 -1.1267,-25.0806 -0.2829,-28.2596 0.8437,-3.179 7.7475,-7.5824 16.8934,-7.5141 9.1459,0.068 15.9436,5.0338 16.6438,8.0452 0.7002,3.0115 -1.1553,21.0416 -0.7571,27.5128 0.7964,12.9425 5.5911,18.8599 20.987,7.4233 z"
+             inkscape:path-effect="#path-effect998"
+             sodipodi:nodetypes="cscsssssc"
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530907"
+             d="m 2078.1216,1783.9664 c -10.3552,9.0701 -24.1062,14.1675 -37.8714,14.0385 -13.3074,-0.1247 -26.5157,-5.1207 -36.5745,-13.8341 3.5313,2.5325 8.318,3.2125 12.415,1.7639 4.0969,-1.4487 7.3922,-4.9865 8.5467,-9.1759 0.6367,-2.3105 0.6496,-4.7548 0.375,-7.1357 -0.2746,-2.3808 -0.8297,-4.7188 -1.3173,-7.0653 -0.4876,-2.3465 -0.91,-4.7222 -0.9131,-7.1188 -0,-2.3967 0.4318,-4.832 1.5725,-6.9398 1.5437,-2.8524 4.3008,-4.9253 7.329,-6.087 3.0281,-1.1617 6.3215,-1.4775 9.5644,-1.4271 3.2431,0.05 6.5253,0.4683 9.5154,1.7251 2.9901,1.2569 5.68,3.418 7.1284,6.3201 1.0414,2.0866 1.4036,4.4624 1.3534,6.7939 -0.05,2.3314 -0.4967,4.6354 -1.0019,6.912 -0.5053,2.2766 -1.0719,4.5449 -1.3688,6.8579 -0.297,2.313 -0.3181,4.6899 0.2602,6.949 1.0858,4.2417 4.3854,7.8502 8.5132,9.3103 4.1278,1.46 8.9625,0.7286 12.4738,-1.887 z"
+             id="path996" />
+          <path
+             id="path1002"
+             d="m 1966.202,1755.8129 c 12.7133,-0.329 30.4544,38.6902 29.8051,0.9297 0,-10.306 -7.0405,-18.6606 -15.7252,-18.6606 -5.0651,0 -14.5453,5.3309 -14.0799,17.7309 z"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsc" />
+        </g>
+        <g
+           style="stroke-width:0.84566534"
+           transform="matrix(1.1825009,0,0,1.1825009,-382.86422,-389.99169)"
+           id="g904">
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6910-2-0)"
+             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="path966"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csccscc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6906-8-6)"
+             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="path968"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csccccccc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6902-3-1)"
+             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="path970"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sccsccs"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6898-8-8)"
+             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="path972"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sccsccs"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6894-1-5)"
+             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="path974"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccsc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6886-7-2)"
+             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="path976"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccccsssc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6882-4-9)"
+             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="path978"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6890-4-1)"
+             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="path994"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccscc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.0741,1853.6334)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

art/quicksy_main_logo.svg

@@ -0,0 +1 @@
+quicksy.svg

art/quicksy_mono.svg

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21.637424mm"
+   height="21.637424mm"
+   viewBox="0 0 21.637424 21.637426"
+   version="1.1"
+   id="svg14750"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="quicksy_mono.svg"
+   inkscape:export-filename="/home/smagnan/Work/osp/osp.cloud/osp.work.quicksy/package-quicksy/quicksy-adaptative.png"
+   inkscape:export-xdpi="175"
+   inkscape:export-ydpi="175">
+  <defs
+     id="defs14744">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect963"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect937"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect893"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect998"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect890"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect852"
+       is_visible="true" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6910-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6912-1"
+         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 v -0.008 l 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:#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"
+       id="clipPath6906-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6908-0"
+         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 v -0.008 l 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:#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"
+       id="clipPath6902-3">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6904-6"
+         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 v -0.008 l 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:#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"
+       id="clipPath6898-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6900-9"
+         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 v -0.008 l 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:#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"
+       id="clipPath6894-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6896-2"
+         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 v -0.008 l 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:#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"
+       id="clipPath6886-7">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6888-5"
+         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 v -0.008 l 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:#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"
+       id="clipPath6882-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6884-7"
+         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 v -0.008 l 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:#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"
+       id="clipPath6890-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6892-8"
+         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 v -0.008 l 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:#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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="-19.000081"
+     inkscape:cy="39.577553"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g14606"
+     showgrid="false"
+     fit-margin-top="0.5"
+     fit-margin-left="0.87888"
+     fit-margin-right="0.87888"
+     fit-margin-bottom="0.5"
+     inkscape:window-width="1916"
+     inkscape:window-height="1561"
+     inkscape:window-x="3840"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="mm"
+     inkscape:pagecheckerboard="true">
+    <sodipodi:guide
+       position="-11.854979,103.32866"
+       orientation="0,1"
+       id="guide949"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata14747">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-157.69546,-207.72366)">
+    <g
+       style="display:inline"
+       id="g14606"
+       transform="matrix(0.28222223,0,0,0.28222223,-479.00124,-301.93764)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path982"
+         d="m 2294.3053,1807.6581 a 35.179682,35.179682 0 0 0 -35.1793,35.1795 35.179682,35.179682 0 0 0 35.1793,35.1801 35.179682,35.179682 0 0 0 15.6671,-3.6974 l 0.047,0.016 14.9657,5.8081 c 1.1941,0.4634 2.765,1.1176 3.8357,0.1008 1.0396,-0.9878 0.7952,-1.9892 0.4353,-3.453 l -4.1628,-16.9381 a 35.179682,35.179682 0 0 0 4.3919,-17.0051 35.179682,35.179682 0 0 0 -35.18,-35.1796 z m -18.0955,26.9906 a 4.2326574,4.2326574 0 0 1 4.2322,4.2329 4.2326574,4.2326574 0 0 1 -4.2322,4.232 4.2326574,4.2326574 0 0 1 -4.2329,-4.232 4.2326574,4.2326574 0 0 1 4.2329,-4.2329 z m 18.5316,0 a 4.2326574,4.2326574 0 0 1 4.2327,4.2329 4.2326574,4.2326574 0 0 1 -4.2327,4.232 4.2326574,4.2326574 0 0 1 -4.2323,-4.232 4.2326574,4.2326574 0 0 1 4.2323,-4.2329 z m 18.6074,0 a 4.2326574,4.2326574 0 0 1 4.2327,4.2329 4.2326574,4.2326574 0 0 1 -4.2327,4.232 4.2326574,4.2326574 0 0 1 -4.2329,-4.232 4.2326574,4.2326574 0 0 1 4.2329,-4.2329 z m -40.9506,11.1272 c 3.1862,0 5.7692,3.0658 5.7692,6.8468 0.2382,13.8535 -6.2709,-0.4619 -10.9352,-0.3413 -0.1706,-4.5493 3.3077,-6.5055 5.166,-6.5055 z m 44.7609,0 c 1.8583,0 5.3366,1.9562 5.166,6.5055 -4.6643,-0.1203 -11.1734,14.1948 -10.9352,0.3413 0,-3.781 2.583,-6.8468 5.7692,-6.8468 z m -22.3942,1.0655 c 1.1897,0.018 2.3941,0.1717 3.4912,0.6327 1.0971,0.4611 2.0838,1.2544 2.6152,2.3191 0.3821,0.7655 0.5149,1.6369 0.4964,2.4922 -0.018,0.8553 -0.1822,1.7007 -0.3674,2.5359 -0.1854,0.8354 -0.3936,1.6673 -0.5026,2.5159 -0.1089,0.8485 -0.117,1.7206 0.096,2.5493 0.3984,1.5562 1.6087,2.8803 3.1231,3.416 1.5145,0.5358 3.2879,0.267 4.5762,-0.6926 -3.7992,3.3277 -8.8442,5.1979 -13.8944,5.1504 -4.8822,-0.046 -9.7276,-1.8785 -13.418,-5.0752 1.2957,0.9292 3.0515,1.1785 4.5546,0.647 1.5032,-0.5315 2.7124,-1.8292 3.1358,-3.3664 0.2337,-0.8475 0.2386,-1.7442 0.1381,-2.6177 -0.1007,-0.8736 -0.3048,-1.731 -0.4837,-2.5918 -0.1787,-0.8609 -0.3339,-1.7326 -0.3352,-2.6118 0,-0.8794 0.1593,-1.7727 0.5772,-2.546 0.5662,-1.0466 1.578,-1.8075 2.6889,-2.2337 1.1111,-0.4262 2.319,-0.5419 3.5089,-0.5233 z"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

art/quicksy_splash_logo.svg

@@ -0,0 +1 @@
+quicksy.svg

art/render.rb

@@ -11,12 +11,23 @@ resolutions = {
 	}
 
 images = {
-	'ic_launcher.svg' => ['ic_launcher', 48],
-	'main_logo.svg' => ['main_logo', 200],
-	'play_video.svg' => ['play_video', 128],
-	'play_gif.svg' => ['play_gif', 128],
-	'conversations_mono.svg' => ['ic_notification', 24],
-	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
+	'main_logo.svg' => ['conversations/main_logo', 200],
+    'quicksy_main_logo.svg' => ['quicksy/main_logo', 200],
+    'splash_logo.svg' => ['conversations/splash_logo', 144],
+    'quicksy_splash_logo.svg' => ['quicksy/splash_logo', 144],
+    'ic_search_black.svg' => ['ic_search_background_black', 144],
+    'ic_search_white.svg' => ['ic_search_background_white', 144],
+    'ic_no_results_white.svg' => ['ic_no_results_background_white', 144],
+    'ic_no_results_black.svg' => ['ic_no_results_background_black', 144],
+	'play_video_white.svg' => ['play_video_white', 128],
+	'play_gif_white.svg' => ['play_gif_white', 128],
+    'play_video_black.svg' => ['play_video_black', 128],
+    'play_gif_black.svg' => ['play_gif_black', 128],
+    'open_pdf_black.svg' => ['open_pdf_black', 128],
+    'open_pdf_white.svg' => ['open_pdf_white', 128],
+	'conversations_mono.svg' => ['conversations/ic_notification', 24],
+    'quicksy_mono.svg' => ['quicksy/ic_notification', 24],
+    'flip_camera_android-black-24dp.svg' => ['ic_flip_camera_android_black_24dp', 24],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
 	'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],
 	'ic_send_text_online.svg' => ['ic_send_text_online', 36],
@@ -57,11 +68,7 @@ images = {
 	'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
 	'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
 	'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36],
-	'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
-	'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
-	'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
-	'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
-	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
+    'qrcode-scan.svg' => ['ic_qr_code_scan_white_24dp', 24],
 	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
 	'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
 	'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
@@ -71,13 +78,14 @@ images = {
 	'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
 	'date_bubble_white.svg' => ['date_bubble_white.9', 0],
 	'date_bubble_grey.svg' => ['date_bubble_grey.9', 0],
+	'marker.svg' => ['marker', 0]
 	}
 
 # Executable paths for Mac OSX
 # "/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
 
 inkscape = "inkscape"
-imagemagick = "convert"
+imagemagick = "magick"
 
 def execute_cmd(cmd)
 	puts cmd
@@ -104,8 +112,14 @@ images.each do |source_filename, settings|
 			height = factor * base_height
 		end
 
-		path = "../src/main/res/drawable-#{resolution}/#{output_filename}.png"
-		execute_cmd "#{inkscape} -f #{source_filename} -z -C -w #{width} -h #{height} -e #{path}"
+        output_parts = output_filename.split('/')
+
+        if output_parts.count != 2
+    		path = "../src/main/res/drawable-#{resolution}/#{output_filename}.png"
+        else
+            path = "../src/#{output_parts[0]}/res/drawable-#{resolution}/#{output_parts[1]}.png"
+        end
+		execute_cmd "#{inkscape} #{source_filename} -C -w #{width} -h #{height} -o #{path}"
 
 		top = []
 		right = []
@@ -141,7 +155,7 @@ images.each do |source_filename, settings|
 
 		execute_cmd "#{imagemagick} -background none PNG32:#{path} -gravity center -extent #{width+2}x#{height+2} PNG32:#{path}"
 
-		draw_format = "-draw \"rectangle %d,%d %d,%d\""
+		draw_format = "-draw \"line %d,%d %d,%d\""
 		top_line = draw_format % [top.min + 1, 0, top.max, 0]
 		right_line = draw_format % [width + 1, right.min + 1, width + 1, right.max]
 		bottom_line = draw_format % [bottom.min + 1, height + 1, bottom.max, height + 1]

art/splash_logo.svg

@@ -0,0 +1 @@
+ic_launcher.svg

build.gradle

@@ -3,82 +3,113 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
 repositories {
-    jcenter()
+    google()
     mavenCentral()
-    maven {
-        url 'https://maven.google.com'
-    }
-    maven {
-        url "https://jitpack.io"
-    }
+    jcenter()
 }
 
 configurations {
     playstoreImplementation
-    freeImplementation
-}
-
-ext {
-    supportLibVersion = '27.0.2'
+    compatImplementation
+    conversationsFreeCompatImplementation
+    conversationsPlaystoreCompatImplementation
+    conversationsPlaystoreSystemImplementation
+    quicksyPlaystoreCompatImplementation
+    quicksyPlaystoreSystemImplementation
+    quicksyFreeCompatImplementation
+    quicksyImplementation
 }
 
 dependencies {
-    implementation project(':libs:MemorizingTrustManager')
-    implementation project(':libs:EnhancedListView')
-    playstoreImplementation 'com.google.android.gms:play-services-gcm:11.8.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+
+    playstoreImplementation('com.google.firebase:firebase-messaging:22.0.0') {
+        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'
+    quicksyPlaystoreSystemImplementation 'com.google.android.gms:play-services-auth-api-phone:17.5.1'
     implementation 'org.sufficientlysecure:openpgp-api:10.0'
-    implementation 'com.soundcloud.android:android-crop:1.0.1@aar'
-    implementation "com.android.support:support-v13:$supportLibVersion"
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-emoji:$supportLibVersion"
-    freeImplementation "com.android.support:support-emoji-bundled:$supportLibVersion"
-    implementation 'org.bouncycastle:bcmail-jdk15on:1.58'
-    implementation 'org.jitsi:org.otr4j:0.22'
-    implementation 'org.gnu.inet:libidn:1.15'
-    implementation 'com.google.zxing:core:3.3.0'
-    implementation 'com.google.zxing:android-integration:3.3.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    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'
+    compatImplementation 'androidx.emoji:emoji-appcompat:1.1.0'
+    conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+    quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+    implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
+    //zxing stopped supporting Java 7 so we have to stick with 3.3.3
+    //https://github.com/zxing/zxing/issues/1170
+    implementation 'com.google.zxing:core:3.3.3'
     implementation 'de.measite.minidns:minidns-hla:0.2.4'
-    implementation 'me.leolin:ShortcutBadger:1.1.21@aar'
-    implementation 'com.kyleduo.switchbutton:library:1.2.8'
+    implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation "com.wefika:flowlayout:0.4.1"
-    implementation 'net.ypresto.androidtranscoder:android-transcoder:0.2.0'
-    implementation 'com.github.scottyab:showhidepasswordedittext:0.8'
+    implementation 'com.otaliastudios:transcoder:0.10.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 'me.drakeet.support:toastcompat:1.1.0'
+    implementation "com.leinardi.android:speed-dial:3.2.0"
+
+    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.google.guava:guava:30.1.1-android'
+    quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.36'
+    // implementation fileTree(include: ['libwebrtc-m92.aar'], dir: 'libs')
+    implementation 'org.webrtc:google-webrtc:1.0.32006'
 }
 
 ext {
     travisBuild = System.getenv("TRAVIS") == "true"
     preDexEnabled = System.getProperty("pre-dex", "true")
+    abiCodes = ['armeabi-v7a': 1, 'x86': 2, 'x86_64': 3, 'arm64-v8a': 4]
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 252
-        versionName "1.23.5"
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 4202301
+        versionName "2.10.2"
         archivesBaseName += "-$versionName"
-        applicationId "eu.siacs.conversations"
+        applicationId "eu.sum7.conversations"
+        resValue "string", "applicationId", applicationId
+        def appName = "Conv6ations"
+        resValue "string", "app_name", appName
+        buildConfigField "String", "APP_NAME", "\"$appName\"";
     }
 
-    dexOptions {
-        // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
-        preDexLibraries = preDexEnabled && !travisBuild
-        jumboMode true
+
+    configurations {
+        implementation.exclude group: 'org.jetbrains' , module:'annotations'
+    }
+
+    dataBinding {
+        enabled true
     }
 
     compileOptions {
@@ -86,15 +117,97 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions("distribution")
+    flavorDimensions("mode", "distribution", "emoji")
 
     productFlavors {
+
+        quicksy {
+            dimension "mode"
+            applicationId = "im.quicksy.client"
+            resValue "string", "applicationId", applicationId
+
+            def appName = "Quicksy"
+            resValue "string", "app_name", appName
+            buildConfigField "String", "APP_NAME", "\"$appName\"";
+        }
+
+        conversations {
+            dimension "mode"
+        }
+
         playstore {
             dimension "distribution"
         }
         free {
             dimension "distribution"
         }
+        system {
+            dimension "emoji"
+        }
+        compat {
+            dimension "emoji"
+        }
+    }
+
+    sourceSets {
+        quicksyFreeSystem {
+            java {
+                srcDir 'src/quicksyFree/java'
+            }
+        }
+        quicksyFreeCompat {
+            java {
+                srcDir 'src/freeCompat/java'
+                srcDir 'src/quicksyFree/java'
+            }
+        }
+        quicksyPlaystoreCompat {
+            java {
+                srcDir 'src/playstoreCompat/java'
+                srcDir 'src/quicksyPlaystore/java'
+            }
+            res {
+                srcDir 'src/playstoreCompat/res'
+                srcDir 'src/quicksyPlaystore/res'
+            }
+        }
+        quicksyPlaystoreSystem {
+            java {
+                srcDir 'src/quicksyPlaystore/java'
+            }
+            res {
+                srcDir 'src/quicksyPlaystore/res'
+            }
+        }
+        conversationsFreeCompat {
+            java {
+                srcDir 'src/freeCompat/java'
+                srcDir 'src/conversationsFree/java'
+            }
+        }
+        conversationsFreeSystem {
+            java {
+                srcDir 'src/conversationsFree/java'
+            }
+        }
+        conversationsPlaystoreCompat {
+            java {
+                srcDir 'src/playstoreCompat/java'
+                srcDir 'src/conversationsPlaystore/java'
+            }
+            res {
+                srcDir 'src/playstoreCompat/res'
+                srcDir 'src/conversationsPlaystore/res'
+            }
+        }
+        conversationsPlaystoreSystem {
+            java {
+                srcDir 'src/conversationsPlaystore/java'
+            }
+            res {
+                srcDir 'src/conversationsPlaystore/res'
+            }
+        }
     }
 
     buildTypes {
@@ -111,8 +224,7 @@ android {
     }
 
 
-
-    if(new File("signing.properties").exists()) {
+    if (new File("signing.properties").exists()) {
         Properties props = new Properties()
         props.load(new FileInputStream(file("signing.properties")))
 
@@ -128,7 +240,8 @@ android {
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
+        disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource'
+        abortOnError false
     }
 
     subprojects {

conversations.doap

@@ -0,0 +1,472 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="../style.xsl" type="text/xsl"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<Project xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#"
+         xmlns:schema="https://schema.org/">
+    <name>Conversations</name>
+
+    <created>2014-01-14</created>
+
+    <shortdesc xml:lang="en">Android XMPP Client</shortdesc>
+
+    <description xml:lang="en">Conversations is an open source XMPP/Jabber client for the Android platform</description>
+
+    <homepage rdf:resource="https://conversations.im/"/>
+    <download-page rdf:resource="https://play.google.com/store/apps/details?id=eu.siacs.conversations"/>
+    <bug-database rdf:resource="https://github.com/iNPUTmice/Conversations/issues"/>
+    <!-- See https://github.com/ewilderj/doap/issues/53 -->
+    <developer-forum rdf:resource="xmpp:conversations@siacs.conference.eu?join"/>
+    <support-forum rdf:resource="xmpp:conversations@siacs.conference.eu?join"/>
+
+    <license rdf:resource="https://github.com/iNPUTmice/Conversations/blob/master/LICENSE"/>
+
+    <!-- See https://github.com/ewilderj/doap/issues/49 -->
+    <language>en</language>
+
+    <schema:logo rdf:resource="https://raw.githubusercontent.com/iNPUTmice/Conversations/master/art/ic_launcher.svg"/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png'/>
+    <schema:screenshot rdf:resource='https://raw.githubusercontent.com/iNPUTmice/Conversations/master/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png'/>
+
+    <programming-language>Java</programming-language>
+
+    <os>Android</os>
+
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-xmpp"/>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-jabber"/>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-client"/>
+
+    <maintainer>
+        <foaf:Person>
+            <foaf:name>Daniel Gultsch</foaf:name>
+            <foaf:homepage rdf:resource="https://gultsch.de/"/>
+        </foaf:Person>
+    </maintainer>
+
+    <repository>
+        <GitRepository>
+            <browse rdf:resource="https://github.com/iNPUTmice/Conversations"/>
+            <location rdf:resource="https://github.com/iNPUTmice/Conversations.git"/>
+        </GitRepository>
+    </repository> 
+
+    <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html"/>
+    <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html"/>
+    <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html"/>
+    <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html"/>
+
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.4</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>2.5rc3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.32.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0049.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.2</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html"/>
+            <xmpp:status>partial</xmpp:status>
+            <xmpp:version>1.2</xmpp:version>
+            <xmpp:note xml:lang='en'>Avatars only</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>2.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.5.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html"/>
+            <xmpp:status>partial</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+            <xmpp:note xml:lang='en'>Read only. Publication via XEP-0398</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0163.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.2.1</xmpp:version>
+            <xmpp:note>Avatar, Nick, OMEMO</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0166.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1.2</xmpp:version>
+            <xmpp:note>File transfer + A/V calls</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0167.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.2.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+            <xmpp:note>read only</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0176.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.4.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.6</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>2.0.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>2.0.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0215.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.7</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0223.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0234.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.19.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0237.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0245.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.2</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0260.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0261.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.13.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0293.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0294.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.2.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.6.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.2</xmpp:version>
+            <xmpp:note>opt-in</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0320.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.3</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0338.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0339.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.3.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0353.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.3.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0357.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.4.0</xmpp:version>
+            <xmpp:note>Only available in the version distributed over Google Play</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.1.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.2</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.3.0</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0391.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.1.2</xmpp:version>
+            <xmpp:since>2.5.8</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.6.0</xmpp:version>
+            <xmpp:since>2.3.1</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0393.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.1.4</xmpp:version>
+            <xmpp:since>1.22.0</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0396.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.1</xmpp:version>
+            <xmpp:since>2.5.8</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.2.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0410.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.1</xmpp:version>
+            <xmpp:since>2.5.4</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0411.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <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>
+            <created>2021-05-03</created>
+            <file-release rdf:resource="https://github.com/iNPUTmice/Conversations/archive/2.9.13.tar.gz"/>
+        </Version>
+    </release>
+</Project>
+</rdf:RDF>

docs/MISSION.md

@@ -1,25 +0,0 @@
-Conversations is a messenger for the next decade. Based on already established
-internet standards that have been around for over ten years Conversations isn’t
-trying to replace current commercial messengers. It will simply outlive them.
-Commercial, closed source products are coming and going. 15 years ago we had ICQ
-which was replaced by Skype. MySpace was replaced by Facebook. WhatsApp and
-Hangouts will disappear soon. Internet standards however stick around. People
-are still using IRC and e-mail even though these protocols have been around for
-decades. Utilizing proven standards doesn’t mean one can not evolve. GMail has
-revolutionized the way we look at e-mail. Firefox and Chrome have changed the
-way we use the Web. Conversations will change the way we look at instant
-messaging. Being less obtrusive than a telephone call instant messaging has
-always played an important role in modern society. Conversations will show that
-instant messaging can be fast, reliable and private. Conversations will not
-force its security and privacy aspects upon the user. For those willing to use
-encryption Conversations will make it as uncomplicated as possible. However
-Conversations is aware that end-to-end encryption by the very principle isn’t
-trivial. Instead of trying the impossible and making encryption easier than
-comparing a fingerprint Conversations will try to educate the willing user and
-explain the necessary steps and the reasons behind them. Those unwilling to
-learn about encryption will still be protected by the design principals of
-Conversations.  Conversations will simply not share or generate certain
-information for example by encouraging the use of federated servers.
-Conversations will always utilize the best available standards for encryption
-and media encoding instead of reinventing the wheel. However it isn’t afraid to
-break with behavior patterns that have been proven ineffective.

docs/XEPs.md

@@ -1,32 +0,0 @@
-* XEP-0027: Current Jabber OpenPGP Usage
-* XEP-0030: Service Discovery
-* XEP-0045: Multi-User Chat
-* XEP-0048: Bookmarks
-* XEP-0084: User Avatar
-* XEP-0085: Chat State Notifications
-* XEP-0092: Software Version
-* XEP-0115: Entity Capabilities
-* XEP-0163: Personal Eventing Protocol (avatars and nicks)
-* XEP-0166: Jingle (only used for file transfer)
-* XEP-0172: User Nickname
-* XEP-0184: Message Delivery Receipts (reply only)
-* XEP-0191: Blocking command
-* XEP-0198: Stream Management
-* XEP-0199: XMPP Ping
-* XEP-0234: Jingle File Transfer
-* XEP-0237: Roster Versioning
-* XEP-0245: The /me Command
-* XEP-0249: Direct MUC Invitations (receiving only)
-* XEP-0260: Jingle SOCKS5 Bytestreams Transport Method
-* XEP-0261: Jingle In-Band Bytestreams Transport Method
-* XEP-0280: Message Carbons
-* XEP-0308: Last Message Correction
-* XEP-0313: Message Archive Management
-* XEP-0319: Last User Interaction in Presence
-* XEP-0333: Chat Markers
-* XEP-0352: Client State Indication
-* XEP-0357: Push Notifications
-* XEP-0363: HTTP File Upload
-* XEP-0368: SRV records for XMPP over TLS
-* XEP-0377: Spam Reporting 
-* XEP-0384: OMEMO Encryption

docs/observations.md

@@ -1,97 +0,0 @@
-Observations on implementing XMPP
-=================================
-After spending the last two and a half month basically writing my own XMPP
-library from scratch I decided to share some of the observations I made in the
-process. In part this article can be seen as a response to a blog post made by
-Dr. Ing. Georg Lukas. The blog post introduces a couple of XEP (XMPP Extensions)
-which make the life on mobile devices a lot easier but states that they are
-currently very few implementations of those XEPs. So I went ahead and
-implemented all of them in my Android XMPP client.
-
-### General observations
-The first thing I noticed is that XMPP is actually okish designed. If you were
-to design a new chat protocol today you probably wouldn’t choose XML again
-however the protocol basically consists of only three different packages which
-are quickly hidden under some sort of abstraction layer within your library.
-Getting from zero to sending messages to other users actually was very simple
-and straight forward. But then came the XEPs.
-
-### Multi-User Chat
-The first one was XEP-0045 Multi-User Chat. This is the one XEP of the XEPs I’m
-going to mention in my article which is actually wildly adopted. Most clients
-and servers I know of support MUC. However the level of completeness varies.
-MUC actually introduces access and permission roles which are far more complex
-than what some of us are used to from IRC but a lot of clients just don’t
-implement them. I’m not implementing them myself (at least for now) because I
-somewhat doubt that someone would actually use them (however this might be some
-sort of chicken or egg problem). I did find some strange bugs though which might
-be interesting for other library developers. In theory a MUC server
-implementation can allow a  single user (same jid) to join a conference room
-multiple times with the same nick from different clients. This means if someone
-wants to participate in a conference from two different devices (mobile and
-desktop for example) one wouldn’t have to name oneself `userDesktop` and
-`userMobile` but just `user`. Both ejabberd and prosody support this but with
-strange side effects. Prosody for example doesn’t allow a user to change its
-name once two clients are “merged” by having the same nick.
-
-### Carbons and Stream Management
-Two of the other XEPs Lukas mentions — Carbons (XEP-0280) and Stream Management
-(XEP-0198) — were actually fairly easy to implement. The only challenges were to
-find a server to support them (I ended up running my own Prosody server) and a
-desktop client to test them with. For carbons there is a patched Mcabber version
-and Gajim. After implementing stream management I had very good results on my
-mobile device. I had sessions running for up to 24 hours with a walking outside,
-loosing mobile coverage for a few minutes and so on. The only limitation was
-that I had to keep on developing and reinstalling my app.
-
-### Off the record
-And then came OTR... This is were I spend the most time debugging stuff and
-trying to get things right and compatible with other clients. This is the part
-were I want to help other developers not to make the same mistakes and maybe
-come to some sort of consent among XMPP developers to ultimately increase the
-interoperability. OTR has some down sides which make it difficult or at times
-even dangerous to implement within XMPP. First of all it is a synchronous
-protocol which is tunneled through a different protocol (XMPP). Synchronous
-means — among other things — auto replies. (An OTR session begins with “hi I’m
-speaking otr give me your key” “ok cool here is my key”) And auto replies — we
-know that since the first time an out of office auto responder went postal — are
-dangerous. Things really start to get messy when you use one of the best
-features of XMPP — multiple clients. The way XMPP works is that clients are
-encouraged to send their messages to the raw jid and let the server decide what
-full jid the messages are routed to. If in doubt even all of them. So what
-happens when Alice sends a  start-otr-message to Bobs raw jid? Bob receives the
-message on his notebook as well as his cell phone. Both of them answer. Alice
-gets two different replies. Shit explodes. Even if Alice  sends the message to
-bob/notebook chances are that Bob has carbon messages enabled and still receives
-the messages on both devices. Now assuming that Bobs client is clever enough not
-to auto reply to carbonated messages Bob/cellphone will still end up with a lot
-of garbage messages. (Essentially the entire conversation between Alice and
-Bob/notebook but unreadable of course) Therefor it should be good practice to
-tag OTR messages as both private and no-copy (private is part of the carbons
-XEP, no-copy is a general hint). I found that prosody for some reasons doesn’t
-honor the private tag on outgoing messages. While this is easily fixed I presume
-that having both the private and the no-copy tag will make it more compatible
-with servers or clients I don’t know about yet.
-
-#### Rules to follow when implementing OTR
-To summarize my observations on implementing OTR in XMPP let me make the
-following three statements.
-
-1. While it is good practice for unencrypted messages to be send to the raw jid
-and have the receiving server or user decide how they should be routed OTR
-messages must be send to a specific resource. To make this work the user should
-be given the option to select the presence (which can be assisted with some
-educated guessing by the client based on previous messages).  Furthermore a
-client should encourage a user to choose meaningful presences instead of the
-clients name or even random ones. Something like `/mobile`, `/notebook`,
-`/desktop` is a greater assist to any one who wants to start an otr session then
-`/Gajim`, `/mcabber` or `/pidgin`.
-
-2. Messages should be tagged private and no-copy to avoid unnecessary traffic or
-otr error loops with faulty clients. This tagging should be done even if your
-own client doesn’t support carbons.
-
-3. When dealing with “legacy clients” — meaning clients which don’t follow my
-advise — a client should be extra careful not to create message loops. This
-means to not respond with otr errors if a client is not 100% sure it is the only
-client which received the message

gradle.properties

@@ -1 +1,3 @@
-org.gradle.jvmargs=-Xmx2048M
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sat Nov 14 09:59:55 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

libs/EnhancedListView/build.gradle

@@ -1,98 +0,0 @@
-apply plugin: 'com.android.library'
-
-repositories {
-    mavenCentral()
-    google()
-}
-
-dependencies {
-    compile 'com.android.support:support-v4:27.0.2'
-    compile 'com.nineoldandroids:library:2.4.0'
-}
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
-        versionName "0.3.4"
-        versionCode 9
-    }
-
-	lintOptions {
-		abortOnError false
-	}
-}
-
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-version = android.defaultConfig.versionName
-group = "de.timroes.android"
-
-if(project.hasProperty("EnhancedListView.properties") && new File(project.property("EnhancedListView.properties")).exists()) {
-
-    Properties props = new Properties()
-    props.load(new FileInputStream(file(project.property("EnhancedListView.properties"))))
-
-    gradle.taskGraph.whenReady { taskGraph ->
-        if (taskGraph.allTasks.any { it instanceof Sign }) {
-            allprojects { ext."signing.keyId" = props['signing.keyId'] }
-            allprojects { ext."signing.secretKeyRingFile" = props['signing.secretKeyRingFile'] }
-            allprojects { ext."signing.password" = props['signing.password'] }
-        }
-    }
-
-    signing {
-        required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
-        sign configurations.archives
-    }
-
-    uploadArchives {
-
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: props['sonatypeRepo']) {
-                authentication(userName: props['sonatypeUsername'], password: props['sonatypePassword'])
-            }
-
-            pom.project {
-
-                name 'EnhancedListView'
-                packaging 'aar'
-                description 'ListView with enhanced features for Android'
-                url 'https://github.com/timroes/EnhancedListView'
-
-                scm {
-                    url 'scm:git@github.com:timroes/EnhancedListView.git'
-                    connection 'scm:git@github.com:timroes/EnhancedListView.git'
-                    developerConnection  'scm:git@github.com:timroes/EnhancedListView.git'
-                }
-
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        distribution 'repo'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'timroes'
-                        name 'Tim Roes'
-                        email 'mail@timroes.de'
-                    }
-                }
-
-            }
-
-        }
-    }
-
-}

libs/EnhancedListView/src/main/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<manifest package="de.timroes.android.listview">
-
-    <application>
-    </application>
-
-</manifest>

libs/EnhancedListView/src/main/java/de/timroes/android/listview/EnhancedListView.java

@@ -1,969 +0,0 @@
-/*
- * Copyright 2012 - 2013 Roman Nurik, Jake Wharton, Tim Roes
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package de.timroes.android.listview;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.AbsListView;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-import com.nineoldandroids.view.ViewPropertyAnimator;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * A {@link android.widget.ListView} offering enhanced features like Swipe To Dismiss and an
- * undo functionality. See the documentation on GitHub for more information.
- *
- * @author Tim Roes <mail@timroes.de>
- */
-public class EnhancedListView extends ListView {
-
-    /**
-     * Defines the style in which <i>undos</i> should be displayed and handled in the list.
-     * Pass this to {@link #setUndoStyle(de.timroes.android.listview.EnhancedListView.UndoStyle)}
-     * to change the default behavior from {@link #SINGLE_POPUP}.
-     */
-    public enum UndoStyle {
-
-        /**
-         * Shows a popup window, that allows the user to undo the last
-         * dismiss. If another element is deleted, the undo popup will undo that deletion.
-         * The user is only able to undo the last deletion.
-         */
-        SINGLE_POPUP,
-
-        /**
-         * Shows a popup window, that allows the user to undo the last dismiss.
-         * If another item is deleted, this will be added to the chain of undos. So pressing
-         * undo will undo the last deletion, pressing it again will undo the deletion before that,
-         * and so on. As soon as the popup vanished (e.g. because {@link #setUndoHideDelay(int) autoHideDelay}
-         * is over) all saved undos will be discarded.
-         */
-        MULTILEVEL_POPUP,
-
-        /**
-         * Shows a popup window, that allows the user to undo the last dismisses.
-         * If another item is deleted, while there is still an undo popup visible, the label
-         * of the button changes to <i>Undo all</i> and a press on the button, will discard
-         * all stored undos. As soon as the popup vanished (e.g. because {@link #setUndoHideDelay(int) autoHideDelay}
-         * is over) all saved undos will be discarded.
-         */
-        COLLAPSED_POPUP
-
-    }
-
-    /**
-     * Defines the direction in which list items can be swiped out to delete them.
-     * Use {@link #setSwipeDirection(de.timroes.android.listview.EnhancedListView.SwipeDirection)}
-     * to change the default behavior.
-     * <p>
-     * <b>Note:</b> This method requires the <i>Swipe to Dismiss</i> feature enabled. Use
-     * {@link #enableSwipeToDismiss()}
-     * to enable the feature.
-     */
-    public enum SwipeDirection {
-
-        /**
-         * The user can swipe each item into both directions (left and right) to delete it.
-         */
-        BOTH,
-
-        /**
-         * The user can only swipe the items to the beginning of the item to
-         * delete it. The start of an item is in Left-To-Right languages the left
-         * side and in Right-To-Left languages the right side. Before API level
-         * 17 this is always the left side.
-         */
-        START,
-
-        /**
-         * The user can only swipe the items to the end of the item to delete it.
-         * This is in Left-To-Right languages the right side in Right-To-Left
-         * languages the left side. Before API level 17 this will always be the
-         * right side.
-         */
-        END
-
-    }
-
-    /**
-     * The callback interface used by {@link #setShouldSwipeCallback(EnhancedListView.OnShouldSwipeCallback)}
-     * to inform its client that a list item is going to be swiped and check whether is
-     * should or not. Implement this to prevent some items from be swiped.
-     */
-    public interface OnShouldSwipeCallback {
-
-        /**
-         * Called when the user is swiping an item from the list.
-         * <p>
-         * If the user should get the possibility to swipe the item, return true.
-         * Otherwise, return false to disable swiping for this item.
-         *
-         * @param listView The {@link EnhancedListView} the item is wiping from.
-         * @param position The position of the item to swipe in your adapter.
-         * @return Whether the item should be swiped or not.
-         */
-        boolean onShouldSwipe(EnhancedListView listView, int position);
-
-    }
-
-    /**
-     * The callback interface used by {@link #setDismissCallback(EnhancedListView.OnDismissCallback)}
-     * to inform its client about a successful dismissal of one or more list item positions.
-     * Implement this to remove items from your adapter, that has been swiped from the list.
-     */
-    public interface OnDismissCallback {
-
-        /**
-         * Called when the user has deleted an item from the list. The item has been deleted from
-         * the {@code listView} at {@code position}. Delete this item from your adapter.
-         * <p>
-         * Don't return from this method, before your item has been deleted from the adapter, meaning
-         * if you delete the item in another thread, you have to make sure, you don't return from
-         * this method, before the item has been deleted. Since the way how you delete your item
-         * depends on your data and adapter, the {@link de.timroes.android.listview.EnhancedListView}
-         * cannot handle that synchronizing for you. If you return from this method before you removed
-         * the view from the adapter, you will most likely get errors like exceptions and flashing
-         * items in the list.
-         * <p>
-         * If the user should get the possibility to undo this deletion, return an implementation
-         * of {@link de.timroes.android.listview.EnhancedListView.Undoable} from this method.
-         * If you return {@code null} no undo will be possible. You are free to return an {@code Undoable}
-         * for some items, and {@code null} for others, though it might be a horrible user experience.
-         *
-         * @param listView The {@link EnhancedListView} the item has been deleted from.
-         * @param position The position of the item to delete from your adapter.
-         * @return An {@link de.timroes.android.listview.EnhancedListView.Undoable}, if you want
-         *      to give the user the possibility to undo the deletion.
-         */
-        Undoable onDismiss(EnhancedListView listView, int position);
-
-    }
-
-    /**
-     * Extend this abstract class and return it from
-     * {@link EnhancedListView.OnDismissCallback#onDismiss(EnhancedListView, int)}
-     * to let the user undo the deletion you've done with your {@link EnhancedListView.OnDismissCallback}.
-     * You have at least to implement the {@link #undo()} method, and can override {@link #discard()}
-     * and {@link #getTitle()} to offer more functionality. See the README file for example implementations.
-     */
-    public abstract static class Undoable {
-
-        /**
-         * This method must undo the deletion you've done in
-         * {@link EnhancedListView.OnDismissCallback#onDismiss(EnhancedListView, int)} and reinsert
-         * the element into the adapter.
-         * <p>
-         * In the most implementations, you will only remove the list item from your adapter
-         * in the {@code onDismiss} method and delete it from the database (or your permanent
-         * storage) in {@link #discard()}. In that case you only need to reinsert the item
-         * to the adapter.
-         */
-        public abstract void undo();
-
-        /**
-         * Returns the individual undo message for this undo. This will be displayed in the undo
-         * window, beside the undo button. The default implementation returns {@code null},
-         * what will lead in a default message to be displayed in the undo window.
-         * Don't call the super method, when overriding this method.
-         *
-         * @return The title for a special string.
-         */
-        public String getTitle() {
-            return null;
-        }
-
-        /**
-         * Discard the undo, meaning the user has no longer the possibility to undo the deletion.
-         * Implement this, to finally delete your stuff from permanent storages like databases
-         * (whereas in {@link de.timroes.android.listview.EnhancedListView.OnDismissCallback#onKeyDown(int, android.view.KeyEvent)}
-         * you should only remove it from the list adapter).
-         */
-        public void discard() { }
-
-    }
-
-    private class PendingDismissData implements Comparable<PendingDismissData> {
-
-        public int position;
-        /**
-         * The view that should get swiped out.
-         */
-        public View view;
-        /**
-         * The whole list item view.
-         */
-        public View childView;
-
-        PendingDismissData(int position, View view, View childView) {
-            this.position = position;
-            this.view = view;
-            this.childView = childView;
-        }
-
-        @Override
-        public int compareTo(PendingDismissData other) {
-            // Sort by descending position
-            return other.position - position;
-        }
-
-    }
-
-    private class UndoClickListener implements OnClickListener {
-
-        /**
-         * Called when a view has been clicked.
-         *
-         * @param v The view that was clicked.
-         */
-        @Override
-        public void onClick(View v) {
-            if(!mUndoActions.isEmpty()) {
-                switch(mUndoStyle) {
-                    case SINGLE_POPUP:
-                        mUndoActions.get(0).undo();
-                        mUndoActions.clear();
-                        break;
-                    case COLLAPSED_POPUP:
-                        Collections.reverse(mUndoActions);
-                        for(Undoable undo : mUndoActions) {
-                            undo.undo();
-                        }
-                        mUndoActions.clear();
-                        break;
-                    case MULTILEVEL_POPUP:
-                        mUndoActions.get(mUndoActions.size() - 1).undo();
-                        mUndoActions.remove(mUndoActions.size() - 1);
-                        break;
-                }
-            }
-
-            // Dismiss dialog or change text
-            if(mUndoActions.isEmpty()) {
-                if(mUndoPopup.isShowing()) {
-                    mUndoPopup.dismiss();
-                }
-            } else {
-                changePopupText();
-                changeButtonLabel();
-            }
-
-            mValidDelayedMsgId++;
-        }
-    }
-
-    private class HideUndoPopupHandler extends Handler {
-
-        /**
-         * Subclasses must implement this to receive messages.
-         */
-        @Override
-        public void handleMessage(Message msg) {
-            if(msg.what == mValidDelayedMsgId) {
-            	discardUndo();
-            }
-        }
-    }
-
-    // Cached ViewConfiguration and system-wide constant values
-    private float mSlop;
-    private int mMinFlingVelocity;
-    private int mMaxFlingVelocity;
-    private long mAnimationTime;
-
-    private final Object[] mAnimationLock = new Object[0];
-
-    // Swipe-To-Dismiss
-    private boolean mSwipeEnabled;
-    private OnDismissCallback mDismissCallback;
-    private OnShouldSwipeCallback mShouldSwipeCallback;
-    private UndoStyle mUndoStyle = UndoStyle.SINGLE_POPUP;
-    private boolean mTouchBeforeAutoHide = true;
-    private SwipeDirection mSwipeDirection = SwipeDirection.BOTH;
-    private int mUndoHideDelay = 5000;
-    private int mSwipingLayout;
-
-    private List<Undoable> mUndoActions = new ArrayList<Undoable>();
-    private SortedSet<PendingDismissData> mPendingDismisses = new TreeSet<PendingDismissData>();
-    private List<View> mAnimatedViews = new LinkedList<View>();
-    private int mDismissAnimationRefCount;
-
-    private boolean mSwipePaused;
-    private boolean mSwiping;
-    private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
-    private View mSwipeDownView;
-    private View mSwipeDownChild;
-    private TextView mUndoPopupTextView;
-    private VelocityTracker mVelocityTracker;
-    private float mDownX;
-    private int mDownPosition;
-    private float mScreenDensity;
-
-    private PopupWindow mUndoPopup;
-    private int mValidDelayedMsgId;
-    private Handler mHideUndoHandler = new HideUndoPopupHandler();
-    private Button mUndoButton;
-    // END Swipe-To-Dismiss
-
-    /**
-     * {@inheritDoc}
-     */
-    public EnhancedListView(Context context) {
-        super(context);
-        init(context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EnhancedListView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EnhancedListView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(context);
-    }
-
-    private void init(Context ctx) {
-
-        if(isInEditMode()) {
-            // Skip initializing when in edit mode (IDE preview).
-            return;
-        }
-        ViewConfiguration vc =ViewConfiguration.get(ctx);
-        mSlop = getResources().getDimension(R.dimen.elv_touch_slop);
-		mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();
-        mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
-        mAnimationTime = ctx.getResources().getInteger(
-                android.R.integer.config_shortAnimTime);
-
-        // Initialize undo popup
-        LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View undoView = inflater.inflate(R.layout.elv_undo_popup, null);
-        mUndoButton = (Button)undoView.findViewById(R.id.undo);
-        mUndoButton.setOnClickListener(new UndoClickListener());
-        mUndoButton.setOnTouchListener(new OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                // If the user touches the screen invalidate the current running delay by incrementing
-                // the valid message id. So this delay won't hide the undo popup anymore
-                mValidDelayedMsgId++;
-                return false;
-            }
-        });
-        mUndoPopupTextView = (TextView)undoView.findViewById(R.id.text);
-
-        mUndoPopup = new PopupWindow(undoView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, false);
-        mUndoPopup.setAnimationStyle(R.style.elv_fade_animation);
-
-        mScreenDensity = getResources().getDisplayMetrics().density;
-        // END initialize undo popup
-
-        setOnScrollListener(makeScrollListener());
-
-    }
-
-    /**
-     * Enables the <i>Swipe to Dismiss</i> feature for this list. This allows users to swipe out
-     * an list item element to delete it from the list. Every time the user swipes out an element
-     * {@link de.timroes.android.listview.EnhancedListView.OnDismissCallback#onDismiss(EnhancedListView, int)}
-     * of the given {@link de.timroes.android.listview.EnhancedListView} will be called. To enable
-     * <i>undo</i> of the deletion, return an {@link de.timroes.android.listview.EnhancedListView.Undoable}
-     * from {@link de.timroes.android.listview.EnhancedListView.OnDismissCallback#onDismiss(EnhancedListView, int)}.
-     * Return {@code null}, if you don't want the <i>undo</i> feature enabled. Read the README file
-     * or the demo project for more detailed samples.
-     *
-     * @return The {@link de.timroes.android.listview.EnhancedListView}
-     * @throws java.lang.IllegalStateException when you haven't passed an {@link EnhancedListView.OnDismissCallback}
-     *      to {@link #setDismissCallback(EnhancedListView.OnDismissCallback)} before calling this
-     *      method.
-     */
-    public EnhancedListView enableSwipeToDismiss() {
-
-        if(mDismissCallback == null) {
-            throw new IllegalStateException("You must pass an OnDismissCallback to the list before enabling Swipe to Dismiss.");
-        }
-
-        mSwipeEnabled = true;
-
-        return this;
-    }
-
-    /**
-     * Disables the <i>Swipe to Dismiss</i> feature for this list.
-     *
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView disableSwipeToDismiss() {
-        mSwipeEnabled = false;
-        return this;
-    }
-
-    /**
-     * Sets the callback to be called when the user dismissed an item from the list (either by
-     * swiping it out - with <i>Swipe to Dismiss</i> enabled - or by deleting it with
-     * {@link #delete(int)}). You must call this, before you call {@link #delete(int)} or
-     * {@link #enableSwipeToDismiss()} otherwise you will get an {@link java.lang.IllegalStateException}.
-     *
-     * @param dismissCallback The callback used to handle dismisses of list items.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setDismissCallback(OnDismissCallback dismissCallback) {
-        mDismissCallback = dismissCallback;
-        return this;
-    }
-
-    /**
-     * Sets the callback to be called when the user is swiping an item from the list.
-     *
-     * @param shouldSwipeCallback The callback used to handle swipes of list items.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setShouldSwipeCallback(OnShouldSwipeCallback shouldSwipeCallback) {
-        mShouldSwipeCallback = shouldSwipeCallback;
-        return this;
-    }
-
-    /**
-     * Sets the undo style of this list. See the javadoc of {@link de.timroes.android.listview.EnhancedListView.UndoStyle}
-     * for a detailed explanation of the different styles. The default style (if you never call this
-     * method) is {@link de.timroes.android.listview.EnhancedListView.UndoStyle#SINGLE_POPUP}.
-     *
-     * @param undoStyle The style of this listview.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setUndoStyle(UndoStyle undoStyle) {
-        mUndoStyle = undoStyle;
-        return this;
-    }
-
-    /**
-     * Sets the time in milliseconds after which the undo popup automatically disappears.
-     * The countdown will start when the user touches the screen. If you want to start the countdown
-     * immediately when the popups appears, call {@link #setRequireTouchBeforeDismiss(boolean)} with
-     * {@code false}.
-     *
-     * @param hideDelay The delay in milliseconds.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setUndoHideDelay(int hideDelay) {
-        mUndoHideDelay = hideDelay;
-        return this;
-    }
-
-    /**
-     * Sets whether another touch on the view is required before the popup counts down to dismiss
-     * the undo popup. By default this is set to {@code true}.
-     *
-     * @param touchBeforeDismiss Whether the screen needs to be touched before the countdown starts.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     *
-     * @see #setUndoHideDelay(int)
-     */
-    public EnhancedListView setRequireTouchBeforeDismiss(boolean touchBeforeDismiss) {
-        mTouchBeforeAutoHide = touchBeforeDismiss;
-        return this;
-    }
-
-    /**
-     * Sets the directions in which a list item can be swiped to delete.
-     * By default this is set to {@link SwipeDirection#BOTH} so that an item
-     * can be swiped into both directions.
-     * <p>
-     * <b>Note:</b> This method requires the <i>Swipe to Dismiss</i> feature enabled. Use
-     * {@link #enableSwipeToDismiss()} to enable the feature.
-     *
-     * @param direction The direction to which the swipe should be limited.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setSwipeDirection(SwipeDirection direction) {
-        mSwipeDirection = direction;
-        return this;
-    }
-
-    /**
-     * Sets the id of the view, that should be moved, when the user swipes an item.
-     * Only the view with the specified id will move, while all other views in the list item, will
-     * stay where they are. This might be usefull to have a background behind the view that is swiped
-     * out, to stay where it is (and maybe explain that the item is going to be deleted).
-     * If you never call this method (or call it with 0), the whole view will be swiped. Also if there
-     * is no view in a list item, with the given id, the whole view will be swiped.
-     * <p>
-     * <b>Note:</b> This method requires the <i>Swipe to Dismiss</i> feature enabled. Use
-     * {@link #enableSwipeToDismiss()} to enable the feature.
-     *
-     * @param swipingLayoutId The id (from R.id) of the view, that should be swiped.
-     * @return This {@link de.timroes.android.listview.EnhancedListView}
-     */
-    public EnhancedListView setSwipingLayout(int swipingLayoutId) {
-        mSwipingLayout = swipingLayoutId;
-        return this;
-    }
-
-    /**
-     * Discard all stored undos and hide the undo popup dialog.
-     * This method must be called in {@link android.app.Activity#onStop()}. Otherwise
-     * {@link EnhancedListView.Undoable#discard()} might not be called for several items, what might
-     * break your data consistency.
-     */
-    public void discardUndo() {
-        for(Undoable undoable : mUndoActions) {
-            undoable.discard();
-        }
-        mUndoActions.clear();
-        if(mUndoPopup.isShowing()) {
-            mUndoPopup.dismiss();
-        }
-    }
-
-    /**
-     * Delete the list item at the specified position. This will animate the item sliding out of the
-     * list and then collapsing until it vanished (same as if the user slides out an item).
-     * <p>
-     * NOTE: If you are using list headers, be aware, that the position argument must take care of
-     * them. Meaning 0 references the first list header. So if you want to delete the first list
-     * item, you have to pass the number of list headers as {@code position}. Most of the times
-     * that shouldn't be a problem, since you most probably will evaluate the position which should
-     * be deleted in a way, that respects the list headers.
-     *
-     * @param position The position of the item in the list.
-     * @throws java.lang.IndexOutOfBoundsException when trying to delete an item outside of the list range.
-     * @throws java.lang.IllegalStateException when this method is called before an {@link EnhancedListView.OnDismissCallback}
-     *      is set via {@link #setDismissCallback(de.timroes.android.listview.EnhancedListView.OnDismissCallback)}.
-     * */
-    public void delete(int position) {
-        if(mDismissCallback == null) {
-            throw new IllegalStateException("You must set an OnDismissCallback, before deleting items.");
-        }
-        if(position < 0 || position >= getCount()) {
-            throw new IndexOutOfBoundsException(String.format("Tried to delete item %d. #items in list: %d", position, getCount()));
-        }
-        View childView = getChildAt(position - getFirstVisiblePosition());
-        View view = null;
-        if(mSwipingLayout > 0) {
-            view = childView.findViewById(mSwipingLayout);
-        }
-        if(view == null) {
-            view = childView;
-        }
-        slideOutView(view, childView, position, true);
-    }
-
-    /**
-     * Slide out a view to the right or left of the list. After the animation has finished, the
-     * view will be dismissed by calling {@link #performDismiss(android.view.View, android.view.View, int)}.
-     *
-     * @param view The view, that should be slided out.
-     * @param childView The whole view of the list item.
-     * @param position The item position of the item.
-     * @param toRightSide Whether it should slide out to the right side.
-     */
-    private void slideOutView(final View view, final View childView, final int position, boolean toRightSide) {
-
-        // Only start new animation, if this view isn't already animated (too fast swiping bug)
-        synchronized(mAnimationLock) {
-            if(mAnimatedViews.contains(view)) {
-                return;
-            }
-            ++mDismissAnimationRefCount;
-            mAnimatedViews.add(view);
-        }
-
-        ViewPropertyAnimator.animate(view)
-                .translationX(toRightSide ? mViewWidth : -mViewWidth)
-                .alpha(0)
-                .setDuration(mAnimationTime)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        performDismiss(view, childView, position);
-                    }
-                });
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-
-        if (!mSwipeEnabled) {
-            return super.onTouchEvent(ev);
-        }
-
-        // Send a delayed message to hide popup
-        if(mTouchBeforeAutoHide && mUndoPopup.isShowing()) {
-            mHideUndoHandler.sendMessageDelayed(mHideUndoHandler.obtainMessage(mValidDelayedMsgId), mUndoHideDelay);
-        }
-
-        // Store width of this list for usage of swipe distance detection
-        if (mViewWidth < 2) {
-            mViewWidth = getWidth();
-        }
-
-        switch (ev.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN: {
-                if (mSwipePaused) {
-                    return super.onTouchEvent(ev);
-                }
-
-                // TODO: ensure this is a finger, and set a flag
-
-                // Find the child view that was touched (perform a hit test)
-                Rect rect = new Rect();
-                int childCount = getChildCount();
-                int[] listViewCoords = new int[2];
-                getLocationOnScreen(listViewCoords);
-                int x = (int) ev.getRawX() - listViewCoords[0];
-                int y = (int) ev.getRawY() - listViewCoords[1];
-                View child;
-                for (int i = getHeaderViewsCount(); i < childCount; i++) {
-                    child = getChildAt(i);
-                    if(child != null) {
-                        child.getHitRect(rect);
-                        if (rect.contains(x, y)) {
-                            // if a specific swiping layout has been giving, use this to swipe.
-                            if(mSwipingLayout > 0) {
-                                View swipingView = child.findViewById(mSwipingLayout);
-                                if(swipingView != null) {
-                                    mSwipeDownView = swipingView;
-                                    mSwipeDownChild = child;
-                                    break;
-                                }
-                            }
-                            // If no swiping layout has been found, swipe the whole child
-                            mSwipeDownView = mSwipeDownChild = child;
-                            break;
-                        }
-                    }
-                }
-
-                if (mSwipeDownView != null) {
-                    // test if the item should be swiped
-                    int position = getPositionForView(mSwipeDownView) - getHeaderViewsCount();
-                    if ((mShouldSwipeCallback == null) ||
-                        mShouldSwipeCallback.onShouldSwipe(this, position)) {
-                    mDownX = ev.getRawX();
-                        mDownPosition = position;
-
-                    mVelocityTracker = VelocityTracker.obtain();
-                    mVelocityTracker.addMovement(ev);
-                    } else {
-                        // set back to null to revert swiping
-                        mSwipeDownView = mSwipeDownChild = null;
-                    }
-                }
-                super.onTouchEvent(ev);
-                return true;
-            }
-
-            case MotionEvent.ACTION_UP: {
-                if (mVelocityTracker == null) {
-                    break;
-                }
-
-                float deltaX = ev.getRawX() - mDownX;
-                mVelocityTracker.addMovement(ev);
-                mVelocityTracker.computeCurrentVelocity(1000);
-                float velocityX = Math.abs(mVelocityTracker.getXVelocity());
-                float velocityY = Math.abs(mVelocityTracker.getYVelocity());
-                boolean dismiss = false;
-                boolean dismissRight = false;
-                if (Math.abs(deltaX) > mViewWidth / 2 && mSwiping) {
-                    dismiss = true;
-                    dismissRight = deltaX > 0;
-                } else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity
-                        && velocityY < velocityX && mSwiping && isSwipeDirectionValid(mVelocityTracker.getXVelocity())
-                        && deltaX >= mViewWidth * 0.2f) {
-                    dismiss = true;
-                    dismissRight = mVelocityTracker.getXVelocity() > 0;
-                }
-                if (dismiss) {
-                    // dismiss
-                    slideOutView(mSwipeDownView, mSwipeDownChild, mDownPosition, dismissRight);
-                } else if(mSwiping) {
-                    // Swipe back to regular position
-                    ViewPropertyAnimator.animate(mSwipeDownView)
-                            .translationX(0)
-                            .alpha(1)
-                            .setDuration(mAnimationTime)
-                            .setListener(null);
-                }
-                mVelocityTracker = null;
-                mDownX = 0;
-                mSwipeDownView = null;
-                mSwipeDownChild = null;
-                mDownPosition = AbsListView.INVALID_POSITION;
-                mSwiping = false;
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-
-                if (mVelocityTracker == null || mSwipePaused) {
-                    break;
-                }
-
-                mVelocityTracker.addMovement(ev);
-                float deltaX = ev.getRawX() - mDownX;
-                // Only start swipe in correct direction
-                if(isSwipeDirectionValid(deltaX)) {
-                    ViewParent parent = getParent();
-                    if(parent != null) {
-                        // If we swipe don't allow parent to intercept touch (e.g. like NavigationDrawer does)
-                        // otherwise swipe would not be working.
-                        parent.requestDisallowInterceptTouchEvent(true);
-                    }
-                    if (Math.abs(deltaX) > mSlop) {
-                        mSwiping = true;
-                        requestDisallowInterceptTouchEvent(true);
-
-                        // Cancel ListView's touch (un-highlighting the item)
-                        MotionEvent cancelEvent = MotionEvent.obtain(ev);
-                        cancelEvent.setAction(MotionEvent.ACTION_CANCEL
-                                | (ev.getActionIndex()
-                                << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
-                        super.onTouchEvent(cancelEvent);
-                    }
-                } else {
-                    // If we swiped into wrong direction, act like this was the new
-                    // touch down point
-                    mDownX = ev.getRawX();
-                    deltaX = 0;
-                }
-
-                if (mSwiping) {
-                    ViewHelper.setTranslationX(mSwipeDownView, deltaX);
-                    ViewHelper.setAlpha(mSwipeDownView, Math.max(0f, Math.min(1f,
-                            1f - 2f * Math.abs(deltaX) / mViewWidth)));
-                    return true;
-                }
-                break;
-            }
-        }
-        return super.onTouchEvent(ev);
-    }
-
-    /**
-     * Animate the dismissed list item to zero-height and fire the dismiss callback when
-     * all dismissed list item animations have completed.
-     *
-     * @param dismissView The view that has been slided out.
-     * @param listItemView The list item view. This is the whole view of the list item, and not just
-     *                     the part, that the user swiped.
-     * @param dismissPosition The position of the view inside the list.
-     */
-    private void performDismiss(final View dismissView, final View listItemView, final int dismissPosition) {
-
-        final ViewGroup.LayoutParams lp = listItemView.getLayoutParams();
-        final int originalLayoutHeight = lp.height;
-
-        int originalHeight = listItemView.getHeight();
-        ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime);
-
-        animator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-
-                // Make sure no other animation is running. Remove animation from running list, that just finished
-                boolean noAnimationLeft;
-                synchronized(mAnimationLock) {
-                    --mDismissAnimationRefCount;
-                    mAnimatedViews.remove(dismissView);
-                    noAnimationLeft = mDismissAnimationRefCount == 0;
-                }
-
-                if (noAnimationLeft) {
-                    // No active animations, process all pending dismisses.
-
-                    for(PendingDismissData dismiss : mPendingDismisses) {
-                        if(mUndoStyle == UndoStyle.SINGLE_POPUP) {
-                            for(Undoable undoable : mUndoActions) {
-                                undoable.discard();
-                            }
-                            mUndoActions.clear();
-                        }
-                        Undoable undoable = mDismissCallback.onDismiss(EnhancedListView.this, dismiss.position);
-                        if(undoable != null) {
-                            mUndoActions.add(undoable);
-                        }
-                        mValidDelayedMsgId++;
-                    }
-
-                    if(!mUndoActions.isEmpty()) {
-                        changePopupText();
-                        changeButtonLabel();
-
-                        // Show undo popup
-                        float yLocationOffset = getResources().getDimension(R.dimen.elv_undo_bottom_offset);
-                        mUndoPopup.setWidth((int)Math.min(mScreenDensity * 400, getWidth() * 0.9f));
-                        mUndoPopup.showAtLocation(EnhancedListView.this,
-                                Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM,
-                                0, (int) yLocationOffset);
-
-                        // Queue the dismiss only if required
-                        if(!mTouchBeforeAutoHide) {
-                            // Send a delayed message to hide popup
-                            mHideUndoHandler.sendMessageDelayed(mHideUndoHandler.obtainMessage(mValidDelayedMsgId),
-                                    mUndoHideDelay);
-                        }
-                    }
-
-                    ViewGroup.LayoutParams lp;
-                    for (PendingDismissData pendingDismiss : mPendingDismisses) {
-                        ViewHelper.setAlpha(pendingDismiss.view, 1f);
-                        ViewHelper.setTranslationX(pendingDismiss.view, 0);
-                        lp = pendingDismiss.childView.getLayoutParams();
-                        lp.height = originalLayoutHeight;
-                        pendingDismiss.childView.setLayoutParams(lp);
-                    }
-
-                    mPendingDismisses.clear();
-                }
-            }
-        });
-
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                lp.height = (Integer) valueAnimator.getAnimatedValue();
-                listItemView.setLayoutParams(lp);
-            }
-        });
-
-        mPendingDismisses.add(new PendingDismissData(dismissPosition, dismissView, listItemView));
-        animator.start();
-    }
-
-    /**
-     * Changes the text of the undo popup. If more then one item can be undone, the number of deleted
-     * items will be shown. If only one deletion can be undone, the title of this deletion (or a default
-     * string in case the title is {@code null}) will be shown.
-     */
-    private void changePopupText() {
-        String msg = null;
-        if(mUndoActions.size() > 1) {
-            msg = getResources().getString(R.string.elv_n_items_deleted, mUndoActions.size());
-        } else if(mUndoActions.size() >= 1) {
-            // Set title from single undoable or when no multiple deletion string
-            // is given
-            msg = mUndoActions.get(mUndoActions.size() - 1).getTitle();
-
-            if(msg == null) {
-                msg = getResources().getString(R.string.elv_item_deleted);
-            }
-        }
-        mUndoPopupTextView.setText(msg);
-    }
-
-    /**
-     * Changes the label of the undo button.
-     */
-    private void changeButtonLabel() {
-        String msg;
-        if(mUndoActions.size() > 1 && mUndoStyle == UndoStyle.COLLAPSED_POPUP) {
-            msg = getResources().getString(R.string.elv_undo_all);
-        } else {
-            msg = getResources().getString(R.string.elv_undo);
-        }
-        mUndoButton.setText(msg);
-    }
-
-    private OnScrollListener makeScrollListener() {
-        return new OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-                mSwipePaused = scrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL;
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-            }
-        };
-    }
-
-    /**
-     * Checks whether the delta of a swipe indicates, that the swipe is in the
-     * correct direction, regarding the direction set via
-     * {@link #setSwipeDirection(de.timroes.android.listview.EnhancedListView.SwipeDirection)}
-     *
-     * @param deltaX The delta of x coordinate of the swipe.
-     * @return Whether the delta of a swipe is in the right direction.
-     */
-    private boolean isSwipeDirectionValid(float deltaX) {
-
-        int rtlSign = 1;
-        // On API level 17 and above, check if we are in a Right-To-Left layout
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            if(getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
-                rtlSign = -1;
-            }
-        }
-
-        // Check if swipe has been done in the correct direction
-        switch(mSwipeDirection) {
-            default:
-            case BOTH:
-                return true;
-            case START:
-                return rtlSign * deltaX < 0;
-            case END:
-                return rtlSign * deltaX > 0;
-        }
-
-    }
-    
-    @Override
-	protected void onWindowVisibilityChanged(int visibility) {
-		super.onWindowVisibilityChanged(visibility);
-		
-		/*
-		 * If the container window no longer visiable,
-		 * dismiss visible undo popup window so it won't leak,
-		 * cos the container window will be destroyed before dismissing the popup window.
-		 */
-		if(visibility != View.VISIBLE) {
-			discardUndo();
-		}
-	}
-}

libs/EnhancedListView/src/main/res/anim/elv_popup_hide.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<alpha android:fromAlpha="1.0"
-		   android:toAlpha="0.0" 
-		   android:duration="500"
-		   android:repeatCount="0"/>
-</set>

libs/EnhancedListView/src/main/res/anim/elv_popup_show.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<alpha android:fromAlpha="0.0"
-		   android:toAlpha="1.0" 
-		   android:duration="500"
-		   android:repeatCount="0"/>
-</set>

libs/EnhancedListView/src/main/res/drawable/elv_popup_bg.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/elv_popup_bg_color"/>
-	<corners android:radius="5dp"/>
-</shape>

libs/EnhancedListView/src/main/res/drawable/elv_undo_btn_bg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/elv_undo_btn_bg_pressed"/> <!-- pressed -->
-	<item android:state_focused="true" android:drawable="@drawable/elv_undo_btn_bg_focused"/> <!-- focused -->
-	<item android:drawable="@color/elv_btn_normal"/> <!-- default -->
-</selector>

libs/EnhancedListView/src/main/res/drawable/elv_undo_btn_bg_focused.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/elv_btn_focused"/>
-	<corners android:radius="3dp"/>
-</shape>

libs/EnhancedListView/src/main/res/drawable/elv_undo_btn_bg_pressed.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/elv_btn_pressed"/>
-	<corners android:radius="3dp"/>
-</shape>

libs/EnhancedListView/src/main/res/layout-v19/elv_undo_popup.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:layout_width="fill_parent"
-			  android:layout_height="match_parent"
-			  android:orientation="horizontal"
-			  android:background="@drawable/elv_toast_frame"
-			  android:gravity="center">
-
-	<TextView
-		android:id="@+id/text"
-		android:fontFamily="sans-serif-condensed"
-		android:textSize="16sp"
-		android:layout_weight="1"
-		android:ellipsize="end"
-		android:singleLine="true"
-		android:textColor="@color/elv_popup_text_color"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:shadowColor="#BB000000"
-		android:shadowRadius="2.75"/>
-
-	<View
-		android:layout_weight="0"
-		android:layout_marginRight="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_width="1dp"
-		android:layout_height="match_parent"
-		android:layout_marginTop="5dp"
-		android:layout_marginBottom="5dp"
-		android:background="@color/elv_separator_color"/>
-
-	<Button
-		android:id="@+id/undo"
-		android:fontFamily="sans-serif-condensed"
-		android:textColor="@color/elv_popup_text_color"
-		android:background="@drawable/elv_undo_btn_bg"
-		android:layout_weight="0"
-		android:drawableLeft="@drawable/elv_ic_action_undo"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:shadowColor="#BB000000"
-		android:shadowRadius="2.75"/>
-</LinearLayout>

libs/EnhancedListView/src/main/res/layout/elv_undo_popup.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent" 
-		android:orientation="horizontal"
-		android:background="@drawable/elv_popup_bg"
-		android:paddingRight="8dp"
-		android:gravity="center">
-	<TextView android:id="@+id/text"
-			android:padding="8dp"
-			android:textSize="16sp"
-			android:layout_weight="1"
-			android:singleLine="true"
-			android:ellipsize="end"
-			android:textColor="@color/elv_popup_text_color"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-	<View
-			android:layout_weight="0"
-			android:layout_marginRight="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginTop="15dp"
-			android:layout_marginBottom="15dp"
-			android:layout_width="1dp"
-			android:layout_height="fill_parent"
-			android:background="@color/elv_separator_color"/>
-	<Button android:id="@+id/undo"
-			android:textColor="@color/elv_popup_text_color"
-			android:background="@drawable/elv_undo_btn_bg"
-			android:drawableLeft="@drawable/elv_ic_action_undo"
-			android:layout_weight="0"
-			android:paddingRight="8dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-</LinearLayout>

libs/EnhancedListView/src/main/res/values/colors.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<color name="elv_btn_pressed">#ff33b5e5</color>
-	<color name="elv_btn_focused">#ff0099cc</color>
-	<color name="elv_btn_normal">#00000000</color>
-
-	<color name="elv_popup_bg_color">#EE666666</color>
-	<color name="elv_separator_color">#BBBBBB</color>
-	<color name="elv_popup_text_color">#FFFFFF</color>
-</resources>

libs/EnhancedListView/src/main/res/values/dimens.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<!-- The bottom offset the undo popup should have -->
-	<dimen name="elv_undo_bottom_offset">15dp</dimen>
-	<!-- The touch slop you need to cause a swipe instead of a scroll -->
-	<dimen name="elv_touch_slop">32dp</dimen>
-</resources>

libs/EnhancedListView/src/main/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<string name="elv_undo">Undo</string>
-	<string name="elv_undo_all">Undo All</string>
-	<string name="elv_item_deleted">Item deleted</string>
-	<string name="elv_n_items_deleted">%1$s items deleted</string>
-</resources>

libs/EnhancedListView/src/main/res/values/styles.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="elv_fade_animation">
-		<item name="android:windowEnterAnimation">@anim/elv_popup_show</item>
-		<item name="android:windowExitAnimation">@anim/elv_popup_hide</item>
-	</style>
-</resources>

libs/MemorizingTrustManager/.gitignore

@@ -1,11 +0,0 @@
-bin
-build
-gen
-local.properties
-example/bin
-example/gen
-tags
-.project
-.classpath
-.gradle
-.*.swp

libs/MemorizingTrustManager/AndroidManifest.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="de.duenndns.ssl"
-	android:versionCode="1"
-	android:versionName="1.0">
-
-	<application android:label="MemorizingTrustManager">
-		<activity android:name="de.duenndns.ssl.MemorizingActivity"
-			android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-	</application>
-</manifest>

libs/MemorizingTrustManager/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT license.
-
-Copyright (c) 2010 Georg Lukas <georg@op-co.de>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

libs/MemorizingTrustManager/README.mdwn

@@ -1,125 +0,0 @@
-# MemorizingTrustManager - Private Cloud Support for Your App
-
-MemorizingTrustManager (MTM) is a project to enable smarter and more secure use
-of SSL on Android. If it encounters an unknown SSL certificate, it asks the
-user whether to accept the certificate once, permanently or to abort the
-connection. This is a step in preventing man-in-the-middle attacks by blindly
-accepting any invalid, self-signed and/or expired certificates.
-
-MTM is aimed at providing seamless integration into your Android application,
-and the source code is available under the MIT license.
-
-## Screenshots
-
-![MemorizingTrustManager dialog](mtm-screenshot.png)
-![MemorizingTrustManager notification](mtm-notification.png)
-![MemorizingTrustManager server name dialog](mtm-servername.png)
-
-## Status
-
-MemorizingTrustManager is in production use in the
-[yaxim XMPP client](https://yaxim.org/). It is usable and easy to integrate,
-though it does not yet support hostname validation (the Java API makes it
-**hard** to integrate).
-
-## Integration
-
-MTM is easy to integrate into your own application. Follow these steps or have
-a look into the demo application in the `example` directory.
-
-### 1. Add MTM to your project
-
-Download the MTM source from GitHub, or add it as a
-[git submodule](http://git-scm.com/docs/git-submodule):
-
-	# plain download:
-	git clone https://github.com/ge0rg/MemorizingTrustManager
-	# submodule:
-	git submodule add https://github.com/ge0rg/MemorizingTrustManager
-
-Then add a library project dependency to `default.properties`:
-
-	android.library.reference.1=MemorizingTrustManager
-
-### 2. Add the MTM (popup) Activity to your manifest
-
-Edit your `AndroidManifest.xml` and add the MTM activity element right before the
-end of your closing `</application>` tag.
-
-			...
-			<activity android:name="de.duenndns.ssl.MemorizingActivity"
-				android:theme="@android:style/Theme.Translucent.NoTitleBar"
-				/>
-		</application>
-	</manifest>
-
-### 3. Hook MTM as the default TrustManager for your connection type
-
-Hooking MemorizingTrustmanager in HTTPS connections:
-
-	// register MemorizingTrustManager for HTTPS
-	SSLContext sc = SSLContext.getInstance("TLS");
-	MemorizingTrustManager mtm = new MemorizingTrustManager(this);
-	sc.init(null, new X509TrustManager[] { mtm }, new java.security.SecureRandom());
-	HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-	HttpsURLConnection.setDefaultHostnameVerifier(
-		mtm.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
-
-
-Or, for aSmack you can use `setCustomSSLContext()`:
-
-	org.jivesoftware.smack.ConnectionConfiguration connectionConfiguration = …
-	SSLContext sc = SSLContext.getInstance("TLS");
-	MemorizingTrustManager mtm = new MemorizingTrustManager(this);
-	sc.init(null, new X509TrustManager[] { mtm }, new java.security.SecureRandom());
-	connectionConfiguration.setCustomSSLContext(sc);
-	connectionConfiguration.setHostnameVerifier(
-		mtm.wrapHostnameVerifier(new org.apache.http.conn.ssl.StrictHostnameVerifier()));
-
-By default, MTM falls back to the system `TrustManager` before asking the user.
-If you do not trust the establishment, you can enforce a dialog on *every new
-connection* by supplying a `defaultTrustManager = null` parameter to the
-constructor:
-
-	MemorizingTrustManager mtm = new MemorizingTrustManager(this, null);
-
-If you want to use a different underlying `TrustManager`, like
-[AndroidPinning](https://github.com/moxie0/AndroidPinning), just supply that to
-MTM's constructor:
-
-	X509TrustManager pinning = new PinningTrustManager(SystemKeyStore.getInstance(),
-		new String[] {"f30012bbc18c231ac1a44b788e410ce754182513"}, 0);
-	MemorizingTrustManager mtm = new MemorizingTrustManager(this, pinning);
-
-### 4. Profit!
-
-### Logging
-
-MTM uses java.util.logging (JUL) for logging purposes. If you have not
-configured a Handler for JUL, then Android will by default log all
-messages of Level.INFO or higher. In order to get also the debug log
-messages (those with Level.FINE or lower) you need to configure a
-Handler accordingly. The MTM example project contains
-de.duenndns.mtmexample.JULHandler, which allows to enable and disable
-debug logging at runtime.
-
-## Alternatives
-
-MemorizingTrustManager is not the only one out there.
-
-[**NetCipher**](https://guardianproject.info/code/netcipher/) is an Android
-library made by the [Guardian Project](https://guardianproject.info/) to
-improve network security for mobile apps. It comes with a StrongTrustManager
-to do more thorough certificate checks, an independent Root CA store, and code
-to easily route your traffic through
-[the Tor network](https://www.torproject.org/) using [Orbot](https://guardianproject.info/apps/orbot/).
-
-[**AndroidPinning**](https://github.com/moxie0/AndroidPinning) is another Android
-library, written by [Moxie Marlinspike](http://www.thoughtcrime.org/) to allow
-pinning of server certificates, improving security against government-scale
-MitM attacks. Use this if your app is made to communicate with a specific
-server!
-
-## Contribute
-
-Please [help translating MTM into more languages](https://translations.launchpad.net/yaxim/master/+pots/mtm/)!

libs/MemorizingTrustManager/ant.properties

@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-

libs/MemorizingTrustManager/build.gradle

@@ -1,33 +0,0 @@
-buildscript {
-	repositories {
-		google()
-		jcenter()
-	}
-	dependencies {
-		classpath 'com.android.tools.build:gradle:3.0.1'
-	}
-}
-
-apply plugin: 'com.android.library'
-
-android {
-	compileSdkVersion 27
-	buildToolsVersion "27.0.3"
-	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 25
-	}
-
-	sourceSets {
-		main {
-			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src']
-			resources.srcDirs = ['src']
-			aidl.srcDirs = ['src']
-			renderscript.srcDirs = ['src']
-			res.srcDirs = ['res']
-			assets.srcDirs = ['assets']
-		}
-	}
-
-}

libs/MemorizingTrustManager/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MemorizingTrustManager" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

libs/MemorizingTrustManager/example/AndroidManifest.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="de.duenndns.mtmexample"
-      android:versionCode="1"
-      android:versionName="1.0">
-      
-    <uses-sdk
-        android:minSdkVersion="3"
-        android:targetSdkVersion="19" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application android:label="@string/app_name" android:icon="@android:drawable/ic_lock_lock">
-        <activity
-            android:name=".MTMExample"
-            android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
-            android:label="@string/app_name" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-	<!-- ADD THE FOLLOWING TO YOUR MANIFEST: -->
-	<activity android:name="de.duenndns.ssl.MemorizingActivity"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-    </application>
-</manifest> 

libs/MemorizingTrustManager/example/ant.properties

@@ -1,18 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-application.package=de.duenndns.mtmexample

libs/MemorizingTrustManager/example/build.gradle

@@ -1,23 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
-	compile rootProject
-}
-
-android {
-	compileSdkVersion 19
-	buildToolsVersion "19.1"
-	defaultConfig {
-        	minSdkVersion 7
-		targetSdkVersion 19
-	}
-
-	sourceSets {
-		main {
-			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src']
-			res.srcDirs = ['res']
-		}
-	}
-
-}

libs/MemorizingTrustManager/example/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MTMExample" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

libs/MemorizingTrustManager/example/proguard-project.txt

@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

libs/MemorizingTrustManager/example/project.properties

@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-android.library.reference.1=../
-# Project target.
-target=android-19

libs/MemorizingTrustManager/example/res/layout/mtmexample.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent" >
-	<EditText
-		android:id="@+id/url" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" 
-		android:hint="HTTPS address"
-		android:text="https://op-co.de/mtm/"
-		android:singleLine="true"
-		/>
-	<Button
-		android:id="@+id/connect" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" 
-		android:text="Connect"
-		/>
-	<TextView
-		android:id="@+id/content" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" 
-		android:layout_weight="1"
-		android:text="Please enter a HTTPS URL and press 'Connect'!"
-		android:textSize="11pt"
-		/>
-	<Button
-		android:id="@+id/manage" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" 
-		android:text="Clean up Certificates"
-		android:onClick="onManage"
-		/>
-</LinearLayout>
-

libs/MemorizingTrustManager/example/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">MemorizingTrustManager Example</string>
-</resources>

libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java

@@ -1,169 +0,0 @@
-package de.duenndns.mtmexample;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringBufferInputStream;
-import java.io.StringWriter;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import android.util.Log;
-
-/**
- * A <code>java.util.logging</code> (JUL) Handler for Android.
- * <p>
- * If you want fine-grained control over MTM's logging, you can copy this
- * class to your code base and call the static {@link #initialize()} method.
- * </p>
- * <p>
- * This JUL Handler passes log messages sent to JUL to the Android log, while
- * keeping the format and stack traces of optionally supplied Exceptions. It
- * further allows to install a {@link DebugLogSettings} class via
- * {@link #setDebugLogSettings(DebugLogSettings)} that determines whether JUL log messages of
- * level {@link java.util.logging.Level#FINE} or lower are logged. This gives
- * the application developer more control over the logged messages, while
- * allowing a library developer to place debug log messages without risking to
- * spam the Android log.
- * </p>
- * <p>
- * If there are no {@code DebugLogSettings} configured, then all messages sent
- * to JUL will be logged.
- * </p>
- * 
- * @author Florian Schmaus
- * 
- */
-@SuppressWarnings("deprecation")
-public class JULHandler extends Handler {
-
-	/** Implement this interface to toggle debug logging.
-	 */
-	public interface DebugLogSettings {
-		public boolean isDebugLogEnabled();
-	}
-
-	private static final String CLASS_NAME = JULHandler.class.getName();
-
-	/**
-	 * The global LogManager configuration.
-	 * <p>
-	 * This configures:
-	 * <ul>
-	 * <li> JULHandler as the default handler for all log messages
-	 * <li> A default log level FINEST (300). Meaning that log messages of a level 300 or higher a
-	 * logged
-	 * </ul>
-	 * </p>
-	 */
-	private static final InputStream LOG_MANAGER_CONFIG = new StringBufferInputStream(
-// @formatter:off
-"handlers = " + CLASS_NAME + '\n' +
-".level = FINEST"
-);
-// @formatter:on
-
-	// Constants for Android vs. JUL debug level comparisons
-	private static final int FINE_INT = Level.FINE.intValue();
-	private static final int INFO_INT = Level.INFO.intValue();
-	private static final int WARN_INT = Level.WARNING.intValue();
-	private static final int SEVE_INT = Level.SEVERE.intValue();
-
-	private static final Logger LOGGER = Logger.getLogger(CLASS_NAME);
-
-	/** A formatter that creates output similar to Android's Log.x. */
-	private static final Formatter FORMATTER = new Formatter() {
-		@Override
-		public String format(LogRecord logRecord) {
-			Throwable thrown = logRecord.getThrown();
-			if (thrown != null) {
-				StringWriter sw = new StringWriter();
-				PrintWriter pw = new PrintWriter(sw, false);
-				pw.write(logRecord.getMessage() + ' ');
-				thrown.printStackTrace(pw);
-				pw.flush();
-				return sw.toString();
-			} else {
-				return logRecord.getMessage();
-			}
-		}
-	};
-
-	private static DebugLogSettings sDebugLogSettings;
-	private static boolean initialized = false;
-
-	public static void initialize() {
-		try {
-			LogManager.getLogManager().readConfiguration(LOG_MANAGER_CONFIG);
-			initialized = true;
-		} catch (IOException e) {
-			Log.e("JULHandler", "Can not initialize configuration", e);
-		}
-		if (initialized) LOGGER.info("Initialzied java.util.logging logger");
-	}
-
-	public static void setDebugLogSettings(DebugLogSettings debugLogSettings) {
-		if (!isInitialized()) initialize();
-		sDebugLogSettings = debugLogSettings;
-	}
-
-	public static boolean isInitialized() {
-		return initialized;
-	}
-
-	public JULHandler() {
-		setFormatter(FORMATTER);
-	}
-
-	@Override
-	public void close() {}
-
-	@Override
-	public void flush() {}
-
-	@Override
-	public boolean isLoggable(LogRecord record) {
-		final boolean debugLog = sDebugLogSettings == null ? true : sDebugLogSettings
-				.isDebugLogEnabled();
-
-		if (record.getLevel().intValue() <= FINE_INT) {
-			return debugLog;
-		}
-		return true;
-	}
-
-	/** JUL method that forwards log records to Android's LogCat. */
-	@Override
-	public void publish(LogRecord record) {
-		if (!isLoggable(record)) return;
-
-		final int priority = getAndroidPriority(record.getLevel());
-		final String tag = substringAfterLastDot(record.getSourceClassName());
-		final String msg = getFormatter().format(record);
-
-		Log.println(priority, tag, msg);
-	}
-
-	/** Helper to convert JUL verbosity levels to Android's Log. */
-	private static int getAndroidPriority(Level level) {
-		int value = level.intValue();
-		if (value >= SEVE_INT) {
-			return Log.ERROR;
-		} else if (value >= WARN_INT) {
-			return Log.WARN;
-		} else if (value >= INFO_INT) {
-			return Log.INFO;
-		} else {
-			return Log.DEBUG;
-		}
-	}
-
-	/** Helper to extract short class names. */
-	private static String substringAfterLastDot(String s) {
-		return s.substring(s.lastIndexOf('.') + 1).trim();
-	}
-}