Bump version to 4.69.2

Co-authored-by: Alex Hart <alex@signal.org>

.github/workflows/android.yml

@@ -1,6 +1,11 @@
 name: Android CI
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches:
+    - 'master'
+    - '4.**'
 
 jobs:
   build:
@@ -9,9 +14,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
+    - name: Install NDK
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+
+    - name: Validate Gradle Wrapper
+      uses: gradle/wrapper-validation-action@v1
+
     - name: Build with Gradle
       run: ./gradlew qa

BUILDING.md

@@ -1,74 +0,0 @@
-Building Signal
-===============
-
-Basics
-------
-
-Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.  However, you needn't install it yourself; the
-"gradle wrapper" `gradlew`, mentioned below, will do that for you.
-
-Building Signal
----------------
-
-The following steps should help you (re)build Signal from the command line.
-
-1. Checkout the Signal-Android project source with the command:
-
-        git clone https://github.com/signalapp/Signal-Android.git
-
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
-3. Ensure that the following packages are installed from the Android SDK manager:
-    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (All API levels)
-    * Android Support Repository
-    * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
-
-        sdk.dir=/Application/android-sdk-macosx
-
-5. Using Java 8 
-
-6. Execute Gradle:
-
-        ./gradlew build
-
-Visual assets
-----------------------
-
-Source assets tend to be large binary blobs, which are best stored outside of git repositories. Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
-
-Sample command for generating our audio placeholder image:
-
-```bash
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
-```
-
-Setting up a development environment
-------------------------------------
-
-[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
-
-1. Install Android Studio.
-2. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
-3. From the Quickstart panel, choose "Configure" then "SDK Manager".
-4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
-5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
-7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-9. Default config options should be good enough.
-9. Project initialisation and build should proceed.
-
-Contributing code
------------------
-
-Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Mailing list
-------------
-
-Development discussion happens on the whispersystems mailing list.
-[To join](https://lists.riseup.net/www/info/whispersystems)
-Send emails to whispersystems@lists.riseup.net
-

README.md

@@ -27,7 +27,6 @@ Interested in helping to translate Signal? Contribute here:
 https://www.transifex.com/projects/p/signal-android/
 
 ## Contributing Code
-Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/signalapp/Signal-Android/blob/master/BUILDING.md).
 
 If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
 
@@ -60,9 +59,7 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2011 Whisper Systems
-
-Copyright 2013-2020 Open Whisper Systems
+Copyright 2013-2020 Signal
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

app/.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
+lang_map = da_DK:da-rDK,fil:tl,he:iw,id:in,kn_IN:kn-rIN,pa_PK:pa-rPK,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
 
 [signal-android.master]
 file_filter = src/main/res/values-<lang>/strings.xml

app/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
     }
@@ -80,116 +80,8 @@ protobuf {
     }
 }
 
-dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
-    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.navigation:navigation-fragment:2.1.0'
-    implementation 'androidx.navigation:navigation-ui:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
-    implementation "androidx.camera:camera-core:1.0.0-alpha06"
-    implementation "androidx.camera:camera-camera2:1.0.0-alpha06"
-
-    implementation('com.google.firebase:firebase-messaging:17.3.4') {
-        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'
-    }
-
-    implementation 'com.google.android.gms:play-services-maps:16.1.0'
-    implementation 'com.google.android.gms:play-services-auth:16.0.1'
-
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
-
-    implementation 'org.conscrypt:conscrypt-android:2.0.0'
-    implementation 'org.signal:aesgcmprovider:0.0.3'
-
-    implementation project(':libsignal-service')
-
-    implementation 'org.signal:argon2:13.1@aar'
-
-    implementation 'org.signal:ringrtc-android:0.3.3'
-
-    implementation "me.leolin:ShortcutBadger:1.1.16"
-    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
-    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
-    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.makeramen:roundedimageview:2.1.0'
-    implementation 'com.pnikosis:materialish-progress:1.5'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'pl.tajchert:waitingdots:0.1.0'
-    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
-    implementation 'com.melnykov:floatingactionbutton:1.3.0'
-    implementation 'com.google.zxing:android-integration:3.1.0'
-    implementation 'mobi.upod:time-duration-picker:1.1.3'
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.google.zxing:core:3.2.1'
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
-        exclude group: 'com.squareup.okhttp', module: 'okhttp'
-        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
-    }
-    implementation 'com.annimon:stream:1.1.8'
-    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
-
-    implementation 'com.airbnb.android:lottie:3.0.7'
-
-    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
-    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
-    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
-    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
-
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'org.robolectric:robolectric:4.2'
-    testImplementation 'org.robolectric:shadows-multidex:4.2'
-
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
-
-dependencyVerification {
-    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
-}
-
-def canonicalVersionCode = 596
-def canonicalVersionName = "4.54.3"
+def canonicalVersionCode = 692
+def canonicalVersionName = "4.69.2"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -223,16 +115,18 @@ android {
         buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
         buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
+        buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
         buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
-        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
-        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
+        buildConfigField "String", "CDS_MRENCLAVE", "\"bd123560b01c8fa92935bc5ae15cd2064e5c45215f23f0bd40364d521329d2ad\""
+        buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
+        buildConfigField "String", "KBS_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
 
@@ -300,11 +194,17 @@ android {
             buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
             buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
-            buildConfigField "String", "MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
-            buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"a1e9c1d3f352b5c4f0fc7a421b98119e60e5ff703c28fbea85c66bfa7306deab\""
+            buildConfigField "String", "CDS_MRENCLAVE", "\"bd123560b01c8fa92935bc5ae15cd2064e5c45215f23f0bd40364d521329d2ad\""
+            buildConfigField "String", "KBS_ENCLAVE_NAME", "\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\""
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
+        }
+        flipper {
+            initWith debug
+            minifyEnabled false
         }
         release {
             minifyEnabled true
@@ -353,6 +253,132 @@ android {
     }
 }
 
+dependencies {
+    lintChecks project(':lintchecks')
+
+    implementation('androidx.appcompat:appcompat:1.1.0-beta01') {
+        force = true
+    }
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.navigation:navigation-fragment:2.1.0'
+    implementation 'androidx.navigation:navigation-ui:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
+    implementation "androidx.camera:camera-core:1.0.0-beta01"
+    implementation "androidx.camera:camera-camera2:1.0.0-beta01"
+    implementation "androidx.camera:camera-lifecycle:1.0.0-beta01"
+    implementation "androidx.concurrent:concurrent-futures:1.0.0"
+    implementation "androidx.autofill:autofill:1.0.0"
+    implementation "androidx.paging:paging-common:2.1.2"
+    implementation "androidx.paging:paging-runtime:2.1.2"
+    implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
+    implementation 'com.google.firebase:firebase-ml-vision-face-model:20.0.1'
+
+    implementation ('com.google.firebase:firebase-messaging:20.2.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'
+    }
+
+    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
+
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
+
+    implementation 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation 'org.signal:aesgcmprovider:0.0.3'
+
+    implementation project(':libsignal-service')
+    implementation 'org.signal:zkgroup-android:0.7.0'
+
+    implementation 'org.signal:argon2:13.1@aar'
+
+    implementation 'org.signal:ringrtc-android:2.4.1'
+
+    implementation "me.leolin:ShortcutBadger:1.1.16"
+    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
+    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
+    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.makeramen:roundedimageview:2.1.0'
+    implementation 'com.pnikosis:materialish-progress:1.5'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'pl.tajchert:waitingdots:0.1.0'
+    implementation 'com.melnykov:floatingactionbutton:1.3.0'
+    implementation 'com.google.zxing:android-integration:3.1.0'
+    implementation 'mobi.upod:time-duration-picker:1.1.3'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.google.zxing:core:3.2.1'
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
+        exclude group: 'com.squareup.okhttp', module: 'okhttp'
+        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
+    }
+    implementation 'com.annimon:stream:1.1.8'
+    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
+
+    implementation 'com.airbnb.android:lottie:3.0.7'
+
+    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
+    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
+    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
+    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
+        exclude group: 'com.fasterxml.jackson.core'
+        exclude group: 'org.freemarker'
+    }
+    implementation 'dnsjava:dnsjava:2.1.9'
+
+    flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
+    flipperImplementation 'com.facebook.soloader:soloader:0.8.2'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.4'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.7.4'
+
+    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation ('org.robolectric:robolectric:4.2') {
+        exclude group: 'com.google.protobuf', module: 'protobuf-java'
+    }
+    testImplementation 'org.robolectric:shadows-multidex:4.2'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
+
+dependencyVerification {
+    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
+}
+
+
 def assembleWebsiteDescriptor = { variant, file ->
     if (file.exists()) {
         MessageDigest md = MessageDigest.getInstance("SHA-256");
@@ -429,3 +455,13 @@ def getLastCommitTimestamp() {
         return os.toString() + "000"
     }
 }
+
+tasks.withType(Test) {
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+        showCauses true
+        showExceptions true
+        showStackTraces true
+    }
+}

app/lint.xml

@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
 
+    <!-- Wont pass lint or qa with a STOPSHIP in a comment -->
+    <issue id="StopShip" severity="fatal" />
+
     <!-- L10N errors -->
     <!-- This is a runtime crash so we don't want to ship with this. -->
     <issue id="StringFormatMatches" severity="error" />
 
     <!-- L10N warnings -->
-    <issue id="MissingTranslation" severity="warning" />
+    <issue id="MissingTranslation" severity="ignore" />
     <issue id="MissingQuantity" severity="warning" />
+    <issue id="MissingDefaultResource" severity="error">
+        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English, excludeNonTranslatables task will remove these -->
+    </issue>
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="ImpliedQuantity" severity="warning" />
+    <issue id="TypographyDashes" severity="error" >
+        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English -->
+    </issue>
 
     <issue id="CanvasSize" severity="error" />
     <issue id="HardcodedText" severity="error" />
@@ -17,9 +26,17 @@
     <issue id="ButtonOrder" severity="error" />
     <issue id="ExtraTranslation" severity="warning" />
 
+    <!-- Custom lints -->
+    <issue id="LogNotSignal" severity="error" />
+    <issue id="LogNotAppSignal" severity="error" />
+    <issue id="LogTagInlined" severity="error" />
+
     <issue id="RestrictedApi" severity="error">
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
+        <ignore path="*/org/thoughtcrime/securesms/conversation/*.java" />
+        <ignore path="*/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java" />
+        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
     </issue>
 
 </lint>

app/sampledata/contacts.json

@@ -0,0 +1,29 @@
+{
+  "data": [
+    {
+      "name": "Ottttooooooooo Ocataaaaaaaavius",
+      "number": "+1 (555) 555-5555",
+      "label": "Mobile"
+    },
+    {
+      "name": "Victor Von Doom Phd",
+      "number": "+1 (555) 123-4567",
+      "label": "Home"
+    },
+    {
+      "name": "Flash Thompson",
+      "number": "+1 (555) 435-1261",
+      "label": "Work"
+    },
+    {
+      "name": "Dr. Curtis Connors",
+      "number": "+1 (555) 992-1567",
+      "label": "Mobile"
+    },
+    {
+      "name": "Billy Russo",
+      "number": "+1 (555) 234-1516",
+      "label": "Mobile"
+    }
+  ]
+}

app/src/flipper/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.thoughtcrime.securesms">
+
+    <application
+        android:name=".FlipperApplicationContext"
+        tools:replace="android:name"/>
+</manifest>

app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.java

@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms;
+
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.soloader.SoLoader;
+
+import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter;
+
+public class FlipperApplicationContext extends ApplicationContext {
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    SoLoader.init(this, false);
+
+    FlipperClient client = AndroidFlipperClient.getInstance(this);
+    client.addPlugin(new InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()));
+    client.addPlugin(new DatabasesFlipperPlugin(new FlipperSqlCipherAdapter(this)));
+    client.addPlugin(new SharedPreferencesFlipperPlugin(this));
+    client.start();
+  }
+}

app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java

@@ -0,0 +1,245 @@
+package org.thoughtcrime.securesms.database;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.flipper.plugins.databases.DatabaseDescriptor;
+import com.facebook.flipper.plugins.databases.DatabaseDriver;
+
+import net.sqlcipher.DatabaseUtils;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteStatement;
+
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A lot of this code is taken from {@link com.facebook.flipper.plugins.databases.impl.SqliteDatabaseDriver}
+ * and made to work with SqlCipher. Unfortunately I couldn't use it directly, nor subclass it.
+ */
+public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdapter.Descriptor> {
+
+  public FlipperSqlCipherAdapter(Context context) {
+    super(context);
+  }
+
+  @Override
+  public List<Descriptor> getDatabases() {
+    return Collections.singletonList(new Descriptor(DatabaseFactory.getRawDatabase(getContext())));
+  }
+
+  @Override
+  public List<String> getTableNames(Descriptor descriptor) {
+    SQLiteDatabase db         = descriptor.getReadable();
+    List<String>   tableNames = new ArrayList<>();
+
+    try (Cursor cursor = db.rawQuery("SELECT name FROM sqlite_master WHERE type IN (?, ?)", new String[] { "table", "view" })) {
+      while (cursor != null && cursor.moveToNext()) {
+        tableNames.add(cursor.getString(0));
+      }
+    }
+
+    return tableNames;
+  }
+
+  @Override
+  public DatabaseGetTableDataResponse getTableData(Descriptor descriptor, String table, String order, boolean reverse, int start, int count) {
+    SQLiteDatabase db = descriptor.getReadable();
+
+    long   total   = DatabaseUtils.queryNumEntries(db, table);
+    String orderBy = order != null ? order + (reverse ? " DESC" : " ASC") : null;
+    String limitBy = start + ", " + count;
+
+    try (Cursor cursor = db.query(table, null, null, null, null, null, orderBy, limitBy)) {
+      String[]           columnNames = cursor.getColumnNames();
+      List<List<Object>> rows        = cursorToList(cursor);
+
+      return new DatabaseGetTableDataResponse(Arrays.asList(columnNames), rows, start, rows.size(), total);
+    }
+  }
+
+  @Override
+  public DatabaseGetTableStructureResponse getTableStructure(Descriptor descriptor, String table) {
+    SQLiteDatabase db = descriptor.getReadable();
+
+    Map<String, String> foreignKeyValues = new HashMap<>();
+
+    try(Cursor cursor = db.rawQuery("PRAGMA foreign_key_list(" + table + ")", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String from      = cursor.getString(cursor.getColumnIndex("from"));
+        String to        = cursor.getString(cursor.getColumnIndex("to"));
+        String tableName = cursor.getString(cursor.getColumnIndex("table")) + "(" + to + ")";
+
+        foreignKeyValues.put(from, tableName);
+      }
+    }
+
+
+    List<String>        structureColumns = Arrays.asList("column_name", "data_type", "nullable", "default", "primary_key", "foreign_key");
+    List<List<Object>>  structureValues = new ArrayList<>();
+
+    try (Cursor cursor = db.rawQuery("PRAGMA table_info(" + table + ")", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String columnName = cursor.getString(cursor.getColumnIndex("name"));
+        String foreignKey = foreignKeyValues.containsKey(columnName) ? foreignKeyValues.get(columnName) : null;
+
+        structureValues.add(Arrays.asList(columnName,
+                                          cursor.getString(cursor.getColumnIndex("type")),
+                                          cursor.getInt(cursor.getColumnIndex("notnull")) == 0,
+                                          getObjectFromColumnIndex(cursor, cursor.getColumnIndex("dflt_value")),
+                                          cursor.getInt(cursor.getColumnIndex("pk")) == 1,
+                                          foreignKey));
+      }
+    }
+
+
+    List<String>       indexesColumns = Arrays.asList("index_name", "unique", "indexed_column_name");
+    List<List<Object>> indexesValues  = new ArrayList<>();
+
+    try (Cursor indexesCursor = db.rawQuery("PRAGMA index_list(" + table + ")", null)) {
+      List<String> indexedColumnNames = new ArrayList<>();
+      String       indexName          = indexesCursor.getString(indexesCursor.getColumnIndex("name"));
+
+      try(Cursor indexInfoCursor = db.rawQuery("PRAGMA index_info(" + indexName + ")", null)) {
+        while (indexInfoCursor.moveToNext()) {
+          indexedColumnNames.add(indexInfoCursor.getString(indexInfoCursor.getColumnIndex("name")));
+        }
+      }
+
+      indexesValues.add(Arrays.asList(indexName,
+                                      indexesCursor.getInt(indexesCursor.getColumnIndex("unique")) == 1,
+                                      TextUtils.join(",", indexedColumnNames)));
+
+    }
+
+    return new DatabaseGetTableStructureResponse(structureColumns, structureValues, indexesColumns, indexesValues);
+  }
+
+  @Override
+  public DatabaseGetTableInfoResponse getTableInfo(Descriptor databaseDescriptor, String table) {
+    SQLiteDatabase db = databaseDescriptor.getReadable();
+
+    try (Cursor cursor = db.rawQuery("SELECT sql FROM sqlite_master WHERE name = ?", new String[] { table })) {
+      cursor.moveToFirst();
+      return new DatabaseGetTableInfoResponse(cursor.getString(cursor.getColumnIndex("sql")));
+    }
+  }
+
+  @Override
+  public DatabaseExecuteSqlResponse executeSQL(Descriptor descriptor, String query) {
+    SQLiteDatabase db = descriptor.getWritable();
+
+    String firstWordUpperCase = getFirstWord(query).toUpperCase();
+
+    switch (firstWordUpperCase) {
+      case "UPDATE":
+      case "DELETE":
+        return executeUpdateDelete(db, query);
+      case "INSERT":
+        return executeInsert(db, query);
+      case "SELECT":
+      case "PRAGMA":
+      case "EXPLAIN":
+        return executeSelect(db, query);
+      default:
+        return executeRawQuery(db, query);
+    }
+  }
+
+  private static String getFirstWord(String s) {
+    s = s.trim();
+    int firstSpace = s.indexOf(' ');
+    return firstSpace >= 0 ? s.substring(0, firstSpace) : s;
+  }
+
+  private static DatabaseExecuteSqlResponse executeUpdateDelete(SQLiteDatabase database, String query) {
+    SQLiteStatement statement = database.compileStatement(query);
+    int             count     = statement.executeUpdateDelete();
+
+    return DatabaseExecuteSqlResponse.successfulUpdateDelete(count);
+  }
+
+  private static DatabaseExecuteSqlResponse executeInsert(SQLiteDatabase database, String query) {
+    SQLiteStatement statement  = database.compileStatement(query);
+    long            insertedId = statement.executeInsert();
+
+    return DatabaseExecuteSqlResponse.successfulInsert(insertedId);
+  }
+
+  private static DatabaseExecuteSqlResponse executeSelect(SQLiteDatabase database, String query) {
+    try (Cursor cursor = database.rawQuery(query, null)) {
+      String[]           columnNames = cursor.getColumnNames();
+      List<List<Object>> rows        = cursorToList(cursor);
+
+      return DatabaseExecuteSqlResponse.successfulSelect(Arrays.asList(columnNames), rows);
+    }
+  }
+
+  private static DatabaseExecuteSqlResponse executeRawQuery(SQLiteDatabase database, String query) {
+    database.execSQL(query);
+    return DatabaseExecuteSqlResponse.successfulRawQuery();
+  }
+
+  private static @NonNull List<List<Object>> cursorToList(Cursor cursor) {
+    List<List<Object>> rows       = new ArrayList<>();
+    int                numColumns = cursor.getColumnCount();
+
+    while (cursor.moveToNext()) {
+      List<Object> values = new ArrayList<>(numColumns);
+
+      for (int column = 0; column < numColumns; column++) {
+        values.add(getObjectFromColumnIndex(cursor, column));
+      }
+
+      rows.add(values);
+    }
+    return rows;
+  }
+
+  private static @Nullable Object getObjectFromColumnIndex(Cursor cursor, int column) {
+    switch (cursor.getType(column)) {
+      case Cursor.FIELD_TYPE_NULL:
+        return null;
+      case Cursor.FIELD_TYPE_INTEGER:
+        return cursor.getLong(column);
+      case Cursor.FIELD_TYPE_FLOAT:
+        return cursor.getDouble(column);
+      case Cursor.FIELD_TYPE_BLOB:
+        return cursor.getBlob(column);
+      case Cursor.FIELD_TYPE_STRING:
+      default:
+        return cursor.getString(column);
+    }
+  }
+
+  static class Descriptor implements DatabaseDescriptor {
+    private final SQLCipherOpenHelper sqlCipherOpenHelper;
+
+    Descriptor(@NonNull SQLCipherOpenHelper sqlCipherOpenHelper) {
+      this.sqlCipherOpenHelper = sqlCipherOpenHelper;
+    }
+
+    @Override
+    public String name() {
+      return sqlCipherOpenHelper.getDatabaseName();
+    }
+
+    public @NonNull SQLiteDatabase getReadable() {
+      return sqlCipherOpenHelper.getReadableDatabase();
+    }
+
+    public @NonNull SQLiteDatabase getWritable() {
+      return sqlCipherOpenHelper.getWritableDatabase();
+    }
+  }
+}

app/src/flipper/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Signal (Flipper)</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms">
 
-    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2"/>
+    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
@@ -117,9 +117,18 @@
               android:theme="@style/TextSecure.LightTheme.WebRTCCall"
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:supportsPictureInPicture="true"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+              android:taskAffinity=".calling"
               android:launchMode="singleTask"/>
 
+    <activity android:name=".messagerequests.CalleeMustAcceptMessageRequestActivity"
+              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:screenOrientation="portrait"
+              android:noHistory="true"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".InviteActivity"
               android:theme="@style/Signal.Light.NoActionBar.Invite"
               android:windowSoftInputMode="stateHidden"
@@ -148,15 +157,14 @@
     <activity android:name=".preferences.MmsPreferencesActivity"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ShareActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+    <activity android:name=".sharing.ShareActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:excludeFromRecents="true"
               android:launchMode="singleTask"
               android:taskAffinity=""
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-
         <intent-filter>
             <action android:name="android.intent.action.SEND" />
             <category android:name="android.intent.category.DEFAULT"/>
@@ -169,14 +177,21 @@
             <data android:mimeType="*/*"/>
         </intent-filter>
 
-        <meta-data
-                android:name="android.service.chooser.chooser_target_service"
+        <intent-filter>
+            <action android:name="android.intent.action.SEND_MULTIPLE" />
+            <category android:name="android.intent.category.DEFAULT"/>
+            <data android:mimeType="image/*" />
+            <data android:mimeType="video/*" />
+        </intent-filter>
+
+      <meta-data
+          android:name="android.service.chooser.chooser_target_service"
                 android:value=".service.DirectShareService" />
 
     </activity>
 
     <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
@@ -208,6 +223,14 @@
             <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
         </intent-filter>
 
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https"
+                  android:host="group.signal.org"/>
+        </intent-filter>
+
         <meta-data android:name="com.sec.minimode.icon.portrait.normal"
                    android:resource="@mipmap/ic_launcher" />
         <meta-data android:name="com.sec.minimode.icon.landscape.normal"
@@ -235,15 +258,23 @@
               android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
-    <activity android:name=".MessageDetailsActivity"
+    <activity android:name=".messagedetails.MessageDetailsActivity"
               android:label="@string/AndroidManifest__message_details"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".GroupCreateActivity"
-          android:windowSoftInputMode="stateVisible"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
@@ -255,15 +286,10 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ExperienceUpgradeActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseCreateActivity"
+      <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -273,7 +299,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -283,7 +309,7 @@
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -331,7 +357,7 @@
                android:label="@string/AndroidManifest__linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".LogSubmitActivity"
+    <activity android:name=".logsubmit.SubmitDebugLogActivity"
               android:label="@string/AndroidManifest__log_submit"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -342,8 +368,13 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".AvatarPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".mediaoverview.MediaOverviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -394,8 +425,8 @@
 
     </activity>
 
-    <activity android:name=".RecipientPreferenceActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+    <activity android:name=".mediasend.AvatarSelectionActivity"
+              android:theme="@style/TextSecure.FullScreenMedia"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".BlockedContactsActivity"
@@ -406,19 +437,25 @@
               android:theme="@style/TextSecure.DarkTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
-              android:theme="@style/TextSecure.DarkTheme"/>
-
     <activity android:name=".profiles.edit.EditProfileActivity"
+              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:windowSoftInputMode="stateVisible|adjustResize" />
+
+    <activity android:name=".lock.v2.CreateKbsPinActivity"
             android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="stateVisible"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".lock.v2.KbsMigrationActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:windowSoftInputMode="adjustResize"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ClearProfileAvatarActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:icon="@drawable/clear_profile_avatar"
-              android:label="@string/AndroidManifest_remove_photo">
+            android:theme="@style/Theme.AppCompat.Dialog.Alert"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:icon="@drawable/clear_profile_avatar"
+            android:label="@string/AndroidManifest_remove_photo">
 
         <intent-filter>
             <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
@@ -426,38 +463,65 @@
         </intent-filter>
     </activity>
 
+    <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
+              android:theme="@style/Theme.AppCompat.Dialog.Alert" />
+
+    <activity android:name=".messagerequests.MessageRequestMegaphoneActivity"
+              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:windowSoftInputMode="adjustResize"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".contactshare.ContactShareEditActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ShortcutLauncherActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="true"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity
             android:name=".maps.PlacePickerActivity"
             android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".MainActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
+    <activity android:name=".pin.PinRestoreActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.addmembers.AddMembersActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
     <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.IncomingMessageObserver$ForegroundService"/>
+    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
 
     <service android:name=".service.QuickResponseService"
              android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
@@ -496,7 +560,9 @@
 
     <service android:name=".service.GenericForegroundService"/>
 
-    <service android:name=".gcm.FcmService">
+    <service android:name=".gcm.FcmFetchService" />
+
+    <service android:name=".gcm.FcmReceiveService">
         <intent-filter>
             <action android:name="com.google.firebase.MESSAGING_EVENT" />
         </intent-filter>
@@ -608,11 +674,6 @@
               android:authorities="org.thoughtcrime.securesms.database.stickerpack"
               android:exported="false" />
 
-    <provider android:name="androidx.camera.camera2.impl.Camera2Initializer"
-              android:authorities="${applicationId}.camerax-init"
-              android:exported="false"
-              android:enabled="false" />
-
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -656,11 +717,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
-        </intent-filter>
-    </receiver>
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
 
     <receiver android:name=".notifications.DeleteNotificationReceiver">
         <intent-filter>
@@ -668,17 +725,6 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".ExperienceUpgradeActivity$AppUpgradeReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
-            <data android:scheme="package" />
-        </intent-filter>
-
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION"/>
-        </intent-filter>
-    </receiver>
-
     <receiver
         android:name=".service.PanicResponderListener"
         android:exported="true">

app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java

@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms;
+
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+
+public final class AppCapabilities {
+
+  private AppCapabilities() {
+  }
+
+  private static final boolean UUID_CAPABLE = false;
+
+  /**
+   * @param storageCapable Whether or not the user can use storage service. This is another way of
+   *                       asking if the user has set a Signal PIN or not.
+   */
+  public static SignalServiceProfile.Capabilities getCapabilities(boolean storageCapable) {
+    return new SignalServiceProfile.Capabilities(UUID_CAPABLE, FeatureFlags.groupsV2(), storageCapable);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java

@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.insights.InsightsOptOut;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.stickers.BlessedPacks;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+
+/**
+ * Rule of thumb: if there's something you want to do on the first app launch that involves
+ * persisting state to the database, you'll almost certainly *also* want to do it post backup
+ * restore, since a backup restore will wipe the current state of the database.
+ */
+public final class AppInitialization {
+
+  private static final String TAG = Log.tag(AppInitialization.class);
+
+  private AppInitialization() {}
+
+  public static void onFirstEverAppLaunch(@NonNull Context context) {
+    Log.i(TAG, "onFirstEverAppLaunch()");
+
+    InsightsOptOut.userRequestedOptOut(context);
+    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
+    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
+    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    SignalStore.onFirstEverAppLaunch();
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+  }
+
+  public static void onPostBackupRestore(@NonNull Context context) {
+    Log.i(TAG, "onPostBackupRestore()");
+
+    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    SignalStore.onFirstEverAppLaunch();
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -17,24 +17,22 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.SuppressLint;
-
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.camera.camera2.Camera2AppConfig;
-import androidx.camera.core.CameraX;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.multidex.MultiDexApplication;
 
 import com.google.android.gms.security.ProviderInstaller;
 
 import org.conscrypt.Conscrypt;
 import org.signal.aesgcmprovider.AesGcmProvider;
-import org.signal.ringrtc.CallConnectionFactory;
+import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.components.TypingStatusRepository;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -42,39 +40,34 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
-import org.thoughtcrime.securesms.insights.InsightsOptOut;
-import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
-import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
+import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.registration.RegistrationUtil;
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
-import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
-import org.thoughtcrime.securesms.stickers.BlessedPacks;
+import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
@@ -102,7 +95,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   private ViewOnceMessageManager   viewOnceMessageManager;
   private TypingStatusRepository   typingStatusRepository;
   private TypingStatusSender       typingStatusSender;
-  private IncomingMessageObserver  incomingMessageObserver;
   private PersistentLogger         persistentLogger;
 
   private volatile boolean isAppVisible;
@@ -113,10 +105,11 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   public void onCreate() {
+    long startTime = System.currentTimeMillis();
     super.onCreate();
-    Log.i(TAG, "onCreate()");
     initializeSecurityProvider();
     initializeLogging();
+    Log.i(TAG, "onCreate()");
     initializeCrashHandling();
     initializeAppDependencies();
     initializeFirstEverAppLaunch();
@@ -134,9 +127,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializePendingMessages();
     initializeBlobProvider();
     initializeCleanup();
-    initializeCameraX();
+
     FeatureFlags.init();
     NotificationChannels.create(this);
+    RefreshPreKeysJob.scheduleIfNecessary();
+    StorageSyncHelper.scheduleRoutineSync();
+    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
+    RegistrationUtil.maybeMarkRegistrationComplete(this);
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
     if (Build.VERSION.SDK_INT < 21) {
@@ -144,17 +141,19 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
 
     ApplicationDependencies.getJobManager().beginJobLoop();
+    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
   }
 
   @Override
   public void onStart(@NonNull LifecycleOwner owner) {
     isAppVisible = true;
     Log.i(TAG, "App is now visible.");
-    FeatureFlags.refresh();
+    FeatureFlags.refreshIfNecessary();
     ApplicationDependencies.getRecipientCache().warmUp();
     executePendingContactSync();
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
+    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
   }
 
   @Override
@@ -162,7 +161,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     isAppVisible = false;
     Log.i(TAG, "App is no longer visible.");
     KeyCachingService.onAppBackgrounded(this);
-    MessageNotifier.setVisibleThread(-1);
+    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
     ApplicationDependencies.getFrameRateTracker().end();
   }
 
@@ -231,7 +230,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   public void initializeMessageRetrieval() {
-    this.incomingMessageObserver = new IncomingMessageObserver(this);
+    ApplicationDependencies.getIncomingMessageObserver();
   }
 
   private void initializeAppDependencies() {
@@ -242,14 +241,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
       if (!SQLCipherOpenHelper.databaseFileExists(this)) {
         Log.i(TAG, "First ever app launch!");
-
-        InsightsOptOut.userRequestedOptOut(this);
-        TextSecurePreferences.setAppMigrationVersion(this, ApplicationMigrations.CURRENT_VERSION);
-        TextSecurePreferences.setJobManagerVersion(this, JobManager.CURRENT_VERSION);
-        TextSecurePreferences.setLastExperienceVersionCode(this, Util.getCanonicalVersionCode());
-        TextSecurePreferences.setHasSeenStickerIntroTooltip(this, true);
-        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
-        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+        AppInitialization.onFirstEverAppLaunch(this);
       }
 
       Log.i(TAG, "Setting first install version to " + BuildConfig.CANONICAL_VERSION_CODE);
@@ -330,9 +322,9 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
       }
 
-      CallConnectionFactory.initialize(this, new RingRtcLogger());
+      CallManager.initialize(this, new RingRtcLogger());
     } catch (UnsatisfiedLinkError e) {
-      Log.w(TAG, e);
+      throw new AssertionError("Unable to load ringrtc library", e);
     }
   }
 
@@ -386,19 +378,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     });
   }
 
-  @SuppressLint("RestrictedApi")
-  private void initializeCameraX() {
-    if (CameraXUtil.isSupported()) {
-      new Thread(() -> {
-        try {
-          CameraX.init(this, Camera2AppConfig.create(this));
-        } catch (Throwable t) {
-          Log.w(TAG, "Failed to initialize CameraX.");
-        }
-      }, "signal-camerax-initialization").start();
-    }
-  }
-
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));

app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -29,6 +29,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 
+import org.thoughtcrime.securesms.help.HelpFragment;
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
@@ -52,7 +53,7 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
  *
  */
 
-public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity
+public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener
 {
   @SuppressWarnings("unused")
@@ -66,6 +67,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
   private static final String PREFERENCE_CATEGORY_STORAGE        = "preference_category_storage";
   private static final String PREFERENCE_CATEGORY_DEVICES        = "preference_category_devices";
+  private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
   private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
@@ -154,6 +156,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_STORAGE));
       this.findPreference(PREFERENCE_CATEGORY_DEVICES)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES));
+      this.findPreference(PREFERENCE_CATEGORY_HELP)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
 
@@ -240,6 +244,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         case PREFERENCE_CATEGORY_ADVANCED:
           fragment = new AdvancedPreferenceFragment();
           break;
+        case PREFERENCE_CATEGORY_HELP:
+          fragment = new HelpFragment();
+          break;
         default:
           throw new AssertionError();
         }
@@ -265,12 +272,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     private class ProfileClickListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        Intent intent = new Intent(preference.getContext(), EditProfileActivity.class);
-        intent.putExtra(EditProfileActivity.EXCLUDE_SYSTEM, true);
-        intent.putExtra(EditProfileActivity.DISPLAY_USERNAME, true);
-        intent.putExtra(EditProfileActivity.NEXT_BUTTON_TEXT, R.string.save);
-
-        requireActivity().startActivity(intent);
+        requireActivity().startActivity(EditProfileActivity.getIntentForUserProfileEdit(preference.getContext()));
         return true;
       }
     }

app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java

@@ -0,0 +1,223 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.transition.TransitionInflater;
+import android.view.DisplayCutout;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.request.transition.Transition;
+
+import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+/**
+ * Activity for displaying avatars full screen.
+ */
+public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
+
+  private static final String TAG = Log.tag(AvatarPreviewActivity.class);
+
+  private static final String RECIPIENT_ID_EXTRA = "recipient_id";
+
+  public static @NonNull Intent intentFromRecipientId(@NonNull Context context,
+                                                      @NonNull RecipientId recipientId)
+  {
+    Intent intent = new Intent(context, AvatarPreviewActivity.class);
+    intent.putExtra(RECIPIENT_ID_EXTRA, recipientId.serialize());
+    return intent;
+  }
+
+  public static Bundle createTransitionBundle(@NonNull Activity activity, @NonNull View from) {
+    return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, from, "avatar").toBundle();
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    super.onCreate(savedInstanceState, ready);
+
+    setTheme(R.style.TextSecure_MediaPreview);
+    setContentView(R.layout.contact_photo_preview_activity);
+
+    if (Build.VERSION.SDK_INT >= 21) {
+      postponeEnterTransition();
+      TransitionInflater inflater = TransitionInflater.from(this);
+      getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
+      getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
+    }
+
+    Toolbar   toolbar = findViewById(R.id.toolbar);
+    ImageView avatar  = findViewById(R.id.avatar);
+
+    setSupportActionBar(toolbar);
+
+    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    if (Build.VERSION.SDK_INT >= 28) {
+      getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+      toolbar.getViewTreeObserver().addOnGlobalLayoutListener(new DisplayCutoutAdjuster(toolbar, findViewById(R.id.toolbar_cutout_spacer)));
+    }
+
+    showSystemUI();
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    Context     context     = getApplicationContext();
+    RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA));
+
+    Recipient.live(recipientId).observe(this, recipient -> {
+      ContactPhoto contactPhoto  = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar())
+                                                                   : recipient.getContactPhoto();
+      FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
+                                                                     : recipient.getFallbackContactPhoto();
+
+      Resources resources = this.getResources();
+
+      GlideApp.with(this)
+              .asBitmap()
+              .load(contactPhoto)
+              .fallback(fallbackPhoto.asCallCard(this))
+              .error(fallbackPhoto.asCallCard(this))
+              .diskCacheStrategy(DiskCacheStrategy.ALL)
+              .addListener(new RequestListener<Bitmap>() {
+                @Override
+                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+                  Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
+                  finish();
+                  return false;
+                }
+
+                @Override
+                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+                  return false;
+                }
+              })
+              .into(new CustomTarget<Bitmap>() {
+                @Override
+                public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                  avatar.setImageDrawable(RoundedBitmapDrawableFactory.create(resources, resource));
+                  if (Build.VERSION.SDK_INT >= 21) {
+                    startPostponedEnterTransition();
+                  }
+                }
+
+                @Override
+                public void onLoadCleared(@Nullable Drawable placeholder) {
+                }
+              });
+
+      toolbar.setTitle(recipient.getDisplayName(context));
+    });
+
+    avatar.setOnClickListener(v -> toggleUiVisibility());
+
+    showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout));
+  }
+
+  private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) {
+    window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> {
+      boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+
+      for (View view : views) {
+        view.animate()
+            .alpha(hide ? 0 : 1)
+            .start();
+      }
+    });
+  }
+
+  private void toggleUiVisibility() {
+    int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
+    if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+      showSystemUI();
+    } else {
+      hideSystemUI();
+    }
+  }
+
+  private void hideSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_IMMERSIVE              |
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN      |
+        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION        |
+        View.SYSTEM_UI_FLAG_FULLSCREEN              );
+  }
+
+  private void showSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN       );
+  }
+
+  @Override
+  public boolean onSupportNavigateUp() {
+    onBackPressed();
+    return true;
+  }
+
+  /**
+   * Adjust a spacer for the toolbar when a display cutout is detected. Runs within
+   * a layout listener because the activity delays view attachment due to the transitions
+   * and needs to update on device rotation.
+   */
+  @TargetApi(28)
+  private static class DisplayCutoutAdjuster implements ViewTreeObserver.OnGlobalLayoutListener {
+
+    private final View view;
+    private final View spacer;
+
+    private DisplayCutoutAdjuster(@NonNull View view, @NonNull View spacer) {
+      this.view   = view;
+      this.spacer = spacer;
+    }
+
+    @Override
+    public void onGlobalLayout() {
+      if (view.getRootWindowInsets() == null) {
+        return;
+      }
+
+      DisplayCutout cutout = view.getRootWindowInsets().getDisplayCutout();
+      if (cutout != null) {
+        ViewGroup.LayoutParams params = spacer.getLayoutParams();
+        params.height = cutout.getSafeInsetTop();
+        spacer.setLayoutParams(params);
+        spacer.setVisibility(View.VISIBLE);
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -1,101 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.WindowManager;
-
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
-import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
-
-import java.lang.reflect.Field;
-
-
-public abstract class BaseActionBarActivity extends AppCompatActivity {
-  private static final String TAG = BaseActionBarActivity.class.getSimpleName();
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    if (BaseActivity.isMenuWorkaroundRequired()) {
-      forceOverflowMenu();
-    }
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    initializeScreenshotSecurity();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
-  }
-
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
-  }
-
-  @Override
-  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) {
-      openOptionsMenu();
-      return true;
-    }
-    return super.onKeyUp(keyCode, event);
-  }
-
-  private void initializeScreenshotSecurity() {
-    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
-      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    } else {
-      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    }
-  }
-
-  /**
-   * Modified from: http://stackoverflow.com/a/13098824
-   */
-  private void forceOverflowMenu() {
-    try {
-      ViewConfiguration config       = ViewConfiguration.get(this);
-      Field             menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
-      if(menuKeyField != null) {
-        menuKeyField.setAccessible(true);
-        menuKeyField.setBoolean(config, false);
-      }
-    } catch (IllegalAccessException e) {
-      Log.w(TAG, "Failed to force overflow menu.");
-    } catch (NoSuchFieldException e) {
-      Log.w(TAG, "Failed to force overflow menu.");
-    }
-  }
-
-  protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
-    Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
-                                         .toBundle();
-    ActivityCompat.startActivity(this, intent, bundle);
-  }
-
-  @TargetApi(VERSION_CODES.LOLLIPOP)
-  protected void setStatusBarColor(int color) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setStatusBarColor(color);
-    }
-  }
-
-  @Override
-  protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -1,46 +1,90 @@
 package org.thoughtcrime.securesms;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
-import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import android.view.KeyEvent;
+import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import android.view.View;
+import android.view.WindowManager;
+
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
-public abstract class BaseActivity extends FragmentActivity {
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
-  }
+/**
+ * Base class for all activities. The vast majority of activities shouldn't extend this directly.
+ * Instead, they should extend {@link PassphraseRequiredActivity} so they're protected by
+ * screen lock.
+ */
+public abstract class BaseActivity extends AppCompatActivity {
+  private static final String TAG = Log.tag(BaseActivity.class);
 
   @Override
-  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) {
-      openOptionsMenu();
-      return true;
-    }
-    return super.onKeyUp(keyCode, event);
-  }
-
-  public static boolean isMenuWorkaroundRequired() {
-    return VERSION.SDK_INT < VERSION_CODES.KITKAT          &&
-           VERSION.SDK_INT > VERSION_CODES.GINGERBREAD_MR1 &&
-           ("LGE".equalsIgnoreCase(Build.MANUFACTURER) || "E6710".equalsIgnoreCase(Build.DEVICE));
+  protected void onCreate(Bundle savedInstanceState) {
+    logEvent("onCreate()");
+    super.onCreate(savedInstanceState);
   }
 
   @Override
   protected void onResume() {
     super.onResume();
+    initializeScreenshotSecurity();
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
   }
 
+  @Override
+  protected void onStart() {
+    logEvent("onStart()");
+    super.onStart();
+  }
+
+  @Override
+  protected void onStop() {
+    logEvent("onStop()");
+    super.onStop();
+  }
+
+  @Override
+  protected void onDestroy() {
+    logEvent("onDestroy()");
+    super.onDestroy();
+  }
+
+  private void initializeScreenshotSecurity() {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+  }
+
+  protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
+    Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
+                                         .toBundle();
+    ActivityCompat.startActivity(this, intent, bundle);
+  }
+
+  @TargetApi(VERSION_CODES.LOLLIPOP)
+  protected void setStatusBarColor(int color) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      getWindow().setStatusBarColor(color);
+    }
+  }
+
   @Override
   protected void attachBaseContext(Context newBase) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
   }
+
+  private void logEvent(@NonNull String event) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class BasicIntroFragment extends Fragment {
-
-  private static final String ARG_DRAWABLE = "drawable";
-  private static final String ARG_TEXT     = "text";
-  private static final String ARG_SUBTEXT  = "subtext";
-
-  private int drawable;
-  private int text;
-  private int subtext;
-
-  public static BasicIntroFragment newInstance(int drawable, int text, int subtext) {
-    BasicIntroFragment fragment = new BasicIntroFragment();
-    Bundle args = new Bundle();
-    args.putInt(ARG_DRAWABLE, drawable);
-    args.putInt(ARG_TEXT, text);
-    args.putInt(ARG_SUBTEXT, subtext);
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  public BasicIntroFragment() {}
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    if (getArguments() != null) {
-      drawable = getArguments().getInt(ARG_DRAWABLE);
-      text     = getArguments().getInt(ARG_TEXT    );
-      subtext  = getArguments().getInt(ARG_SUBTEXT );
-    }
-  }
-
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                           Bundle savedInstanceState) {
-    View v = inflater.inflate(R.layout.color_fragment, container, false);
-
-    ((ImageView)v.findViewById(R.id.watermark)).setImageResource(drawable);
-    ((TextView)v.findViewById(R.id.blurb)).setText(text);
-    ((TextView)v.findViewById(R.id.subblurb)).setText(subtext);
-
-    return v;
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -1,13 +1,15 @@
 package org.thoughtcrime.securesms;
 
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.view.View;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
+import org.thoughtcrime.securesms.conversation.ConversationMessage;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.database.model.ReactionRecord;
+import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -20,17 +22,17 @@ import java.util.Locale;
 import java.util.Set;
 
 public interface BindableConversationItem extends Unbindable {
-  void bind(@NonNull MessageRecord           messageRecord,
+  void bind(@NonNull ConversationMessage messageRecord,
             @NonNull Optional<MessageRecord> previousMessageRecord,
             @NonNull Optional<MessageRecord> nextMessageRecord,
-            @NonNull GlideRequests           glideRequests,
-            @NonNull Locale                  locale,
-            @NonNull Set<MessageRecord>      batchSelected,
-            @NonNull Recipient               recipients,
-            @Nullable String                 searchQuery,
-                     boolean                 pulseHighlight);
+            @NonNull GlideRequests glideRequests,
+            @NonNull Locale locale,
+            @NonNull Set<ConversationMessage> batchSelected,
+            @NonNull Recipient recipients,
+            @Nullable String searchQuery,
+            boolean pulseMention);
 
-  MessageRecord getMessageRecord();
+  ConversationMessage getConversationMessage();
 
   void setEventListener(@Nullable EventListener listener);
 
@@ -44,6 +46,11 @@ public interface BindableConversationItem extends Unbindable {
     void onAddToContactsClicked(@NonNull Contact contact);
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
-    void onReactionClicked(long messageId, boolean isMms);
+    void onReactionClicked(@NonNull View reactionTarget, long messageId, boolean isMms);
+    void onGroupMemberClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
+    void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
+
+    /** @return true if handled, false if you want to let the normal url handling continue */
+    boolean onUrlClicked(@NonNull String url);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java

@@ -10,8 +10,11 @@ import java.util.Set;
 
 public interface BindableConversationListItem extends Unbindable {
 
-  public void bind(@NonNull ThreadRecord thread,
-                   @NonNull GlideRequests glideRequests, @NonNull Locale locale,
-                   @NonNull Set<Long> typingThreads,
-                   @NonNull Set<Long> selectedThreads, boolean batchMode);
+  void bind(@NonNull ThreadRecord thread,
+            @NonNull GlideRequests glideRequests, @NonNull Locale locale,
+            @NonNull Set<Long> typingThreads,
+            @NonNull Set<Long> selectedThreads, boolean batchMode);
+
+  void setBatchMode(boolean batchMode);
+  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
 }

app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java

@@ -0,0 +1,128 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.Lifecycle;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+
+/**
+ * This should be used whenever we want to prompt the user to block/unblock a recipient.
+ */
+public final class BlockUnblockDialog {
+
+  private BlockUnblockDialog() { }
+
+  public static void showBlockFor(@NonNull Context context,
+                                  @NonNull Lifecycle lifecycle,
+                                  @NonNull Recipient recipient,
+                                  @NonNull Runnable onBlock)
+  {
+    SimpleTask.run(lifecycle,
+                   () -> buildBlockFor(context, recipient, onBlock, null),
+                   AlertDialog.Builder::show);
+  }
+
+  public static void showBlockAndDeleteFor(@NonNull Context context,
+                                           @NonNull Lifecycle lifecycle,
+                                           @NonNull Recipient recipient,
+                                           @NonNull Runnable onBlock,
+                                           @NonNull Runnable onBlockAndDelete)
+  {
+    SimpleTask.run(lifecycle,
+        () -> buildBlockFor(context, recipient, onBlock, onBlockAndDelete),
+        AlertDialog.Builder::show);
+  }
+
+  public static void showUnblockFor(@NonNull Context context,
+                                    @NonNull Lifecycle lifecycle,
+                                    @NonNull Recipient recipient,
+                                    @NonNull Runnable onUnblock)
+  {
+    SimpleTask.run(lifecycle,
+                   () -> buildUnblockFor(context, recipient, onUnblock),
+                   AlertDialog.Builder::show);
+  }
+
+  @WorkerThread
+  private static AlertDialog.Builder buildBlockFor(@NonNull Context context,
+                                                   @NonNull Recipient recipient,
+                                                   @NonNull Runnable onBlock,
+                                                   @Nullable Runnable onBlockAndDelete)
+  {
+    recipient = recipient.resolve();
+
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    Resources           resources = context.getResources();
+
+    if (recipient.isGroup()) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      } else {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_wont_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_block, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    } else {
+      builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
+      builder.setMessage(R.string.BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages);
+
+      if (onBlockAndDelete != null) {
+        builder.setNeutralButton(android.R.string.cancel, null);
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_delete, (d, w) -> onBlockAndDelete.run());
+        builder.setNegativeButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
+      } else {
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    }
+
+    return builder;
+  }
+
+  @WorkerThread
+  private static AlertDialog.Builder buildUnblockFor(@NonNull Context context,
+                                                     @NonNull Recipient recipient,
+                                                     @NonNull Runnable onUnblock)
+  {
+    recipient = recipient.resolve();
+
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    Resources           resources = context.getResources();
+
+    if (recipient.isGroup()) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      } else {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    } else {
+      builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+      builder.setMessage(R.string.BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other);
+      builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+      builder.setNegativeButton(android.R.string.cancel, null);
+    }
+
+    return builder;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java

@@ -1,22 +1,21 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.cursoradapter.widget.CursorAdapter;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.loaders.BlockedContactsLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -25,21 +24,18 @@ import org.thoughtcrime.securesms.preferences.BlockedContactListItem;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
+public class BlockedContactsActivity extends PassphraseRequiredActivity {
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
 
   @Override
   public void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
-
   @Override
   public void onCreate(Bundle bundle, boolean ready) {
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -51,16 +47,12 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
-    }
-
-    return false;
+  public boolean onSupportNavigateUp() {
+    onBackPressed();
+    return true;
   }
 
   public static class BlockedContactsFragment
@@ -76,14 +68,14 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     @Override
     public void onCreate(Bundle bundle) {
       super.onCreate(bundle);
-      setListAdapter(new BlockedContactAdapter(getActivity(), GlideApp.with(this), null));
-      getLoaderManager().initLoader(0, null, this);
+      setListAdapter(new BlockedContactAdapter(requireActivity(), GlideApp.with(this), null));
+      LoaderManager.getInstance(this).initLoader(0, null, this);
     }
 
     @Override
     public void onStart() {
       super.onStart();
-      getLoaderManager().restartLoader(0, null, this);
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
     }
 
     @Override
@@ -114,10 +106,10 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
       Recipient recipient = ((BlockedContactListItem)view).getRecipient();
-      Intent    intent    = new Intent(getActivity(), RecipientPreferenceActivity.class);
-      intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
-
-      startActivity(intent);
+      BlockUnblockDialog.showUnblockFor(requireContext(), getLifecycle(), recipient, () -> {
+        RecipientUtil.unblock(requireContext(), recipient);
+        LoaderManager.getInstance(this).restartLoader(0, null, this);
+      });
     }
 
     private static class BlockedContactAdapter extends CursorAdapter {
@@ -143,7 +135,5 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
         ((BlockedContactListItem) view).set(glideRequests, recipient);
       }
     }
-
   }
-
 }

app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java

@@ -3,24 +3,47 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
+import android.view.ContextThemeWrapper;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
 public class ClearProfileAvatarActivity extends Activity {
 
+  private static final String ARG_TITLE = "arg_title";
+
+  public static Intent createForUserProfilePhoto() {
+    return new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+  }
+
+  public static Intent createForGroupProfilePhoto() {
+    Intent intent = new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo);
+    return intent;
+  }
+
   @Override
   public void onResume() {
     super.onResume();
 
-    new AlertDialog.Builder(this)
-        .setTitle(R.string.ClearProfileActivity_remove_profile_photo)
-        .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
-        .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
-          Intent result = new Intent();
-          result.putExtra("delete", true);
-          setResult(Activity.RESULT_OK, result);
-          finish();
-        })
-        .show();
+    int titleId = getIntent().getIntExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+
+    new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
+                   .setMessage(titleId)
+                   .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
+                   .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
+                     Intent result = new Intent();
+                     result.putExtra("delete", true);
+                     setResult(Activity.RESULT_OK, result);
+                     finish();
+                   })
+                   .setOnCancelListener(dialog -> finish())
+                   .show();
   }
 
 }

app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.database.Cursor;
 import android.os.AsyncTask;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -15,7 +14,6 @@ import androidx.appcompat.app.AlertDialog;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.PushDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
@@ -51,7 +49,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
     super(context);
 
       Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.toShortString(context);
+      String          name            = recipient.getDisplayName(context);
       String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
       SpannableString spannableString = new SpannableString(introduction + " " +
                                                             context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
@@ -105,7 +103,6 @@ public class ConfirmIdentityDialog extends AlertDialog {
           }
 
           processMessageRecord(messageRecord);
-          processPendingMessageRecords(messageRecord.getThreadId(), mismatch);
 
           return null;
         }
@@ -115,26 +112,6 @@ public class ConfirmIdentityDialog extends AlertDialog {
           else                            processIncomingMessageRecord(messageRecord);
         }
 
-        private void processPendingMessageRecords(long threadId, IdentityKeyMismatch mismatch) {
-          MmsSmsDatabase        mmsSmsDatabase = DatabaseFactory.getMmsSmsDatabase(getContext());
-          Cursor                cursor         = mmsSmsDatabase.getIdentityConflictMessagesForThread(threadId);
-          MmsSmsDatabase.Reader reader         = mmsSmsDatabase.readerFor(cursor);
-          MessageRecord         record;
-
-          try {
-            while ((record = reader.getNext()) != null) {
-              for (IdentityKeyMismatch recordMismatch : record.getIdentityKeyMismatches()) {
-                if (mismatch.equals(recordMismatch)) {
-                  processMessageRecord(record);
-                }
-              }
-            }
-          } finally {
-            if (reader != null)
-              reader.close();
-          }
-        }
-
         private void processOutgoingMessageRecord(MessageRecord messageRecord) {
           SmsDatabase        smsDatabase        = DatabaseFactory.getSmsDatabase(getContext());
           MmsDatabase        mmsDatabase        = DatabaseFactory.getMmsDatabase(getContext());
@@ -175,7 +152,9 @@ public class ConfirmIdentityDialog extends AlertDialog {
                                                                        messageRecord.getDateSent(),
                                                                        legacy ? Base64.decode(messageRecord.getBody()) : null,
                                                                        !legacy ? Base64.decode(messageRecord.getBody()) : null,
-                                                                       0, null);
+                                                                       0,
+                                                                       0,
+                                                                       null);
 
             long pushId = pushDatabase.insert(envelope);
 

app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -19,20 +19,18 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import org.thoughtcrime.securesms.logging.Log;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
@@ -44,14 +42,16 @@ import java.lang.ref.WeakReference;
  * @author Moxie Marlinspike
  *
  */
-public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+public abstract class ContactSelectionActivity extends PassphraseRequiredActivity
                                                implements SwipeRefreshLayout.OnRefreshListener,
-                                                          ContactSelectionListFragment.OnContactSelectedListener
+                                                          ContactSelectionListFragment.OnContactSelectedListener,
+                                                          ContactSelectionListFragment.ScrollCallback
 {
   private static final String TAG = ContactSelectionActivity.class.getSimpleName();
 
-  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  public static final String EXTRA_LAYOUT_RES_ID = "layout_res_id";
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
 
   protected ContactSelectionListFragment contactsFragment;
 
@@ -60,18 +60,17 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   @Override
   protected void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
       int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
-                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS;
+                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }
 
-    setContentView(R.layout.contact_selection_activity);
+    setContentView(getIntent().getIntExtra(EXTRA_LAYOUT_RES_ID, R.layout.contact_selection_activity));
 
     initializeToolbar();
     initializeResources();
@@ -82,7 +81,6 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
   }
 
   protected ContactFilterToolbar getToolbar() {
@@ -90,10 +88,9 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   }
 
   private void initializeToolbar() {
-    this.toolbar = ViewUtil.findById(this, R.id.toolbar);
+    this.toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
 
-    assert  getSupportActionBar() != null;
     getSupportActionBar().setDisplayHomeAsUpEnabled(false);
     getSupportActionBar().setDisplayShowTitleEnabled(false);
     getSupportActionBar().setIcon(null);
@@ -116,11 +113,24 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   }
 
   @Override
-  public void onContactSelected(Optional<RecipientId> recipientId, String number) {}
+  public boolean onContactSelected(Optional<RecipientId> recipientId, String number) {
+    return true;
+  }
 
   @Override
   public void onContactDeselected(Optional<RecipientId> recipientId, String number) {}
 
+  @Override
+  public void onBeginScroll() {
+    hideKeyboard();
+  }
+
+  private void hideKeyboard() {
+    ServiceUtil.getInputMethodManager(this)
+               .hideSoftInputFromWindow(toolbar.getWindowToken(), 0);
+    toolbar.clearFocus();
+  }
+
   private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
 
     private final WeakReference<ContactSelectionActivity> activity;

app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -18,47 +18,62 @@ package org.thoughtcrime.securesms;
 
 
 import android.Manifest;
+import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.CycleInterpolator;
 import android.widget.Button;
+import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.transition.AutoTransition;
+import androidx.transition.TransitionManager;
 
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
+import com.google.android.material.chip.ChipGroup;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
+import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.FixedViewsAdapter;
 import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
@@ -66,8 +81,9 @@ import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -76,19 +92,26 @@ import java.util.Set;
  * @author Moxie Marlinspike
  *
  */
-public final class ContactSelectionListFragment extends    Fragment
+public final class ContactSelectionListFragment extends LoggingFragment
                                                 implements LoaderManager.LoaderCallbacks<Cursor>
 {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
 
-  public static final String DISPLAY_MODE = "display_mode";
-  public static final String MULTI_SELECT = "multi_select";
-  public static final String REFRESHABLE  = "refreshable";
-  public static final String RECENTS      = "recents";
+  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 1;
+  private static final int CHIP_GROUP_REVEAL_DURATION_MS = 150;
 
+  public static final int NO_LIMIT = Integer.MAX_VALUE;
+
+  public static final String DISPLAY_MODE      = "display_mode";
+  public static final String MULTI_SELECT      = "multi_select";
+  public static final String REFRESHABLE       = "refreshable";
+  public static final String RECENTS           = "recents";
+  public static final String TOTAL_CAPACITY    = "total_capacity";
+  public static final String CURRENT_SELECTION = "current_selection";
+
+  private ConstraintLayout            constraintLayout;
   private TextView                    emptyText;
-  private Set<SelectedContact>        selectedContacts;
   private OnContactSelectedListener   onContactSelectedListener;
   private SwipeRefreshLayout          swipeRefresh;
   private View                        showContactsLayout;
@@ -99,16 +122,28 @@ public final class ContactSelectionListFragment extends    Fragment
   private RecyclerView                recyclerView;
   private RecyclerViewFastScroller    fastScroller;
   private ContactSelectionListAdapter cursorRecyclerViewAdapter;
+  private ChipGroup                   chipGroup;
+  private HorizontalScrollView        chipGroupScrollContainer;
+  private TextView                    groupLimit;
 
+  @Nullable private FixedViewsAdapter headerAdapter;
   @Nullable private FixedViewsAdapter footerAdapter;
-  @Nullable private InviteCallback    inviteCallback;
+  @Nullable private ListCallback      listCallback;
+  @Nullable private ScrollCallback    scrollCallback;
+            private GlideRequests     glideRequests;
+            private int               selectionLimit;
+            private Set<RecipientId>  currentSelection;
 
   @Override
   public void onAttach(@NonNull Context context) {
     super.onAttach(context);
 
-    if (context instanceof InviteCallback) {
-      inviteCallback = (InviteCallback) context;
+    if (context instanceof ListCallback) {
+      listCallback = (ListCallback) context;
+    }
+
+    if (context instanceof ScrollCallback) {
+      scrollCallback = (ScrollCallback) context;
     }
   }
 
@@ -130,14 +165,16 @@ public final class ContactSelectionListFragment extends    Fragment
                  if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
                    handleContactPermissionGranted();
                  } else {
-                   this.getLoaderManager().initLoader(0, null, this);
+                   LoaderManager.getInstance(this).initLoader(0, null, this);
                  }
                })
                .onAnyDenied(() -> {
-                 getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+                 FragmentActivity activity = requireActivity();
 
-                 if (getActivity().getIntent().getBooleanExtra(RECENTS, false)) {
-                   getLoaderManager().initLoader(0, null, ContactSelectionListFragment.this);
+                 activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
+                 if (activity.getIntent().getBooleanExtra(RECENTS, false)) {
+                   LoaderManager.getInstance(this).initLoader(0, null, ContactSelectionListFragment.this);
                  } else {
                    initializeNoContactsPermission();
                  }
@@ -149,64 +186,129 @@ public final class ContactSelectionListFragment extends    Fragment
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
 
-    emptyText               = ViewUtil.findById(view, android.R.id.empty);
-    recyclerView            = ViewUtil.findById(view, R.id.recycler_view);
-    swipeRefresh            = ViewUtil.findById(view, R.id.swipe_refresh);
-    fastScroller            = ViewUtil.findById(view, R.id.fast_scroller);
-    showContactsLayout      = view.findViewById(R.id.show_contacts_container);
-    showContactsButton      = view.findViewById(R.id.show_contacts_button);
-    showContactsDescription = view.findViewById(R.id.show_contacts_description);
-    showContactsProgress    = view.findViewById(R.id.progress);
-    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+    emptyText                = view.findViewById(android.R.id.empty);
+    recyclerView             = view.findViewById(R.id.recycler_view);
+    swipeRefresh             = view.findViewById(R.id.swipe_refresh);
+    fastScroller             = view.findViewById(R.id.fast_scroller);
+    showContactsLayout       = view.findViewById(R.id.show_contacts_container);
+    showContactsButton       = view.findViewById(R.id.show_contacts_button);
+    showContactsDescription  = view.findViewById(R.id.show_contacts_description);
+    showContactsProgress     = view.findViewById(R.id.progress);
+    chipGroup                = view.findViewById(R.id.chipGroup);
+    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
+    groupLimit               = view.findViewById(R.id.group_limit);
+    constraintLayout         = view.findViewById(R.id.container);
 
-    swipeRefresh.setEnabled(getActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
+    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+    recyclerView.setItemAnimator(new DefaultItemAnimator() {
+      @Override
+      public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
+        return true;
+      }
+    });
+
+    swipeRefresh.setEnabled(requireActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
+
+    selectionLimit   = requireActivity().getIntent().getIntExtra(TOTAL_CAPACITY, NO_LIMIT);
+    currentSelection = getCurrentSelection();
+
+    updateGroupLimit(getChipCount());
 
     return view;
   }
 
+  private void updateGroupLimit(int chipCount) {
+    if (selectionLimit != NO_LIMIT) {
+      groupLimit.setText(String.format(Locale.getDefault(), "%d/%d", currentSelection.size() + chipCount, selectionLimit));
+      groupLimit.setVisibility(View.VISIBLE);
+    } else {
+      groupLimit.setVisibility(View.GONE);
+    }
+  }
+
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
   public @NonNull List<SelectedContact> getSelectedContacts() {
-    List<SelectedContact> selected = new LinkedList<>();
-    if (selectedContacts != null) {
-      selected.addAll(selectedContacts);
+    if (cursorRecyclerViewAdapter == null) {
+      return Collections.emptyList();
     }
 
-    return selected;
+    return cursorRecyclerViewAdapter.getSelectedContacts();
   }
 
-  private boolean isMulti() {
-    return getActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
+  public int getSelectedContactsCount() {
+    if (cursorRecyclerViewAdapter == null) {
+      return 0;
+    }
+
+    return cursorRecyclerViewAdapter.getSelectedContactsCount();
+  }
+
+  private Set<RecipientId> getCurrentSelection() {
+    List<RecipientId> currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);
+
+    return currentSelection == null ? Collections.emptySet()
+                                    : Collections.unmodifiableSet(Stream.of(currentSelection).collect(Collectors.toSet()));
+  }
+
+  public boolean isMulti() {
+    return requireActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
   }
 
   private void initializeCursor() {
+    glideRequests = GlideApp.with(this);
+
     cursorRecyclerViewAdapter = new ContactSelectionListAdapter(requireContext(),
-                                                                GlideApp.with(this),
+                                                                glideRequests,
                                                                 null,
                                                                 new ListClickListener(),
-                                                                isMulti());
-    selectedContacts = cursorRecyclerViewAdapter.getSelectedContacts();
+                                                                isMulti(),
+                                                                currentSelection);
 
     RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
 
+    if (listCallback != null) {
+      headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
+      headerAdapter.hide();
+      concatenateAdapter.addAdapter(headerAdapter);
+    }
+
     concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
-    if (inviteCallback != null) {
-      footerAdapter = new FixedViewsAdapter(createInviteActionView(inviteCallback));
+
+    if (listCallback != null) {
+      footerAdapter = new FixedViewsAdapter(createInviteActionView(listCallback));
       footerAdapter.hide();
       concatenateAdapter.addAdapter(footerAdapter);
     }
 
     recyclerView.setAdapter(concatenateAdapter);
     recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
+    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+      @Override
+      public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+        if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
+          if (scrollCallback != null) {
+            scrollCallback.onBeginScroll();
+          }
+        }
+      }
+    });
   }
 
-  private View createInviteActionView(@NonNull InviteCallback inviteCallback) {
+  private View createInviteActionView(@NonNull ListCallback listCallback) {
     View view = LayoutInflater.from(requireContext())
                               .inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
-    view.setOnClickListener(v -> inviteCallback.onInvite());
+    view.setOnClickListener(v -> listCallback.onInvite());
+    return view;
+  }
+
+  private View createNewGroupItem(@NonNull ListCallback listCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_new_group_item, (ViewGroup) requireView(), false);
+    view.setOnClickListener(v -> listCallback.onNewGroup(false));
     return view;
   }
 
@@ -242,23 +344,28 @@ public final class ContactSelectionListFragment extends    Fragment
     swipeRefresh.setRefreshing(false);
   }
 
+  public boolean hasQueryFilter() {
+    return !TextUtils.isEmpty(cursorFilter);
+  }
+
   public void setRefreshing(boolean refreshing) {
     swipeRefresh.setRefreshing(refreshing);
   }
 
   public void reset() {
-    selectedContacts.clear();
+    cursorRecyclerViewAdapter.clearSelectedContacts();
 
     if (!isDetached() && !isRemoving() && getActivity() != null && !getActivity().isFinishing()) {
-      getLoaderManager().restartLoader(0, null, this);
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
     }
   }
 
   @Override
   public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new ContactsCursorLoader(getActivity(),
-                                    getActivity().getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
-                                    cursorFilter, getActivity().getIntent().getBooleanExtra(RECENTS, false));
+    FragmentActivity activity = requireActivity();
+    return new ContactsCursorLoader(activity,
+                                    activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
+                                    cursorFilter, activity.getIntent().getBooleanExtra(RECENTS, false));
   }
 
   @Override
@@ -272,6 +379,14 @@ public final class ContactSelectionListFragment extends    Fragment
       footerAdapter.show();
     }
 
+    if (headerAdapter != null) {
+      if (TextUtils.isEmpty(cursorFilter)) {
+        headerAdapter.show();
+      } else {
+        headerAdapter.hide();
+      }
+    }
+
     emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
     boolean useFastScroller = data != null && data.getCount() > 20;
     recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
@@ -336,7 +451,18 @@ public final class ContactSelectionListFragment extends    Fragment
       SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
                                                                  : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());
 
-      if (!isMulti() || !selectedContacts.contains(selectedContact)) {
+      if (isMulti() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
+        Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
+        return;
+      }
+
+      if (!isMulti() || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
+        if (selectionLimitReached()) {
+          Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_the_group_is_full, Toast.LENGTH_SHORT).show();
+          groupLimit.animate().scaleX(1.3f).scaleY(1.3f).setInterpolator(new CycleInterpolator(0.5f)).start();
+          return;
+        }
+
         if (contact.isUsernameType()) {
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
@@ -346,11 +472,16 @@ public final class ContactSelectionListFragment extends    Fragment
             loadingDialog.dismiss();
             if (uuid.isPresent()) {
               Recipient recipient = Recipient.externalUsername(requireContext(), uuid.get(), contact.getNumber());
-              selectedContacts.add(SelectedContact.forUsername(recipient.getId(), contact.getNumber()));
-              contact.setChecked(true);
+              SelectedContact selected = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
 
               if (onContactSelectedListener != null) {
-                onContactSelectedListener.onContactSelected(Optional.of(recipient.getId()), null);
+                if (onContactSelectedListener.onContactSelected(Optional.of(recipient.getId()), null)) {
+                  markContactSelected(selected);
+                  cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+                }
+              } else {
+                markContactSelected(selected);
+                cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
               }
             } else {
               new AlertDialog.Builder(requireContext())
@@ -361,22 +492,129 @@ public final class ContactSelectionListFragment extends    Fragment
             }
           });
         } else {
-          selectedContacts.add(selectedContact);
-          contact.setChecked(true);
-
           if (onContactSelectedListener != null) {
-            onContactSelectedListener.onContactSelected(contact.getRecipientId(), contact.getNumber());
+            if (onContactSelectedListener.onContactSelected(contact.getRecipientId(), contact.getNumber())) {
+              markContactSelected(selectedContact);
+              cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+            }
+          } else {
+            markContactSelected(selectedContact);
+            cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
           }
         }
       } else {
-        selectedContacts.remove(selectedContact);
-        contact.setChecked(false);
+        markContactUnselected(selectedContact);
+        cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
 
         if (onContactSelectedListener != null) {
           onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
         }
+      }}
+  }
+
+  private boolean selectionLimitReached() {
+    return getChipCount() >= selectionLimit;
+  }
+
+  private void markContactSelected(@NonNull SelectedContact selectedContact) {
+    cursorRecyclerViewAdapter.addSelectedContact(selectedContact);
+    if (isMulti()) {
+      addChipForSelectedContact(selectedContact);
+    }
+  }
+
+  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
+    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
+    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+    removeChipForContact(selectedContact);
+  }
+
+  private void removeChipForContact(@NonNull SelectedContact contact) {
+    for (int i = chipGroup.getChildCount() - 1; i >= 0; i--) {
+      View v = chipGroup.getChildAt(i);
+      if (v instanceof ContactChip && contact.matches(((ContactChip) v).getContact())) {
+        chipGroup.removeView(v);
       }
     }
+
+    updateGroupLimit(getChipCount());
+
+    if (getChipCount() == 0) {
+      setChipGroupVisibility(ConstraintSet.GONE);
+    }
+  }
+
+  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
+                   ()       -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   resolved -> addChipForRecipient(resolved, selectedContact));
+  }
+
+  private void addChipForRecipient(@NonNull Recipient recipient, @NonNull SelectedContact selectedContact) {
+    final ContactChip chip = new ContactChip(requireContext());
+
+    if (getChipCount() == 0) {
+      setChipGroupVisibility(ConstraintSet.VISIBLE);
+    }
+
+    chip.setText(recipient.getShortDisplayName(requireContext()));
+    chip.setContact(selectedContact);
+    chip.setCloseIconVisible(true);
+    chip.setOnCloseIconClickListener(view -> {
+      markContactUnselected(selectedContact);
+
+      if (onContactSelectedListener != null) {
+        onContactSelectedListener.onContactDeselected(Optional.of(recipient.getId()), recipient.getE164().orNull());
+      }
+    });
+
+    chipGroup.getLayoutTransition().addTransitionListener(new LayoutTransition.TransitionListener() {
+      @Override
+      public void startTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+      }
+
+      @Override
+      public void endTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+        if (view == chip && transitionType == LayoutTransition.APPEARING) {
+          chipGroup.getLayoutTransition().removeTransitionListener(this);
+          registerChipRecipientObserver(chip, recipient.live());
+          chipGroup.post(ContactSelectionListFragment.this::smoothScrollChipsToEnd);
+        }
+      }
+    });
+
+    chip.setAvatar(glideRequests, recipient, () -> addChip(chip));
+  }
+
+  private void addChip(@NonNull ContactChip chip) {
+    chipGroup.addView(chip);
+    updateGroupLimit(getChipCount());
+  }
+
+  private int getChipCount() {
+    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
+    if (count < 0) throw new AssertionError();
+    return count;
+  }
+
+  private void registerChipRecipientObserver(@NonNull ContactChip chip, @Nullable LiveRecipient recipient) {
+    if (recipient != null) {
+      recipient.observe(getViewLifecycleOwner(), resolved -> {
+        if (chip.isAttachedToWindow()) {
+          chip.setAvatar(glideRequests, resolved, null);
+          chip.setText(resolved.getShortDisplayName(chip.getContext()));
+        }
+      });
+    }
+  }
+
+  private void setChipGroupVisibility(int visibility) {
+    TransitionManager.beginDelayedTransition(constraintLayout, new AutoTransition().setDuration(CHIP_GROUP_REVEAL_DURATION_MS));
+
+    ConstraintSet constraintSet = new ConstraintSet();
+    constraintSet.clone(constraintLayout);
+    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
+    constraintSet.applyTo(constraintLayout);
   }
 
   public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
@@ -387,12 +625,23 @@ public final class ContactSelectionListFragment extends    Fragment
     this.swipeRefresh.setOnRefreshListener(onRefreshListener);
   }
 
+  private void smoothScrollChipsToEnd() {
+    int x = chipGroupScrollContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR ? chipGroup.getWidth() : 0;
+    chipGroupScrollContainer.smoothScrollTo(x, 0);
+  }
+
   public interface OnContactSelectedListener {
-    void onContactSelected(Optional<RecipientId> recipientId, String number);
+    /** @return True if the contact is allowed to be selected, otherwise false. */
+    boolean onContactSelected(Optional<RecipientId> recipientId, String number);
     void onContactDeselected(Optional<RecipientId> recipientId, String number);
   }
 
-  public interface InviteCallback {
+  public interface ListCallback {
     void onInvite();
+    void onNewGroup(boolean forceV1);
+  }
+
+  public interface ScrollCallback {
+    void onBeginScroll();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java

@@ -1,101 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-
-import org.thoughtcrime.securesms.database.loaders.CountryListLoader;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-public class CountrySelectionFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<Map<String, String>>> {
-
-  private EditText countryFilter;
-  private CountrySelectedListener listener;
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-    return inflater.inflate(R.layout.country_selection_fragment, container, false);
-  }
-
-  @Override
-  public void onActivityCreated(Bundle bundle) {
-    super.onActivityCreated(bundle);
-    this.countryFilter = (EditText)getView().findViewById(R.id.country_search);
-    this.countryFilter.addTextChangedListener(new FilterWatcher());
-    getLoaderManager().initLoader(0, null, this).forceLoad();
-  }
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-    this.listener = (CountrySelectedListener)activity;
-  }
-
-  @Override
-  public void onListItemClick(ListView listView, View view, int position, long id) {
-    Map<String, String> item = (Map<String, String>)this.getListAdapter().getItem(position);
-    if (this.listener != null) {
-      this.listener.countrySelected(item.get("country_name"),
-                                    Integer.parseInt(item.get("country_code").substring(1)));
-    }
-  }
-
-  @Override
-  public @NonNull Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
-    return new CountryListLoader(getActivity());
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<ArrayList<Map<String, String>>> loader,
-                             ArrayList<Map<String, String>> results)
-  {
-    String[] from = {"country_name", "country_code"};
-    int[] to      = {R.id.country_name, R.id.country_code};
-    this.setListAdapter(new SimpleAdapter(getActivity(), results, R.layout.country_list_item, from, to));
-
-    if (this.countryFilter != null && this.countryFilter.getText().length() != 0) {
-      ((SimpleAdapter)getListAdapter()).getFilter().filter(this.countryFilter.getText().toString());
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<ArrayList<Map<String, String>>> arg0) {
-    this.setListAdapter(null);
-  }
-
-  public interface CountrySelectedListener {
-    public void countrySelected(String countryName, int countryCode);
-  }
-
-  private class FilterWatcher implements TextWatcher {
-
-    @Override
-    public void afterTextChanged(Editable s) {
-      if (getListAdapter() != null) {
-        ((SimpleAdapter)getListAdapter()).getFilter().filter(s.toString());
-      }
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java

@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
 
-public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivity {
+public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
 
   private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();
   private final ImportStateHandler      importStateHandler = new ImportStateHandler();

app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java

@@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.push.AccountManagerFactory;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -42,7 +41,7 @@ import org.whispersystems.signalservice.internal.push.DeviceLimitExceededExcepti
 
 import java.io.IOException;
 
-public class DeviceActivity extends PassphraseRequiredActionBarActivity
+public class DeviceActivity extends PassphraseRequiredActivity
     implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {
 

app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java

@@ -6,7 +6,7 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.qr.ScanningThread;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-public class DeviceAddFragment extends Fragment {
+public class DeviceAddFragment extends LoggingFragment {
 
   private ViewGroup      container;
   private LinearLayout   overlay;

app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java

@@ -53,7 +53,7 @@ public class DeviceListFragment extends ListFragment
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
   }
 
   @Override
@@ -164,25 +164,29 @@ public class DeviceListFragment extends ListFragment
 
   @SuppressLint("StaticFieldLeak")
   private void handleDisconnectDevice(final long deviceId) {
-    new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
-                                                  R.string.DeviceListActivity_unlinking_device_no_ellipsis,
-                                                  R.string.DeviceListActivity_unlinking_device)
+    new ProgressDialogAsyncTask<Void, Void, Boolean>(getActivity(),
+                                                     R.string.DeviceListActivity_unlinking_device_no_ellipsis,
+                                                     R.string.DeviceListActivity_unlinking_device)
     {
       @Override
-      protected Void doInBackground(Void... params) {
+      protected Boolean doInBackground(Void... params) {
         try {
           accountManager.removeDevice(deviceId);
+          return true;
         } catch (IOException e) {
           Log.w(TAG, e);
-          Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();
+          return false;
         }
-        return null;
       }
 
       @Override
-      protected void onPostExecute(Void result) {
+      protected void onPostExecute(Boolean result) {
         super.onPostExecute(result);
-        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+        if (result) {
+          getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+        } else {
+          Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();
+        }
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }

app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import android.view.Window;
 
-public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
+public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")
   private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
@@ -17,9 +17,6 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
-    assert  getSupportActionBar() != null;
-    getSupportActionBar().hide();
-
     AlertDialog dialog = new AlertDialog.Builder(this)
         .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
         .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner))
@@ -29,7 +26,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
           startActivity(intent);
           finish();
         })
-        .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, (dialog12, which) -> {
+        .setNegativeButton(android.R.string.cancel, (dialog12, which) -> {
           dialog12.dismiss();
           finish();
         })

app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java

@@ -1,322 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.core.app.NotificationCompat;
-import androidx.viewpager.widget.ViewPager;
-
-import com.melnykov.fab.FloatingActionButton;
-
-import org.thoughtcrime.securesms.IntroPagerAdapter.IntroPage;
-import org.thoughtcrime.securesms.experienceupgrades.StickersIntroFragment;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.thoughtcrime.securesms.notifications.NotificationIds;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.util.Collections;
-import java.util.List;
-
-public class ExperienceUpgradeActivity extends BaseActionBarActivity
-                                       implements TypingIndicatorIntroFragment.Controller,
-                                                  LinkPreviewsIntroFragment.Controller,
-                                                  StickersIntroFragment.Controller
-{
-  private static final String TAG             = ExperienceUpgradeActivity.class.getSimpleName();
-  private static final String DISMISS_ACTION  = "org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";
-
-  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
-
-  private enum ExperienceUpgrade {
-    SIGNAL_REBRANDING(157,
-                      new IntroPage(0xFF2090EA,
-                                    BasicIntroFragment.newInstance(R.drawable.splash_logo,
-                                                                   R.string.ExperienceUpgradeActivity_welcome_to_signal_dgaf,
-                                                                   R.string.ExperienceUpgradeActivity_textsecure_is_now_called_signal)),
-                      R.string.ExperienceUpgradeActivity_welcome_to_signal_excited,
-                      R.string.ExperienceUpgradeActivity_textsecure_is_now_signal,
-                      R.string.ExperienceUpgradeActivity_textsecure_is_now_signal_long,
-                      null,
-                      false),
-    VIDEO_CALLS(245,
-                      new IntroPage(0xFF2090EA,
-                                    BasicIntroFragment.newInstance(R.drawable.video_splash,
-                                                                   R.string.ExperienceUpgradeActivity_say_hello_to_video_calls,
-                                                                   R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calls)),
-                      R.string.ExperienceUpgradeActivity_say_hello_to_video_calls,
-                      R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calling,
-                      R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long,
-                null,
-                false),
-    PROFILES(286,
-                 new IntroPage(0xFF2090EA,
-                               BasicIntroFragment.newInstance(R.drawable.profile_splash,
-                                                              R.string.ExperienceUpgradeActivity_ready_for_your_closeup,
-                                                              R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal)),
-             R.string.ExperienceUpgradeActivity_signal_profiles_are_here,
-             R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
-             R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
-             EditProfileActivity.class,
-             false),
-    READ_RECEIPTS(299,
-                  new IntroPage(0xFF2090EA,
-                                ReadReceiptsIntroFragment.newInstance()),
-                  R.string.experience_upgrade_preference_fragment__read_receipts_are_here,
-                  R.string.experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read,
-                  R.string.experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read,
-                  null,
-                  false),
-    TYPING_INDICATORS(432,
-                      new IntroPage(0xFF2090EA,
-                                    TypingIndicatorIntroFragment.newInstance()),
-                      R.string.ExperienceUpgradeActivity_introducing_typing_indicators,
-                      R.string.ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed,
-                      R.string.ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed,
-                      null,
-                      true),
-    LINK_PREVIEWS(449,
-                  new IntroPage(0xFF2090EA, LinkPreviewsIntroFragment.newInstance()),
-                  R.string.ExperienceUpgradeActivity_introducing_link_previews,
-                  R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
-                  R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
-                  null,
-                  true),
-    STICKERS(580,
-             new IntroPage(0xFF2090EA, StickersIntroFragment.newInstance()),
-             R.string.ExperienceUpgradeActivity_introducing_stickers,
-             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
-             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
-             null,
-             true);
-
-    private            int             version;
-    private            List<IntroPage> pages;
-    private @StringRes int             notificationTitle;
-    private @StringRes int             notificationText;
-    private @StringRes int             notificationBigText;
-    private @Nullable  Class           nextIntent;
-    private            boolean         handlesNavigation;
-
-    ExperienceUpgrade(int version,
-                      @NonNull List<IntroPage> pages,
-                      @StringRes int notificationTitle,
-                      @StringRes int notificationText,
-                      @StringRes int notificationBigText,
-                      @Nullable  Class nextIntent,
-                      boolean handlesNavigation)
-    {
-      this.version             = version;
-      this.pages               = pages;
-      this.notificationTitle   = notificationTitle;
-      this.notificationText    = notificationText;
-      this.notificationBigText = notificationBigText;
-      this.nextIntent          = nextIntent;
-      this.handlesNavigation = handlesNavigation;
-    }
-
-    ExperienceUpgrade(int version,
-                      @NonNull IntroPage page,
-                      @StringRes int notificationTitle,
-                      @StringRes int notificationText,
-                      @StringRes int notificationBigText,
-                      @Nullable Class nextIntent,
-                      boolean handlesNavigation)
-    {
-      this(version, Collections.singletonList(page), notificationTitle, notificationText, notificationBigText, nextIntent, handlesNavigation);
-    }
-
-    public int getVersion() {
-      return version;
-    }
-
-    public List<IntroPage> getPages() {
-      return pages;
-    }
-
-    public IntroPage getPage(int i) {
-      return pages.get(i);
-    }
-
-    public int getNotificationTitle() {
-      return notificationTitle;
-    }
-
-    public int getNotificationText() {
-      return notificationText;
-    }
-
-    public int getNotificationBigText() {
-      return notificationBigText;
-    }
-
-    public boolean handlesNavigation() {
-      return handlesNavigation;
-    }
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    dynamicTheme.onCreate(this);
-
-    final Optional<ExperienceUpgrade> upgrade = getExperienceUpgrade(this);
-    if (!upgrade.isPresent()) {
-      onContinue(upgrade);
-      return;
-    }
-
-    setContentView(R.layout.experience_upgrade_activity);
-    final ViewPager            pager = ViewUtil.findById(this, R.id.pager);
-    final FloatingActionButton fab   = ViewUtil.findById(this, R.id.fab);
-
-    pager.setAdapter(new IntroPagerAdapter(getSupportFragmentManager(), upgrade.get().getPages()));
-
-    if (upgrade.get().handlesNavigation()) {
-      fab.setVisibility(View.GONE);
-    } else {
-      fab.setVisibility(View.VISIBLE);
-      fab.setOnClickListener(v -> onContinue(upgrade));
-    }
-
-    getWindow().setBackgroundDrawable(new ColorDrawable(upgrade.get().getPage(0).backgroundColor));
-    ServiceUtil.getNotificationManager(this).cancel(NotificationIds.EXPERIENCE_UPGRADE);
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-  }
-
-  private void onContinue(Optional<ExperienceUpgrade> seenUpgrade) {
-    ServiceUtil.getNotificationManager(this).cancel(NotificationIds.EXPERIENCE_UPGRADE);
-    int latestVersion = seenUpgrade.isPresent() ? seenUpgrade.get().getVersion()
-                                                : Util.getCanonicalVersionCode();
-    TextSecurePreferences.setLastExperienceVersionCode(this, latestVersion);
-    if (seenUpgrade.isPresent() && seenUpgrade.get().nextIntent != null) {
-      Intent intent     = new Intent(this, seenUpgrade.get().nextIntent);
-      // TODO [greyson] Navigation
-      Intent nextIntent = new Intent(this, MainActivity.class);
-      intent.putExtra("next_intent", nextIntent);
-      startActivity(intent);
-    } else {
-      startActivity(getIntent().getParcelableExtra("next_intent"));
-    }
-
-    finish();
-  }
-
-  public static boolean isUpdate(Context context) {
-    return getExperienceUpgrade(context).isPresent();
-  }
-
-  public static Optional<ExperienceUpgrade> getExperienceUpgrade(Context context) {
-    final int currentVersionCode = Util.getCanonicalVersionCode();
-    final int lastSeenVersion    = TextSecurePreferences.getLastExperienceVersionCode(context);
-    Log.i(TAG, "getExperienceUpgrade(" + lastSeenVersion + ")");
-
-    if (lastSeenVersion >= currentVersionCode) {
-      TextSecurePreferences.setLastExperienceVersionCode(context, currentVersionCode);
-      return Optional.absent();
-    }
-
-    Optional<ExperienceUpgrade> eligibleUpgrade = Optional.absent();
-    for (ExperienceUpgrade upgrade : ExperienceUpgrade.values()) {
-      if (lastSeenVersion < upgrade.getVersion()) eligibleUpgrade = Optional.of(upgrade);
-    }
-
-    return eligibleUpgrade;
-  }
-
-  @Override
-  public void onTypingIndicatorsFinished() {
-    onContinue(Optional.of(ExperienceUpgrade.TYPING_INDICATORS));
-  }
-
-  @Override
-  public void onLinkPreviewsFinished() {
-    onContinue(Optional.of(ExperienceUpgrade.LINK_PREVIEWS));
-  }
-
-  @Override
-  public void onStickersFinished() {
-    onContinue(Optional.of(ExperienceUpgrade.STICKERS));
-  }
-
-  public static class AppUpgradeReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction()) &&
-          intent.getData().getSchemeSpecificPart().equals(context.getPackageName()))
-      {
-        if (TextSecurePreferences.getLastExperienceVersionCode(context) < 339 &&
-            !TextSecurePreferences.isPasswordDisabled(context))
-        {
-          Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
-              .setSmallIcon(R.drawable.icon_notification)
-              .setColor(context.getResources().getColor(R.color.signal_primary))
-              .setContentTitle(context.getString(R.string.ExperienceUpgradeActivity_unlock_to_complete_update))
-              .setContentText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update))
-              .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update)))
-              .setAutoCancel(true)
-              .setContentIntent(PendingIntent.getActivity(context, 0,
-                                                          context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()),
-                                                          PendingIntent.FLAG_UPDATE_CURRENT))
-              .build();
-
-          ServiceUtil.getNotificationManager(context).notify(NotificationIds.EXPERIENCE_UPGRADE, notification);
-        }
-
-        Optional<ExperienceUpgrade> experienceUpgrade = getExperienceUpgrade(context);
-
-        if (!experienceUpgrade.isPresent()) {
-          return;
-        }
-
-        if (experienceUpgrade.get().getVersion() == TextSecurePreferences.getExperienceDismissedVersionCode(context)) {
-          return;
-        }
-
-        Intent targetIntent  = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-        Intent dismissIntent = new Intent(context, AppUpgradeReceiver.class);
-        dismissIntent.setAction(DISMISS_ACTION);
-
-        Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
-                                        .setSmallIcon(R.drawable.icon_notification)
-                                        .setColor(context.getResources().getColor(R.color.signal_primary))
-                                        .setContentTitle(context.getString(experienceUpgrade.get().getNotificationTitle()))
-                                        .setContentText(context.getString(experienceUpgrade.get().getNotificationText()))
-                                        .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(experienceUpgrade.get().getNotificationBigText())))
-                                        .setAutoCancel(true)
-                                        .setContentIntent(PendingIntent.getActivity(context, 0,
-                                                                                    targetIntent,
-                                                                                    PendingIntent.FLAG_UPDATE_CURRENT))
-
-                                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0,
-                                                                                    dismissIntent,
-                                                                                    PendingIntent.FLAG_UPDATE_CURRENT))
-                                        .build();
-        ServiceUtil.getNotificationManager(context).notify(NotificationIds.EXPERIENCE_UPGRADE, notification);
-      } else if (DISMISS_ACTION.equals(intent.getAction())) {
-        TextSecurePreferences.setExperienceDismissedVersionCode(context, Util.getCanonicalVersionCode());
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java

@@ -1,14 +1,17 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 
+import java.util.Arrays;
+
 import cn.carbswang.android.numberpickerview.library.NumberPickerView;
 
 public class ExpirationDialog extends AlertDialog {
@@ -36,7 +39,7 @@ public class ExpirationDialog extends AlertDialog {
     builder.setView(view);
     builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
       int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
-      listener.onClick(context.getResources().getIntArray(R.array.expiration_times)[selected]);
+      listener.onClick(getExpirationTimes(context, currentExpiration)[selected]);
     });
     builder.setNegativeButton(android.R.string.cancel, null);
     builder.show();
@@ -47,7 +50,7 @@ public class ExpirationDialog extends AlertDialog {
     final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
     final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
     final TextView         textView                = view.findViewById(R.id.expiration_details);
-    final int[]            expirationTimes         = context.getResources().getIntArray(R.array.expiration_times);
+    final int[]            expirationTimes         = getExpirationTimes(context, currentExpiration);
     final String[]         expirationDisplayValues = new String[expirationTimes.length];
 
     int selectedIndex = expirationTimes.length - 1;
@@ -80,6 +83,19 @@ public class ExpirationDialog extends AlertDialog {
     return view;
   }
 
+  private static int[] getExpirationTimes(Context context, int currentExpiration) {
+    int[] expirationTimes = context.getResources().getIntArray(R.array.expiration_times);
+    int   location        = Arrays.binarySearch(expirationTimes, currentExpiration);
+    if (location < 0) {
+      int[] temp = Arrays.copyOf(expirationTimes, expirationTimes.length + 1);
+      temp[temp.length - 1] = currentExpiration;
+      Arrays.sort(temp);
+      expirationTimes = temp;
+    }
+
+    return expirationTimes;
+  }
+
   public interface OnClickListener {
     public void onClick(int expirationTime);
   }

app/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -1,601 +0,0 @@
-/*
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import android.text.TextUtils;
-
-import org.thoughtcrime.securesms.avatar.AvatarSelection;
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;
-
-import org.thoughtcrime.securesms.components.PushRecipientsPanel;
-import org.thoughtcrime.securesms.components.PushRecipientsPanel.RecipientsPanelChangedListener;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
-import org.thoughtcrime.securesms.contacts.RecipientsEditor;
-import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.GroupDatabase;
-import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.groups.GroupManager;
-import org.thoughtcrime.securesms.groups.GroupManager.GroupActionResult;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter;
-import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter.OnRecipientDeletedListener;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Activity to create and update groups
- *
- * @author Jake McGinty
- */
-public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
-                                 implements OnRecipientDeletedListener,
-                                            RecipientsPanelChangedListener
-{
-
-  private final static String TAG = GroupCreateActivity.class.getSimpleName();
-
-  public static final String GROUP_ID_EXTRA      = "group_id";
-  public static final String GROUP_THREAD_EXTRA  = "group_thread";
-
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private static final int PICK_CONTACT = 1;
-  public static final  int AVATAR_SIZE  = 210;
-
-  private EditText     groupName;
-  private ListView     lv;
-  private ImageView    avatar;
-  private TextView     creatingText;
-  private Bitmap       avatarBmp;
-
-  @NonNull private Optional<GroupData> groupToUpdate = Optional.absent();
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle state, boolean ready) {
-    setContentView(R.layout.group_create_activity);
-    //noinspection ConstantConditions
-    initializeAppBar();
-    initializeResources();
-    initializeExistingGroup();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-    updateViewState();
-  }
-
-  private boolean isSignalGroup() {
-    return TextSecurePreferences.isPushRegistered(this) && !getAdapter().hasNonPushMembers();
-  }
-
-  private void disableSignalGroupViews(int reasonResId) {
-    View pushDisabled = findViewById(R.id.push_disabled);
-    pushDisabled.setVisibility(View.VISIBLE);
-    ((TextView) findViewById(R.id.push_disabled_reason)).setText(reasonResId);
-    avatar.setEnabled(false);
-    groupName.setEnabled(false);
-  }
-
-  private void enableSignalGroupViews() {
-    findViewById(R.id.push_disabled).setVisibility(View.GONE);
-    avatar.setEnabled(true);
-    groupName.setEnabled(true);
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  private void updateViewState() {
-    if (!TextSecurePreferences.isPushRegistered(this)) {
-      disableSignalGroupViews(R.string.GroupCreateActivity_youre_not_registered_for_signal);
-      getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
-    } else if (getAdapter().hasNonPushMembers()) {
-      disableSignalGroupViews(R.string.GroupCreateActivity_contacts_dont_support_push);
-      getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
-    } else {
-      enableSignalGroupViews();
-      getSupportActionBar().setTitle(groupToUpdate.isPresent()
-                                     ? R.string.GroupCreateActivity_actionbar_edit_title
-                                     : R.string.GroupCreateActivity_actionbar_title);
-    }
-  }
-
-  private static boolean isActiveInDirectory(Recipient recipient) {
-    return recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED;
-  }
-
-  private void addSelectedContacts(@NonNull Recipient... recipients) {
-    new AddMembersTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recipients);
-  }
-
-  private void addSelectedContacts(@NonNull Collection<Recipient> recipients) {
-    addSelectedContacts(recipients.toArray(new Recipient[recipients.size()]));
-  }
-
-  private void initializeAppBar() {
-    Drawable upIcon = ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24);
-    getSupportActionBar().setHomeAsUpIndicator(upIcon);
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-  }
-
-  private void initializeResources() {
-    RecipientsEditor    recipientsEditor = ViewUtil.findById(this, R.id.recipients_text);
-    PushRecipientsPanel recipientsPanel  = ViewUtil.findById(this, R.id.recipients);
-    lv           = ViewUtil.findById(this, R.id.selected_contacts_list);
-    avatar       = ViewUtil.findById(this, R.id.avatar);
-    groupName    = ViewUtil.findById(this, R.id.group_name);
-    creatingText = ViewUtil.findById(this, R.id.creating_group_text);
-    SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(this);
-    adapter.setOnRecipientDeletedListener(this);
-    lv.setAdapter(adapter);
-    recipientsEditor.setHint(R.string.recipients_panel__add_members);
-    recipientsPanel.setPanelChangeListener(this);
-    findViewById(R.id.contacts_button).setOnClickListener(new AddRecipientButtonListener());
-    avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_group_outline_40, R.drawable.ic_group_outline_20).asDrawable(this, ContactColors.UNKNOWN_COLOR.toConversationColor(this)));
-    avatar.setOnClickListener(view -> AvatarSelection.startAvatarSelection(this, false, false));
-  }
-
-  private void initializeExistingGroup() {
-    final String groupId = getIntent().getStringExtra(GROUP_ID_EXTRA);
-
-    if (groupId != null) {
-      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupId);
-    }
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
-    menu.clear();
-
-    inflater.inflate(R.menu.group_create, menu);
-    super.onPrepareOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        finish();
-        return true;
-      case R.id.menu_create_group:
-        if (groupToUpdate.isPresent()) handleGroupUpdate();
-        else                           handleGroupCreate();
-        return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onRecipientDeleted(Recipient recipient) {
-    getAdapter().remove(recipient);
-    updateViewState();
-  }
-
-  @Override
-  public void onRecipientsPanelUpdate(List<Recipient> recipients) {
-    if (recipients != null && !recipients.isEmpty()) addSelectedContacts(recipients);
-  }
-
-  private void handleGroupCreate() {
-    if (getAdapter().getCount() < 1) {
-      Log.i(TAG, getString(R.string.GroupCreateActivity_contacts_no_members));
-      Toast.makeText(getApplicationContext(), R.string.GroupCreateActivity_contacts_no_members, Toast.LENGTH_SHORT).show();
-      return;
-    }
-    if (isSignalGroup()) {
-      new CreateSignalGroupTask(this, avatarBmp, getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    } else {
-      new CreateMmsGroupTask(this, getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-  }
-
-  private void handleGroupUpdate() {
-    new UpdateSignalGroupTask(this, groupToUpdate.get().id, avatarBmp,
-                              getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-  }
-
-  private void handleOpenConversation(long threadId, Recipient recipient) {
-    Intent intent = new Intent(this, ConversationActivity.class);
-    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
-    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
-    intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());
-    startActivity(intent);
-    finish();
-  }
-
-  private SelectedRecipientsAdapter getAdapter() {
-    return (SelectedRecipientsAdapter)lv.getAdapter();
-  }
-
-  private @Nullable String getGroupName() {
-    return groupName.getText() != null ? groupName.getText().toString() : null;
-  }
-
-  @Override
-  public void onActivityResult(int reqCode, int resultCode, final Intent data) {
-    super.onActivityResult(reqCode, resultCode, data);
-    Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
-
-    if (data == null || resultCode != Activity.RESULT_OK)
-      return;
-
-    switch (reqCode) {
-      case PICK_CONTACT:
-        List<RecipientId> selected = data.getParcelableArrayListExtra(PushContactSelectionActivity.KEY_SELECTED_RECIPIENTS);
-
-        for (RecipientId contact : selected) {
-          Recipient recipient = Recipient.resolved(contact);
-          addSelectedContacts(recipient);
-        }
-
-        break;
-
-      case AvatarSelection.REQUEST_CODE_AVATAR:
-        AvatarSelection.circularCropImage(this, data.getData(), outputFile, R.string.CropImageActivity_group_avatar);
-        break;
-      case AvatarSelection.REQUEST_CODE_CROP_IMAGE:
-        final Uri resultUri = AvatarSelection.getResultUri(data);
-        GlideApp.with(this)
-                .asBitmap()
-                .load(resultUri)
-                .skipMemoryCache(true)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .centerCrop()
-                .override(AVATAR_SIZE, AVATAR_SIZE)
-                .into(new SimpleTarget<Bitmap>() {
-                  @Override
-                  public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
-                    setAvatar(resultUri, resource);
-                  }
-                });
-    }
-  }
-
-  private class AddRecipientButtonListener implements View.OnClickListener {
-    @Override
-    public void onClick(View v) {
-      Intent intent = new Intent(GroupCreateActivity.this, PushContactSelectionActivity.class);
-      if (groupToUpdate.isPresent()) {
-        intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_PUSH);
-      } else {
-        intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_PUSH | DisplayMode.FLAG_SMS);
-      }
-      startActivityForResult(intent, PICK_CONTACT);
-    }
-  }
-
-  private static class CreateMmsGroupTask extends AsyncTask<Void,Void,GroupActionResult> {
-    private final GroupCreateActivity activity;
-    private final Set<Recipient>      members;
-
-    public CreateMmsGroupTask(GroupCreateActivity activity, Set<Recipient> members) {
-      this.activity     = activity;
-      this.members      = members;
-    }
-
-    @Override
-    protected GroupActionResult doInBackground(Void... avoid) {
-      List<RecipientId> memberAddresses = new LinkedList<>();
-
-      for (Recipient recipient : members) {
-        memberAddresses.add(recipient.getId());
-      }
-      memberAddresses.add(Recipient.self().getId());
-
-      String      groupId          = DatabaseFactory.getGroupDatabase(activity).getOrCreateGroupForMembers(memberAddresses, true);
-      RecipientId groupRecipientId = DatabaseFactory.getRecipientDatabase(activity).getOrInsertFromGroupId(groupId);
-      Recipient   groupRecipient   = Recipient.resolved(groupRecipientId);
-      long        threadId         = DatabaseFactory.getThreadDatabase(activity).getThreadIdFor(groupRecipient, ThreadDatabase.DistributionTypes.DEFAULT);
-
-      return new GroupActionResult(groupRecipient, threadId);
-    }
-
-    @Override
-    protected void onPostExecute(GroupActionResult result) {
-      activity.handleOpenConversation(result.getThreadId(), result.getGroupRecipient());
-    }
-
-    @Override
-    protected void onProgressUpdate(Void... values) {
-      super.onProgressUpdate(values);
-    }
-  }
-
-  private abstract static class SignalGroupTask extends AsyncTask<Void,Void,Optional<GroupActionResult>> {
-
-    protected GroupCreateActivity activity;
-    protected Bitmap              avatar;
-    protected Set<Recipient>      members;
-    protected String              name;
-
-    public SignalGroupTask(GroupCreateActivity activity,
-                           Bitmap              avatar,
-                           String              name,
-                           Set<Recipient>      members)
-    {
-      this.activity     = activity;
-      this.avatar       = avatar;
-      this.name         = name;
-      this.members      = members;
-    }
-
-    @Override
-    protected void onPreExecute() {
-      activity.findViewById(R.id.group_details_layout).setVisibility(View.GONE);
-      activity.findViewById(R.id.creating_group_layout).setVisibility(View.VISIBLE);
-      activity.findViewById(R.id.menu_create_group).setVisibility(View.GONE);
-        final int titleResId = activity.groupToUpdate.isPresent()
-                             ? R.string.GroupCreateActivity_updating_group
-                             : R.string.GroupCreateActivity_creating_group;
-        activity.creatingText.setText(activity.getString(titleResId, activity.getGroupName()));
-      }
-
-    @Override
-    protected void onPostExecute(Optional<GroupActionResult> groupActionResultOptional) {
-      if (activity.isFinishing()) return;
-      activity.findViewById(R.id.group_details_layout).setVisibility(View.VISIBLE);
-      activity.findViewById(R.id.creating_group_layout).setVisibility(View.GONE);
-      activity.findViewById(R.id.menu_create_group).setVisibility(View.VISIBLE);
-    }
-  }
-
-  private static class CreateSignalGroupTask extends SignalGroupTask {
-    public CreateSignalGroupTask(GroupCreateActivity activity, Bitmap avatar, String name, Set<Recipient> members) {
-      super(activity, avatar, name, members);
-    }
-
-    @Override
-    protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
-      return Optional.of(GroupManager.createGroup(activity, members, avatar, name, false));
-    }
-
-    @Override
-    protected void onPostExecute(Optional<GroupActionResult> result) {
-      if (result.isPresent() && result.get().getThreadId() > -1) {
-        if (!activity.isFinishing()) {
-          activity.handleOpenConversation(result.get().getThreadId(), result.get().getGroupRecipient());
-        }
-      } else {
-        super.onPostExecute(result);
-        Toast.makeText(activity.getApplicationContext(),
-                       R.string.GroupCreateActivity_contacts_invalid_number, Toast.LENGTH_LONG).show();
-      }
-    }
-  }
-
-  private static class UpdateSignalGroupTask extends SignalGroupTask {
-    private String groupId;
-
-    public UpdateSignalGroupTask(GroupCreateActivity activity, String groupId,
-                                 Bitmap avatar, String name, Set<Recipient> members)
-    {
-      super(activity, avatar, name, members);
-      this.groupId = groupId;
-    }
-
-    @Override
-    protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
-      try {
-        return Optional.of(GroupManager.updateGroup(activity, groupId, members, avatar, name));
-      } catch (InvalidNumberException e) {
-        return Optional.absent();
-      }
-    }
-
-    @Override
-    protected void onPostExecute(Optional<GroupActionResult> result) {
-      if (result.isPresent() && result.get().getThreadId() > -1) {
-        if (!activity.isFinishing()) {
-          Intent intent = activity.getIntent();
-          intent.putExtra(GROUP_THREAD_EXTRA, result.get().getThreadId());
-          intent.putExtra(GROUP_ID_EXTRA, result.get().getGroupRecipient().requireGroupId());
-          activity.setResult(RESULT_OK, intent);
-          activity.finish();
-        }
-      } else {
-        super.onPostExecute(result);
-        Toast.makeText(activity.getApplicationContext(),
-                       R.string.GroupCreateActivity_contacts_invalid_number, Toast.LENGTH_LONG).show();
-      }
-    }
-  }
-
-  private static class AddMembersTask extends AsyncTask<Recipient,Void,List<AddMembersTask.Result>> {
-    static class Result {
-      Optional<Recipient> recipient;
-      boolean             isPush;
-      String              reason;
-
-      public Result(@Nullable Recipient recipient, boolean isPush, @Nullable String reason) {
-        this.recipient = Optional.fromNullable(recipient);
-        this.isPush    = isPush;
-        this.reason    = reason;
-      }
-    }
-
-    private GroupCreateActivity activity;
-    private boolean             failIfNotPush;
-
-    public AddMembersTask(@NonNull GroupCreateActivity activity) {
-      this.activity      = activity;
-      this.failIfNotPush = activity.groupToUpdate.isPresent();
-    }
-
-    @Override
-    protected List<Result> doInBackground(Recipient... recipients) {
-      final List<Result> results = new LinkedList<>();
-
-      for (Recipient recipient : recipients) {
-        boolean isPush = isActiveInDirectory(recipient);
-
-        if (failIfNotPush && !isPush) {
-          results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_cannot_add_non_push_to_existing_group,
-                                                                 recipient.toShortString(activity))));
-        } else if (TextUtils.equals(TextSecurePreferences.getLocalNumber(activity), recipient.getE164().or(""))) {
-          results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_youre_already_in_the_group)));
-        } else {
-          results.add(new Result(recipient, isPush, null));
-        }
-      }
-      return results;
-    }
-
-    @Override
-    protected void onPostExecute(List<Result> results) {
-      if (activity.isFinishing()) return;
-
-      for (Result result : results) {
-        if (result.recipient.isPresent()) {
-          activity.getAdapter().add(result.recipient.get(), result.isPush);
-        } else {
-          Toast.makeText(activity, result.reason, Toast.LENGTH_SHORT).show();
-        }
-      }
-      activity.updateViewState();
-    }
-  }
-
-  private static class FillExistingGroupInfoAsyncTask extends ProgressDialogAsyncTask<String,Void,Optional<GroupData>> {
-    private GroupCreateActivity activity;
-
-    public FillExistingGroupInfoAsyncTask(GroupCreateActivity activity) {
-      super(activity,
-            R.string.GroupCreateActivity_loading_group_details,
-            R.string.please_wait);
-      this.activity = activity;
-    }
-
-    @Override
-    protected Optional<GroupData> doInBackground(String... groupIds) {
-      final GroupDatabase         db               = DatabaseFactory.getGroupDatabase(activity);
-      final List<Recipient>       recipients       = db.getGroupMembers(groupIds[0], false);
-      final Optional<GroupRecord> group            = db.getGroup(groupIds[0]);
-      final Set<Recipient>        existingContacts = new HashSet<>(recipients.size());
-      existingContacts.addAll(recipients);
-
-      if (group.isPresent()) {
-        return Optional.of(new GroupData(groupIds[0],
-                                         existingContacts,
-                                         BitmapUtil.fromByteArray(group.get().getAvatar()),
-                                         group.get().getAvatar(),
-                                         group.get().getTitle()));
-      } else {
-        return Optional.absent();
-      }
-    }
-
-    @Override
-    protected void onPostExecute(Optional<GroupData> group) {
-      super.onPostExecute(group);
-
-      if (group.isPresent() && !activity.isFinishing()) {
-        activity.groupToUpdate = group;
-
-        activity.groupName.setText(group.get().name);
-        if (group.get().avatarBmp != null) {
-          activity.setAvatar(group.get().avatarBytes, group.get().avatarBmp);
-        }
-        SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(activity, group.get().recipients);
-        adapter.setOnRecipientDeletedListener(activity);
-        activity.lv.setAdapter(adapter);
-        activity.updateViewState();
-      }
-    }
-  }
-
-  private <T> void setAvatar(T model, Bitmap bitmap) {
-    avatarBmp = bitmap;
-    GlideApp.with(this)
-            .load(model)
-            .circleCrop()
-            .skipMemoryCache(true)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .into(avatar);
-  }
-
-  private static class GroupData {
-    String         id;
-    Set<Recipient> recipients;
-    Bitmap         avatarBmp;
-    byte[]         avatarBytes;
-    String         name;
-
-    public GroupData(String id, Set<Recipient> recipients, Bitmap avatarBmp, byte[] avatarBytes, String name) {
-      this.id          = id;
-      this.recipients  = recipients;
-      this.avatarBmp   = avatarBmp;
-      this.avatarBytes = avatarBytes;
-      this.name        = name;
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java

@@ -1,131 +1,57 @@
 package org.thoughtcrime.securesms;
 
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.AsyncTask;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.groups.LiveGroup;
+import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
+import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientExporter;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 
-import java.util.LinkedList;
 import java.util.List;
 
-public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
+public final class GroupMembersDialog {
 
-  private static final String TAG = GroupMembersDialog.class.getSimpleName();
+  private final FragmentActivity fragmentActivity;
+  private final Recipient        groupRecipient;
 
-  private final Recipient  recipient;
-  private final Context    context;
-
-  public GroupMembersDialog(Context context, Recipient recipient) {
-    this.recipient = recipient;
-    this.context   = context;
-  }
-
-  @Override
-  public void onPreExecute() {}
-
-  @Override
-  protected List<Recipient> doInBackground(Void... params) {
-    return DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireGroupId(), true);
-  }
-
-  @Override
-  public void onPostExecute(List<Recipient> members) {
-    GroupMembers groupMembers = new GroupMembers(members);
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(R.string.ConversationActivity_group_members);
-    builder.setIconAttribute(R.attr.group_members_dialog_icon);
-    builder.setCancelable(true);
-    builder.setItems(groupMembers.getRecipientStrings(), new GroupMembersOnClickListener(context, groupMembers));
-    builder.setPositiveButton(android.R.string.ok, null);
-    builder.show();
+  public GroupMembersDialog(@NonNull FragmentActivity activity,
+                            @NonNull Recipient groupRecipient)
+  {
+    this.fragmentActivity = activity;
+    this.groupRecipient   = groupRecipient;
   }
 
   public void display() {
-    executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    AlertDialog dialog = new AlertDialog.Builder(fragmentActivity)
+                                        .setTitle(R.string.ConversationActivity_group_members)
+                                        .setIconAttribute(R.attr.group_members_dialog_icon)
+                                        .setCancelable(true)
+                                        .setView(R.layout.dialog_group_members)
+                                        .setPositiveButton(android.R.string.ok, null)
+                                        .show();
+
+    GroupMemberListView memberListView = dialog.findViewById(R.id.list_members);
+
+    LiveGroup                                   liveGroup   = new LiveGroup(groupRecipient.requireGroupId());
+    LiveData<List<GroupMemberEntry.FullMember>> fullMembers = liveGroup.getFullMembers();
+
+    //noinspection ConstantConditions
+    fullMembers.observe(fragmentActivity, memberListView::setMembers);
+
+    dialog.setOnDismissListener(d -> fullMembers.removeObservers(fragmentActivity));
+
+    memberListView.setRecipientClickListener(recipient -> {
+      dialog.dismiss();
+      contactClick(recipient);
+    });
   }
 
-  private static class GroupMembersOnClickListener implements DialogInterface.OnClickListener {
-    private final GroupMembers groupMembers;
-    private final Context      context;
-
-    public GroupMembersOnClickListener(Context context, GroupMembers members) {
-      this.context      = context;
-      this.groupMembers = members;
-    }
-
-    @Override
-    public void onClick(DialogInterface dialogInterface, int item) {
-      Recipient recipient = groupMembers.get(item);
-
-      if (recipient.getContactUri() != null) {
-        Intent intent = new Intent(context, RecipientPreferenceActivity.class);
-        intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
-
-        context.startActivity(intent);
-      } else {
-        context.startActivity(RecipientExporter.export(recipient).asAddContactIntent());
-      }
-    }
-  }
-
-  /**
-   * Wraps a List of Recipient (just like @class Recipients),
-   * but with focus on the order of the Recipients.
-   * So that the order of the RecipientStrings[] matches
-   * the internal order.
-   *
-   * @author Christoph Haefner
-   */
-  private class GroupMembers {
-    private final String TAG = GroupMembers.class.getSimpleName();
-
-    private final LinkedList<Recipient> members = new LinkedList<>();
-
-    public GroupMembers(List<Recipient> recipients) {
-      for (Recipient recipient : recipients) {
-        if (recipient.isLocalNumber()) {
-          members.push(recipient);
-        } else {
-          members.add(recipient);
-        }
-      }
-    }
-
-    public String[] getRecipientStrings() {
-      List<String> recipientStrings = new LinkedList<>();
-
-      for (Recipient recipient : members) {
-        if (recipient.isLocalNumber()) {
-          recipientStrings.add(context.getString(R.string.GroupMembersDialog_me));
-        } else {
-          String name = getRecipientName(recipient);
-          recipientStrings.add(name);
-        }
-      }
-
-      return recipientStrings.toArray(new String[members.size()]);
-    }
-
-    private String getRecipientName(Recipient recipient) {
-      if (FeatureFlags.profileDisplay()) return recipient.getDisplayName(context);
-
-      String name = recipient.toShortString(context);
-
-      if (recipient.getName(context) == null && !recipient.getProfileName().isEmpty()) {
-        name += " ~" + recipient.getProfileName().toString();
-      }
-
-      return name;
-    }
-
-    public Recipient get(int index) {
-      return members.get(index);
-    }
+  private void contactClick(@NonNull Recipient recipient) {
+    RecipientBottomSheetDialogFragment.create(recipient.getId(), groupRecipient.requireGroupId())
+                                      .show(fragmentActivity.getSupportFragmentManager(), "BOTTOM");
   }
 }

app/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java

@@ -1,38 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-
-import java.util.List;
-
-public class IntroPagerAdapter extends FragmentStatePagerAdapter {
-
-  public static class IntroPage {
-    final int      backgroundColor;
-    final Fragment fragment;
-
-    public IntroPage(int backgroundColor, Fragment fragment) {
-      this.backgroundColor = backgroundColor;
-      this.fragment        = fragment;
-    }
-  }
-
-  private List<IntroPage> pages;
-
-  public IntroPagerAdapter(FragmentManager fm, List<IntroPage> pages) {
-    super(fm);
-    this.pages = pages;
-  }
-
-  @Override
-  public Fragment getItem(int i) {
-    IntroPage page = pages.get(i);
-    return page.fragment;
-  }
-
-  @Override
-  public int getCount() {
-    return pages.size();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java

@@ -22,8 +22,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
-import com.annimon.stream.Stream;
-
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
@@ -42,9 +40,10 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class InviteActivity extends PassphraseRequiredActionBarActivity implements ContactSelectionListFragment.OnContactSelectedListener {
+public class InviteActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener {
 
   private ContactSelectionListFragment contactsFragment;
   private EditText                     inviteText;
@@ -122,8 +121,9 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   @Override
-  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
+  public boolean onContactSelected(Optional<RecipientId> recipientId, String number) {
     updateSmsButtonText();
+    return true;
   }
 
   @Override
@@ -135,14 +135,15 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
         .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
                            contactsFragment.getSelectedContacts()
-                                           .toArray(new SelectedContact[contactsFragment.getSelectedContacts().size()]));
+                                           .toArray(new SelectedContact[0]));
   }
 
   private void updateSmsButtonText() {
+    List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
     smsSendButton.setText(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_to_friends,
-                                                           contactsFragment.getSelectedContacts().size(),
-                                                           contactsFragment.getSelectedContacts().size()));
-    smsSendButton.setEnabled(!contactsFragment.getSelectedContacts().isEmpty());
+                                                           selectedContacts.size(),
+                                                           selectedContacts.size()));
+    smsSendButton.setEnabled(!selectedContacts.isEmpty());
   }
 
   @Override public void onBackPressed() {
@@ -175,17 +176,17 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   private void setPrimaryColorsToolbarForSms() {
-    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.signal_primary));
+    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.core_ultramarine));
     primaryToolbar.getNavigationIcon().setColorFilter(ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color), PorterDuff.Mode.SRC_IN);
     primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
       WindowUtil.clearLightStatusBar(getWindow());
     }
 
     if (Build.VERSION.SDK_INT >= 27) {
-      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
       WindowUtil.clearLightNavigationBar(getWindow());
     }
   }

app/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java

@@ -1,63 +0,0 @@
-package org.thoughtcrime.securesms;
-
-
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-public class LinkPreviewsIntroFragment extends Fragment {
-
-  private Controller controller;
-
-  public static LinkPreviewsIntroFragment newInstance() {
-    LinkPreviewsIntroFragment fragment = new LinkPreviewsIntroFragment();
-    Bundle                    args     = new Bundle();
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  public LinkPreviewsIntroFragment() {}
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  public void onAttach(Context context) {
-    super.onAttach(context);
-
-    if (!(getActivity() instanceof Controller)) {
-      throw new IllegalStateException("Parent activity must implement the Controller interface.");
-    }
-
-    controller = (Controller) getActivity();
-  }
-
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.experience_upgrade_link_previews_fragment, container, false);
-
-    view.findViewById(R.id.experience_ok_button).setOnClickListener(v -> {
-      ApplicationDependencies.getJobManager().add(new MultiDeviceConfigurationUpdateJob(TextSecurePreferences.isReadReceiptsEnabled(requireContext()),
-                                                                                        TextSecurePreferences.isTypingIndicatorsEnabled(requireContext()),
-                                                                                        TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(requireContext()),
-                                                                                        TextSecurePreferences.isLinkPreviewsEnabled(requireContext())));
-      controller.onLinkPreviewsFinished();
-    });
-
-    return view;
-  }
-
-  public interface Controller {
-    void onLinkPreviewsFinished();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java

@@ -1,78 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.fragment.app.FragmentTransaction;
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import org.thoughtcrime.securesms.logsubmit.SubmitLogFragment;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-/**
- * Activity for submitting logcat logs to a pastebin service.
- */
-public class LogSubmitActivity extends BaseActionBarActivity implements SubmitLogFragment.OnLogSubmittedListener {
-
-  private static final String TAG = LogSubmitActivity.class.getSimpleName();
-  private DynamicTheme dynamicTheme = new DynamicTheme();
-
-  @Override
-  protected void onCreate(Bundle icicle) {
-    dynamicTheme.onCreate(this);
-    super.onCreate(icicle);
-    setContentView(R.layout.log_submit_activity);
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    SubmitLogFragment fragment = SubmitLogFragment.newInstance();
-    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-    transaction.replace(R.id.fragment_container, fragment);
-    transaction.commit();
-  }
-
-  @Override
-  protected void onResume() {
-    dynamicTheme.onResume(this);
-    super.onResume();
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-    case android.R.id.home:
-      finish();
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onSuccess() {
-    Toast.makeText(getApplicationContext(), R.string.log_submit_activity__thanks, Toast.LENGTH_LONG).show();
-    finish();
-  }
-
-  @Override
-  public void onFailure() {
-    Toast.makeText(getApplicationContext(), R.string.log_submit_activity__log_fetch_failed, Toast.LENGTH_LONG).show();
-    finish();
-  }
-
-  @Override
-  public void onCancel() {
-    finish();
-  }
-
-  @Override
-  public void startActivity(Intent intent) {
-    try {
-      super.startActivity(intent);
-    } catch (ActivityNotFoundException e) {
-      Log.w(TAG, e);
-      Toast.makeText(this, R.string.log_submit_activity__no_browser_installed, Toast.LENGTH_LONG).show();
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import org.thoughtcrime.securesms.logging.Log;
+
+/**
+ * Simply logs out lifecycle events.
+ */
+public abstract class LoggingFragment extends Fragment {
+
+  private static final String TAG = Log.tag(LoggingFragment.class);
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    logEvent("onCreate()");
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public void onStart() {
+    logEvent("onStart()");
+    super.onStart();
+  }
+
+  @Override
+  public void onStop() {
+    logEvent("onStop()");
+    super.onStop();
+  }
+
+  @Override
+  public void onDestroy() {
+    logEvent("onDestroy()");
+    super.onDestroy();
+  }
+
+  private void logEvent(@NonNull String event) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/MainActivity.java

@@ -1,13 +1,16 @@
 package org.thoughtcrime.securesms;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class MainActivity extends PassphraseRequiredActionBarActivity {
+public class MainActivity extends PassphraseRequiredActivity {
 
   private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
   private final MainNavigator navigator    = new MainNavigator(this);
@@ -18,6 +21,14 @@ public class MainActivity extends PassphraseRequiredActionBarActivity {
     setContentView(R.layout.main_activity);
 
     navigator.onCreate(savedInstanceState);
+
+    handleGroupLinkInIntent(getIntent());
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    handleGroupLinkInIntent(intent);
   }
 
   @Override
@@ -42,4 +53,11 @@ public class MainActivity extends PassphraseRequiredActionBarActivity {
   public @NonNull MainNavigator getNavigator() {
     return navigator;
   }
+
+  private void handleGroupLinkInIntent(Intent intent) {
+    Uri data = intent.getData();
+    if (data != null) {
+      CommunicationActions.handlePotentialGroupLinkUrl(this, data.toString());
+    }
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/MainFragment.java

@@ -3,9 +3,8 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 
-public class MainFragment extends Fragment {
+public class MainFragment extends LoggingFragment {
 
   @Override
   public void onAttach(@NonNull Context context) {

app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java

@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentManager;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
+import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -55,8 +56,8 @@ public class MainNavigator {
     return false;
   }
 
-  public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, long lastSeen, int startingPosition) {
-    Intent intent = ConversationActivity.buildIntent(activity, recipientId, threadId, distributionType, lastSeen, startingPosition);
+  public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition) {
+    Intent intent = ConversationActivity.buildIntent(activity, recipientId, threadId, distributionType, startingPosition);
 
     activity.startActivity(intent);
     activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
@@ -77,8 +78,7 @@ public class MainNavigator {
   }
 
   public void goToGroupCreation() {
-    Intent intent = new Intent(activity, GroupCreateActivity.class);
-    activity.startActivity(intent);
+    activity.startActivity(CreateGroupActivity.newIntent(activity));
   }
 
   public void goToInvite() {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -20,10 +20,12 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -64,6 +66,7 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.sharing.ShareActivity;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
@@ -72,11 +75,12 @@ import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Activity for displaying media attachments in-app
  */
-public final class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
+public final class MediaPreviewActivity extends PassphraseRequiredActivity
   implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
              MediaRailAdapter.RailItemListener,
              MediaPreviewFragment.Events
@@ -116,6 +120,23 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private boolean               showThread;
   private MediaDatabase.Sorting sorting;
 
+  private @Nullable Cursor cursor = null;
+
+  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
+                                                      @NonNull MediaRecord mediaRecord,
+                                                      boolean leftIsRecent)
+  {
+    DatabaseAttachment attachment = Objects.requireNonNull(mediaRecord.getAttachment());
+    Intent intent = new Intent(context, MediaPreviewActivity.class);
+    intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
+    intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
+    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
+    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
+    intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
+    intent.setDataAndType(attachment.getDataUri(), mediaRecord.getContentType());
+    return intent;
+  }
+
   @SuppressWarnings("ConstantConditions")
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
@@ -166,7 +187,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
     String from;
     if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
-    else if (mediaItem.recipient != null) from = mediaItem.recipient.toShortString(this);
+    else if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
     else                                  from = "";
 
     if (showThread) {
@@ -178,7 +199,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
           if (threadRecipient.isLocalNumber()) {
             from = getString(R.string.note_to_self);
           } else {
-            to = threadRecipient.toShortString(this);
+            to = threadRecipient.getDisplayName(this);
           }
         } else {
           to = getString(R.string.MediaPreviewActivity_you);
@@ -213,6 +234,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     restartItem = cleanupMedia();
   }
 
+  @Override
+  protected void onDestroy() {
+    if (cursor != null) {
+      cursor.close();
+      cursor = null;
+    }
+    super.onDestroy();
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
@@ -329,6 +359,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
     mediaPager.removeAllViews();
     mediaPager.setAdapter(null);
+    viewModel.setCursor(this, null, leftIsRecent);
 
     return restartItem;
   }
@@ -460,19 +491,46 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   @Override
   public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
     if (data != null) {
-      @SuppressWarnings("ConstantConditions")
-      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, data.first, data.second, leftIsRecent);
+      if (data.first == cursor) {
+        return;
+      }
+
+      if (cursor != null) {
+        cursor.close();
+      }
+      cursor = Objects.requireNonNull(data.first);
+
+      int mediaPosition = Objects.requireNonNull(data.second);
+
+      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, cursor, mediaPosition, leftIsRecent);
       mediaPager.setAdapter(adapter);
       adapter.setActive(true);
 
-      viewModel.setCursor(this, data.first, leftIsRecent);
+      viewModel.setCursor(this, cursor, leftIsRecent);
 
-      int item = restartItem >= 0 ? restartItem : data.second;
+      int item = restartItem >= 0 ? restartItem : mediaPosition;
       mediaPager.setCurrentItem(item);
 
       if (item == 0) {
         viewPagerListener.onPageSelected(0);
       }
+
+      cursor.registerContentObserver(new ContentObserver(new Handler(getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange) {
+          onMediaChange();
+        }
+      });
+    } else {
+      mediaNotAvailable();
+    }
+  }
+
+  private void onMediaChange() {
+    MediaItemAdapter adapter = (MediaItemAdapter) mediaPager.getAdapter();
+
+    if (adapter != null) {
+      adapter.checkMedia(mediaPager.getCurrentItem());
     }
   }
 
@@ -487,6 +545,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     return true;
   }
 
+  @Override
+  public void mediaNotAvailable() {
+    Toast.makeText(this, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show();
+    finish();
+  }
+
   private void toggleUiVisibility() {
     int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
     if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
@@ -606,6 +670,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     public boolean hasFragmentFor(int position) {
       return mediaPreviewFragment != null;
     }
+
+    @Override
+    public void checkMedia(int currentItem) {
+
+    }
   }
 
   private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
@@ -697,7 +766,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       cursor.moveToPosition(cursorPosition);
 
       MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(context, cursor);
-      DatabaseAttachment        attachment  = mediaRecord.getAttachment();
+      DatabaseAttachment        attachment  = Objects.requireNonNull(mediaRecord.getAttachment());
       MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
 
       mediaFragments.put(position, fragment);
@@ -719,16 +788,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     public MediaItem getMediaItemFor(int position) {
       cursor.moveToPosition(getCursorPosition(position));
 
-      MediaRecord mediaRecord       = MediaRecord.from(context, cursor);
-      RecipientId recipientId       = mediaRecord.getRecipientId();
-      RecipientId threadRecipientId = mediaRecord.getThreadRecipientId();
-
-      if (mediaRecord.getAttachment().getDataUri() == null) throw new AssertionError();
+      MediaRecord        mediaRecord       = MediaRecord.from(context, cursor);
+      DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
+      RecipientId        recipientId       = mediaRecord.getRecipientId();
+      RecipientId        threadRecipientId = mediaRecord.getThreadRecipientId();
 
       return new MediaItem(Recipient.live(recipientId).get(),
                            Recipient.live(threadRecipientId).get(),
-                           mediaRecord.getAttachment(),
-                           mediaRecord.getAttachment().getDataUri(),
+                           attachment,
+                           Objects.requireNonNull(attachment.getDataUri()),
                            mediaRecord.getContentType(),
                            mediaRecord.getDate(),
                            mediaRecord.isOutgoing());
@@ -752,6 +820,14 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       return mediaFragments.containsKey(position);
     }
 
+    @Override
+    public void checkMedia(int position) {
+      MediaPreviewFragment fragment = mediaFragments.get(position);
+      if (fragment != null) {
+        fragment.checkMediaStillAvailable();
+      }
+    }
+
     private int getCursorPosition(int position) {
       if (leftIsRecent) return position;
       else              return cursor.getCount() - 1 - position;
@@ -790,5 +866,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     void pause(int position);
     @Nullable View getPlaybackControls(int position);
     boolean hasFragmentFor(int position);
+    void checkMedia(int currentItem);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -1,445 +0,0 @@
-/*
- * Copyright (C) 2015 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.drawable.ColorDrawable;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.Loader;
-
-import org.thoughtcrime.securesms.conversation.ConversationItem;
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
-import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase.GroupReceiptInfo;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.recipients.LiveRecipient;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.DynamicDarkActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ExpirationUtil;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.lang.ref.WeakReference;
-import java.sql.Date;
-import java.text.SimpleDateFormat;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * @author Jake McGinty
- */
-public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity implements LoaderCallbacks<Cursor> {
-  private final static String TAG = MessageDetailsActivity.class.getSimpleName();
-
-  public static final String MESSAGE_ID_EXTRA    = "message_id";
-  public static final String THREAD_ID_EXTRA     = "thread_id";
-  public static final String IS_PUSH_GROUP_EXTRA = "is_push_group";
-  public static final String TYPE_EXTRA          = "type";
-  public static final String RECIPIENT_EXTRA     = "recipient_id";
-
-  private GlideRequests    glideRequests;
-  private long             threadId;
-  private boolean          isPushGroup;
-  private ConversationItem conversationItem;
-  private ViewGroup        itemParent;
-  private View             metadataContainer;
-  private View             expiresContainer;
-  private TextView         errorText;
-  private View             resendButton;
-  private TextView         sentDate;
-  private TextView         receivedDate;
-  private TextView         expiresInText;
-  private View             receivedContainer;
-  private TextView         transport;
-  private TextView         toFrom;
-  private ListView         recipientsList;
-  private LayoutInflater   inflater;
-
-  private DynamicTheme     dynamicTheme    = new DynamicDarkActionBarTheme();
-  private DynamicLanguage  dynamicLanguage = new DynamicLanguage();
-
-  private boolean running;
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  public void onCreate(Bundle bundle, boolean ready) {
-    setContentView(R.layout.message_details_activity);
-    running = true;
-
-    initializeResources();
-    initializeActionBar();
-    getSupportLoaderManager().initLoader(0, null, this);
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-
-    assert getSupportActionBar() != null;
-    getSupportActionBar().setTitle(R.string.AndroidManifest__message_details);
-
-    MessageNotifier.setVisibleThread(threadId);
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    MessageNotifier.setVisibleThread(-1L);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    running = false;
-  }
-
-  private void initializeActionBar() {
-    assert getSupportActionBar() != null;
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    LiveRecipient recipient = Recipient.live(getIntent().getParcelableExtra(RECIPIENT_EXTRA));
-    recipient.observe(this, r -> setActionBarColor(r.getColor()));
-
-    setActionBarColor(recipient.get().getColor());
-  }
-
-  private void setActionBarColor(MaterialColor color) {
-    assert getSupportActionBar() != null;
-    getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setStatusBarColor(color.toStatusBarColor(this));
-    }
-  }
-
-  private void initializeResources() {
-    inflater       = LayoutInflater.from(this);
-    View header = inflater.inflate(R.layout.message_details_header, recipientsList, false);
-
-    threadId          = getIntent().getLongExtra(THREAD_ID_EXTRA, -1);
-    isPushGroup       = getIntent().getBooleanExtra(IS_PUSH_GROUP_EXTRA, false);
-    glideRequests     = GlideApp.with(this);
-    itemParent        = header.findViewById(R.id.item_container);
-    recipientsList    = findViewById(R.id.recipients_list);
-    metadataContainer = header.findViewById(R.id.metadata_container);
-    errorText         = header.findViewById(R.id.error_text);
-    resendButton      = header.findViewById(R.id.resend_button);
-    sentDate          = header.findViewById(R.id.sent_time);
-    receivedContainer = header.findViewById(R.id.received_container);
-    receivedDate      = header.findViewById(R.id.received_time);
-    transport         = header.findViewById(R.id.transport);
-    toFrom            = header.findViewById(R.id.tofrom);
-    expiresContainer  = header.findViewById(R.id.expires_container);
-    expiresInText     = header.findViewById(R.id.expires_in);
-    recipientsList.setHeaderDividersEnabled(false);
-    recipientsList.addHeaderView(header, null, false);
-  }
-
-  private void updateTransport(MessageRecord messageRecord) {
-    final String transportText;
-    if (messageRecord.isOutgoing() && messageRecord.isFailed()) {
-      transportText = "-";
-    } else if (messageRecord.isPending()) {
-      transportText = getString(R.string.ConversationFragment_pending);
-    } else if (messageRecord.isPush()) {
-      transportText = getString(R.string.ConversationFragment_push);
-    } else if (messageRecord.isMms()) {
-      transportText = getString(R.string.ConversationFragment_mms);
-    } else {
-      transportText = getString(R.string.ConversationFragment_sms);
-    }
-
-    transport.setText(transportText);
-  }
-
-  private void updateTime(MessageRecord messageRecord) {
-    sentDate.setOnLongClickListener(null);
-    receivedDate.setOnLongClickListener(null);
-
-    if (messageRecord.isPending() || messageRecord.isFailed()) {
-      sentDate.setText("-");
-      receivedContainer.setVisibility(View.GONE);
-    } else {
-      Locale           dateLocale    = dynamicLanguage.getCurrentLocale();
-      SimpleDateFormat dateFormatter = DateUtils.getDetailedDateFormatter(this, dateLocale);
-      sentDate.setText(dateFormatter.format(new Date(messageRecord.getDateSent())));
-      sentDate.setOnLongClickListener(v -> {
-        copyToClipboard(String.valueOf(messageRecord.getDateSent()));
-        return true;
-      });
-
-      if (messageRecord.getDateReceived() != messageRecord.getDateSent() && !messageRecord.isOutgoing()) {
-        receivedDate.setText(dateFormatter.format(new Date(messageRecord.getDateReceived())));
-        receivedDate.setOnLongClickListener(v -> {
-          copyToClipboard(String.valueOf(messageRecord.getDateReceived()));
-          return true;
-        });
-        receivedContainer.setVisibility(View.VISIBLE);
-      } else {
-        receivedContainer.setVisibility(View.GONE);
-      }
-    }
-  }
-
-  private void updateExpirationTime(final MessageRecord messageRecord) {
-    if (messageRecord.getExpiresIn() <= 0 || messageRecord.getExpireStarted() <= 0) {
-      expiresContainer.setVisibility(View.GONE);
-      return;
-    }
-
-    expiresContainer.setVisibility(View.VISIBLE);
-    Util.runOnMain(new Runnable() {
-      @Override
-      public void run() {
-        long elapsed   = System.currentTimeMillis() - messageRecord.getExpireStarted();
-        long remaining = messageRecord.getExpiresIn() - elapsed;
-
-        String duration = ExpirationUtil.getExpirationDisplayValue(MessageDetailsActivity.this, Math.max((int)(remaining / 1000), 1));
-        expiresInText.setText(duration);
-
-        if (running) {
-          Util.runOnMainDelayed(this, 500);
-        }
-      }
-    });
-  }
-
-  private void updateRecipients(MessageRecord messageRecord, Recipient recipient, List<RecipientDeliveryStatus> recipients) {
-    final int toFromRes;
-    if (messageRecord.isMms() && !messageRecord.isPush() && !messageRecord.isOutgoing()) {
-      toFromRes = R.string.message_details_header__with;
-    } else if (messageRecord.isOutgoing()) {
-      toFromRes = R.string.message_details_header__to;
-    } else {
-      toFromRes = R.string.message_details_header__from;
-    }
-    toFrom.setText(toFromRes);
-    conversationItem.bind(messageRecord, Optional.absent(), Optional.absent(), glideRequests, dynamicLanguage.getCurrentLocale(), new HashSet<>(), recipient, null, false);
-    recipientsList.setAdapter(new MessageDetailsRecipientAdapter(this, glideRequests, messageRecord, recipients, isPushGroup));
-  }
-
-  private void inflateMessageViewIfAbsent(MessageRecord messageRecord) {
-    if (conversationItem == null) {
-      if (messageRecord.isGroupAction()) {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_update, itemParent, false);
-      } else if (messageRecord.isOutgoing()) {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_sent, itemParent, false);
-      } else {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_received, itemParent, false);
-      }
-      itemParent.addView(conversationItem);
-    }
-  }
-
-  private @Nullable MessageRecord getMessageRecord(Context context, Cursor cursor, String type) {
-    switch (type) {
-      case MmsSmsDatabase.SMS_TRANSPORT:
-        SmsDatabase        smsDatabase = DatabaseFactory.getSmsDatabase(context);
-        SmsDatabase.Reader reader      = smsDatabase.readerFor(cursor);
-        return reader.getNext();
-      case MmsSmsDatabase.MMS_TRANSPORT:
-        MmsDatabase        mmsDatabase = DatabaseFactory.getMmsDatabase(context);
-        MmsDatabase.Reader mmsReader   = mmsDatabase.readerFor(cursor);
-        return mmsReader.getNext();
-      default:
-        throw new AssertionError("no valid message type specified");
-    }
-  }
-
-  private void copyToClipboard(@NonNull String text) {
-    ((ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("text", text));
-  }
-
-  @Override
-  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new MessageDetailsLoader(this, getIntent().getStringExtra(TYPE_EXTRA),
-                                    getIntent().getLongExtra(MESSAGE_ID_EXTRA, -1));
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-    MessageRecord messageRecord = getMessageRecord(this, cursor, getIntent().getStringExtra(TYPE_EXTRA));
-
-    if (messageRecord == null) {
-      finish();
-    } else {
-      new MessageRecipientAsyncTask(this, messageRecord).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-    recipientsList.setAdapter(null);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
-    }
-
-    return false;
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private class MessageRecipientAsyncTask extends AsyncTask<Void,Void,List<RecipientDeliveryStatus>> {
-
-    private final WeakReference<Context> weakContext;
-    private final MessageRecord          messageRecord;
-
-    MessageRecipientAsyncTask(@NonNull Context context, @NonNull MessageRecord messageRecord) {
-      this.weakContext   = new WeakReference<>(context);
-      this.messageRecord = messageRecord;
-    }
-
-    protected Context getContext() {
-      return weakContext.get();
-    }
-
-    @Override
-    public List<RecipientDeliveryStatus> doInBackground(Void... voids) {
-      Context context = getContext();
-
-      if (context == null) {
-        Log.w(TAG, "associated context is destroyed, finishing early");
-        return null;
-      }
-
-      List<RecipientDeliveryStatus> recipients = new LinkedList<>();
-
-      if (!messageRecord.getRecipient().isGroup()) {
-        recipients.add(new RecipientDeliveryStatus(messageRecord.getRecipient(), getStatusFor(messageRecord.getDeliveryReceiptCount(), messageRecord.getReadReceiptCount(), messageRecord.isPending()), messageRecord.isUnidentified(), -1));
-      } else {
-        List<GroupReceiptInfo> receiptInfoList = DatabaseFactory.getGroupReceiptDatabase(context).getGroupReceiptInfo(messageRecord.getId());
-
-        if (receiptInfoList.isEmpty()) {
-          List<Recipient> group = DatabaseFactory.getGroupDatabase(context).getGroupMembers(messageRecord.getRecipient().requireGroupId(), false);
-
-          for (Recipient recipient : group) {
-            recipients.add(new RecipientDeliveryStatus(recipient, RecipientDeliveryStatus.Status.UNKNOWN, false, -1));
-          }
-        } else {
-          for (GroupReceiptInfo info : receiptInfoList) {
-            recipients.add(new RecipientDeliveryStatus(Recipient.resolved(info.getRecipientId()),
-                                                       getStatusFor(info.getStatus(), messageRecord.isPending(), messageRecord.isFailed()),
-                                                       info.isUnidentified(),
-                                                       info.getTimestamp()));
-          }
-        }
-      }
-
-      return recipients;
-    }
-
-    @Override
-    public void onPostExecute(List<RecipientDeliveryStatus> recipients) {
-      if (getContext() == null) {
-        Log.w(TAG, "AsyncTask finished with a destroyed context, leaving early.");
-        return;
-      }
-
-      inflateMessageViewIfAbsent(messageRecord);
-      updateRecipients(messageRecord, messageRecord.getRecipient(), recipients);
-
-      boolean isGroupNetworkFailure      = messageRecord.isFailed() && !messageRecord.getNetworkFailures().isEmpty();
-      boolean isIndividualNetworkFailure = messageRecord.isFailed() && !isPushGroup && messageRecord.getIdentityKeyMismatches().isEmpty();
-
-      if (isGroupNetworkFailure || isIndividualNetworkFailure) {
-        errorText.setVisibility(View.VISIBLE);
-        resendButton.setVisibility(View.VISIBLE);
-        resendButton.setOnClickListener(this::onResendClicked);
-        metadataContainer.setVisibility(View.GONE);
-      } else if (messageRecord.isFailed()) {
-        errorText.setVisibility(View.VISIBLE);
-        resendButton.setVisibility(View.GONE);
-        resendButton.setOnClickListener(null);
-        metadataContainer.setVisibility(View.GONE);
-      } else {
-        updateTransport(messageRecord);
-        updateTime(messageRecord);
-        updateExpirationTime(messageRecord);
-        errorText.setVisibility(View.GONE);
-        resendButton.setVisibility(View.GONE);
-        resendButton.setOnClickListener(null);
-        metadataContainer.setVisibility(View.VISIBLE);
-      }
-    }
-
-    private RecipientDeliveryStatus.Status getStatusFor(int deliveryReceiptCount, int readReceiptCount, boolean pending) {
-      if      (readReceiptCount > 0)     return RecipientDeliveryStatus.Status.READ;
-      else if (deliveryReceiptCount > 0) return RecipientDeliveryStatus.Status.DELIVERED;
-      else if (!pending)                 return RecipientDeliveryStatus.Status.SENT;
-      else                               return RecipientDeliveryStatus.Status.PENDING;
-    }
-
-    private RecipientDeliveryStatus.Status getStatusFor(int groupStatus, boolean pending, boolean failed) {
-      if      (groupStatus == GroupReceiptDatabase.STATUS_READ)                    return RecipientDeliveryStatus.Status.READ;
-      else if (groupStatus == GroupReceiptDatabase.STATUS_DELIVERED)               return RecipientDeliveryStatus.Status.DELIVERED;
-      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED && failed)   return RecipientDeliveryStatus.Status.UNKNOWN;
-      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED && !pending) return RecipientDeliveryStatus.Status.SENT;
-      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED)             return RecipientDeliveryStatus.Status.PENDING;
-      else if (groupStatus == GroupReceiptDatabase.STATUS_UNKNOWN)                 return RecipientDeliveryStatus.Status.UNKNOWN;
-      throw new AssertionError();
-    }
-
-    private void onResendClicked(View v) {
-      MessageSender.resend(MessageDetailsActivity.this, messageRecord);
-      resendButton.setVisibility(View.GONE);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java

@@ -1,112 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.Conversions;
-import org.thoughtcrime.securesms.util.adapter.StableIdGenerator;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-class MessageDetailsRecipientAdapter extends BaseAdapter implements AbsListView.RecyclerListener {
-
-  private final Context                        context;
-  private final GlideRequests                  glideRequests;
-  private final MessageRecord                  record;
-  private final List<RecipientDeliveryStatus>  members;
-  private final boolean                        isPushGroup;
-  private final StableIdGenerator<RecipientId> idGenerator;
-
-  MessageDetailsRecipientAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests,
-                                 @NonNull MessageRecord record, @NonNull List<RecipientDeliveryStatus> members,
-                                 boolean isPushGroup)
-  {
-    this.context       = context;
-    this.glideRequests = glideRequests;
-    this.record        = record;
-    this.isPushGroup   = isPushGroup;
-    this.members       = members;
-    this.idGenerator   = new StableIdGenerator<>();
-  }
-
-  @Override
-  public int getCount() {
-    return members.size();
-  }
-
-  @Override
-  public Object getItem(int position) {
-    return members.get(position);
-  }
-
-  @Override
-  public long getItemId(int position) {
-    return idGenerator.getId(members.get(position).recipient.getId());
-  }
-
-  @Override
-  public View getView(int position, View convertView, ViewGroup parent) {
-    if (convertView == null) {
-      convertView = LayoutInflater.from(context).inflate(R.layout.message_recipient_list_item, parent, false);
-    }
-
-    RecipientDeliveryStatus member = members.get(position);
-
-    ((MessageRecipientListItem)convertView).set(glideRequests, record, member, isPushGroup);
-    return convertView;
-  }
-
-  @Override
-  public void onMovedToScrapHeap(View view) {
-    ((MessageRecipientListItem)view).unbind();
-  }
-
-
-  static class RecipientDeliveryStatus {
-
-    enum Status {
-      UNKNOWN, PENDING, SENT, DELIVERED, READ
-    }
-
-    private final Recipient recipient;
-    private final Status    deliveryStatus;
-    private final boolean   isUnidentified;
-    private final long      timestamp;
-
-    RecipientDeliveryStatus(Recipient recipient, Status deliveryStatus, boolean isUnidentified, long timestamp) {
-      this.recipient      = recipient;
-      this.deliveryStatus = deliveryStatus;
-      this.isUnidentified = isUnidentified;
-      this.timestamp      = timestamp;
-    }
-
-    Status getDeliveryStatus() {
-      return deliveryStatus;
-    }
-
-    boolean isUnidentified() {
-      return isUnidentified;
-    }
-
-    public long getTimestamp() {
-      return timestamp;
-    }
-
-    public Recipient getRecipient() {
-      return recipient;
-    }
-
-  }
-
-}

app/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java

@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
-import org.thoughtcrime.securesms.components.AvatarImageView;
-import org.thoughtcrime.securesms.components.DeliveryStatusView;
-import org.thoughtcrime.securesms.components.FromTextView;
-import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
-import org.thoughtcrime.securesms.database.documents.NetworkFailure;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-/**
- * A simple view to show the recipients of a message
- *
- * @author Jake McGinty
- */
-public class MessageRecipientListItem extends RelativeLayout
-    implements RecipientForeverObserver
-{
-  @SuppressWarnings("unused")
-  private final static String TAG = MessageRecipientListItem.class.getSimpleName();
-
-  private RecipientDeliveryStatus member;
-  private GlideRequests           glideRequests;
-  private FromTextView            fromView;
-  private TextView                errorDescription;
-  private TextView                actionDescription;
-  private Button                  conflictButton;
-  private AvatarImageView         contactPhotoImage;
-  private ImageView               unidentifiedDeliveryIcon;
-  private DeliveryStatusView      deliveryStatusView;
-
-  public MessageRecipientListItem(Context context) {
-    super(context);
-  }
-
-  public MessageRecipientListItem(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  @Override
-  protected void onFinishInflate() {
-    super.onFinishInflate();
-    this.fromView                 = findViewById(R.id.from);
-    this.errorDescription         = findViewById(R.id.error_description);
-    this.actionDescription        = findViewById(R.id.action_description);
-    this.contactPhotoImage        = findViewById(R.id.contact_photo_image);
-    this.conflictButton           = findViewById(R.id.conflict_button);
-    this.unidentifiedDeliveryIcon = findViewById(R.id.ud_indicator);
-    this.deliveryStatusView       = findViewById(R.id.delivery_status);
-  }
-
-  public void set(final GlideRequests glideRequests,
-                  final MessageRecord record,
-                  final RecipientDeliveryStatus member,
-                  final boolean isPushGroup)
-  {
-    if (this.member != null) this.member.getRecipient().live().removeForeverObserver(this);
-
-    this.glideRequests = glideRequests;
-    this.member        = member;
-
-    member.getRecipient().live().observeForever(this);
-    fromView.setText(member.getRecipient());
-    contactPhotoImage.setAvatar(glideRequests, member.getRecipient(), false);
-    setIssueIndicators(record, isPushGroup);
-    unidentifiedDeliveryIcon.setVisibility(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()) && member.isUnidentified() ? VISIBLE : GONE);
-  }
-
-  private void setIssueIndicators(final MessageRecord record,
-                                  final boolean isPushGroup)
-  {
-    final NetworkFailure      networkFailure = getNetworkFailure(record);
-    final IdentityKeyMismatch keyMismatch    = networkFailure == null ? getKeyMismatch(record) : null;
-
-    String errorText = "";
-
-    if (keyMismatch != null) {
-      conflictButton.setVisibility(View.VISIBLE);
-
-      errorText = getContext().getString(R.string.MessageDetailsRecipient_new_safety_number);
-      conflictButton.setOnClickListener(v -> new ConfirmIdentityDialog(getContext(), record, keyMismatch).show());
-    } else if ((networkFailure != null && !record.isPending()) || (!isPushGroup && record.isFailed())) {
-      conflictButton.setVisibility(View.GONE);
-      errorText = getContext().getString(R.string.MessageDetailsRecipient_failed_to_send);
-    } else {
-      if (record.isOutgoing()) {
-        if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.PENDING || member.getDeliveryStatus() == RecipientDeliveryStatus.Status.UNKNOWN) {
-          deliveryStatusView.setVisibility(View.GONE);
-        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.READ) {
-          deliveryStatusView.setRead();
-          deliveryStatusView.setVisibility(View.VISIBLE);
-        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.DELIVERED) {
-          deliveryStatusView.setDelivered();
-          deliveryStatusView.setVisibility(View.VISIBLE);
-        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.SENT) {
-          deliveryStatusView.setSent();
-          deliveryStatusView.setVisibility(View.VISIBLE);
-        }
-      } else {
-        deliveryStatusView.setVisibility(View.GONE);
-      }
-
-      conflictButton.setVisibility(View.GONE);
-    }
-
-    errorDescription.setText(errorText);
-    errorDescription.setVisibility(TextUtils.isEmpty(errorText) ? View.GONE : View.VISIBLE);
-  }
-
-  private NetworkFailure getNetworkFailure(final MessageRecord record) {
-    if (record.hasNetworkFailures()) {
-      for (final NetworkFailure failure : record.getNetworkFailures()) {
-        if (failure.getRecipientId(getContext()).equals(member.getRecipient().getId())) {
-          return failure;
-        }
-      }
-    }
-    return null;
-  }
-
-  private IdentityKeyMismatch getKeyMismatch(final MessageRecord record) {
-    if (record.isIdentityMismatchFailure()) {
-      for (final IdentityKeyMismatch mismatch : record.getIdentityKeyMismatches()) {
-        if (mismatch.getRecipientId(getContext()).equals(member.getRecipient().getId())) {
-          return mismatch;
-        }
-      }
-    }
-    return null;
-  }
-
-  public void unbind() {
-    if (this.member != null && this.member.getRecipient() != null) this.member.getRecipient().live().removeForeverObserver(this);
-  }
-
-  @Override
-  public void onRecipientChanged(@NonNull Recipient recipient) {
-    if (this.member != null && this.member.getRecipient().equals(recipient)) {
-      Log.d(TAG, "onRecipientChanged -- valid");
-      fromView.setText(recipient);
-      contactPhotoImage.setAvatar(glideRequests, recipient, false);
-    } else {
-      Log.d(TAG, "onRecipientChanged -- invalid");
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java

@@ -1,8 +1,10 @@
 package org.thoughtcrime.securesms;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import java.util.concurrent.TimeUnit;
@@ -23,6 +25,10 @@ public class MuteDialog extends AlertDialog {
   }
 
   public static void show(final Context context, final @NonNull MuteSelectionListener listener) {
+    show(context, listener, null);
+  }
+
+  public static void show(final Context context, final @NonNull MuteSelectionListener listener, @Nullable Runnable cancelListener) {
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setTitle(R.string.MuteDialog_mute_notifications);
     builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
@@ -43,6 +49,13 @@ public class MuteDialog extends AlertDialog {
       }
     });
 
+    if (cancelListener != null) {
+      builder.setOnCancelListener(dialog -> {
+        cancelListener.run();
+        dialog.dismiss();
+      });
+    }
+
     builder.show();
 
   }

app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -19,32 +19,25 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.UsernameUtil;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
-import java.util.UUID;
 
 /**
  * Activity container for starting a new conversation.
@@ -53,7 +46,7 @@ import java.util.UUID;
  *
  */
 public class NewConversationActivity extends ContactSelectionActivity
-                                    implements ContactSelectionListFragment.InviteCallback
+                                    implements ContactSelectionListFragment.ListCallback
 {
 
   @SuppressWarnings("unused")
@@ -67,15 +60,40 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
-    Recipient recipient;
+  public boolean onContactSelected(Optional<RecipientId> recipientId, String number) {
     if (recipientId.isPresent()) {
-      recipient = Recipient.resolved(recipientId.get());
+      launch(Recipient.resolved(recipientId.get()));
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
-      recipient = Recipient.external(this, number);
+      if (FeatureFlags.cds() && NetworkConstraint.isMet(this)) {
+        Log.i(TAG, "[onContactSelected] CDS enabled. Doing contact refresh.");
+
+        AlertDialog progress = SimpleProgressDialog.show(this);
+
+        SimpleTask.run(getLifecycle(), () -> {
+          Recipient resolved = Recipient.external(this, number);
+
+          if (!resolved.isRegistered()) {
+            Log.i(TAG, "[onContactSelected] Not registered. Doing a directory refresh.");
+            try {
+              DirectoryHelper.refreshDirectoryFor(this, resolved, false);
+              resolved = Recipient.resolved(resolved.getId());
+            } catch (IOException e) {
+              Log.w(TAG, "[onContactSelected] Failed to refresh directory for new contact.");
+            }
+          }
+
+          return resolved;
+        }, resolved -> {
+          progress.dismiss();
+          launch(resolved);
+        });
+      } else {
+        launch(Recipient.external(this, number));
+      }
     }
-    launch(recipient);
+
+    return true;
   }
 
   private void launch(Recipient recipient) {
@@ -112,7 +130,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void handleCreateGroup() {
-    startActivity(new Intent(this, GroupCreateActivity.class));
+    startActivity(CreateGroupActivity.newIntent(this));
   }
 
   private void handleInvite() {
@@ -120,10 +138,10 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  protected boolean onPrepareOptionsPanel(View view, Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
+  public boolean onPrepareOptionsMenu(Menu menu) {
     menu.clear();
-    inflater.inflate(R.menu.new_conversation_activity, menu);
+    getMenuInflater().inflate(R.menu.new_conversation_activity, menu);
+
     super.onPrepareOptionsMenu(menu);
     return true;
   }
@@ -131,5 +149,12 @@ public class NewConversationActivity extends ContactSelectionActivity
   @Override
   public void onInvite() {
     handleInvite();
+    finish();
+  }
+
+  @Override
+  public void onNewGroup(boolean forceV1) {
+    handleCreateGroup();
+    finish();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
  *
  * @author Moxie Marlinspike
  */
-public abstract class PassphraseActivity extends BaseActionBarActivity {
+public abstract class PassphraseActivity extends BaseActivity {
 
   private static final String TAG = PassphraseActivity.class.getSimpleName();
 

app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java

@@ -41,6 +41,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class PassphraseChangeActivity extends PassphraseActivity {
 
+  private static final String TAG = Log.tag(PassphraseChangeActivity.class);
+
   private DynamicTheme    dynamicTheme    = new DynamicTheme();
   private DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
@@ -145,7 +147,7 @@ public class PassphraseChangeActivity extends PassphraseActivity {
         return masterSecret;
 
       } catch (InvalidPassphraseException e) {
-        Log.w(PassphraseChangeActivity.class.getSimpleName(), e);
+        Log.w(TAG, e);
         return null;
       }
     }

app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -55,6 +55,7 @@ import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity;
 import org.thoughtcrime.securesms.util.DynamicIntroTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -164,7 +165,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   }
 
   private void handleLogSubmit() {
-    Intent intent = new Intent(this, LogSubmitActivity.class);
+    Intent intent = new Intent(this, SubmitDebugLogActivity.class);
     startActivity(intent);
   }
 
@@ -237,7 +238,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
                                      EditorInfo.IME_ACTION_DONE);
 
     fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
 
     lockScreenButton.setOnClickListener(v -> resumeScreenLock());
   }
@@ -357,7 +358,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
           handleAuthenticated();
 
           fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
         }
       }).start();
     }
@@ -380,7 +381,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
         @Override
         public void onAnimationEnd(Animation animation) {
           fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
-          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
         }
 
         @Override

app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java

@@ -14,34 +14,41 @@ import androidx.fragment.app.Fragment;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.pin.PinRestoreActivity;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
 
-public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActionBarActivity.class.getSimpleName();
+public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
+  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
 
-  public static final String LOCALE_EXTRA = "locale_extra";
+  public static final String LOCALE_EXTRA      = "locale_extra";
+  public static final String NEXT_INTENT_EXTRA = "next_intent";
 
   private static final int STATE_NORMAL              = 0;
   private static final int STATE_CREATE_PASSPHRASE   = 1;
   private static final int STATE_PROMPT_PASSPHRASE   = 2;
   private static final int STATE_UI_BLOCKING_UPGRADE = 3;
-  private static final int STATE_EXPERIENCE_UPGRADE  = 4;
-  private static final int STATE_WELCOME_PUSH_SCREEN = 5;
+  private static final int STATE_WELCOME_PUSH_SCREEN = 4;
+  private static final int STATE_ENTER_SIGNAL_PIN    = 5;
+  private static final int STATE_CREATE_PROFILE_NAME = 6;
+  private static final int STATE_CREATE_SIGNAL_PIN   = 7;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
 
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onCreate()");
     this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
@@ -61,7 +68,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected void onResume() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onResume()");
     super.onResume();
 
     if (networkAccess.isCensored(this)) {
@@ -69,27 +75,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     }
   }
 
-  @Override
-  protected void onStart() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStart()");
-    super.onStart();
-  }
-
-  @Override
-  protected void onPause() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onPause()");
-    super.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStop()");
-    super.onStop();
-  }
-
   @Override
   protected void onDestroy() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onDestroy()");
     super.onDestroy();
     removeClearKeyReceiver(this);
   }
@@ -149,7 +136,9 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       case STATE_PROMPT_PASSPHRASE:   return getPromptPassphraseIntent();
       case STATE_UI_BLOCKING_UPGRADE: return getUiBlockingUpgradeIntent();
       case STATE_WELCOME_PUSH_SCREEN: return getPushRegistrationIntent();
-      case STATE_EXPERIENCE_UPGRADE:  return getExperienceUpgradeIntent();
+      case STATE_ENTER_SIGNAL_PIN:    return getEnterSignalPinIntent();
+      case STATE_CREATE_SIGNAL_PIN:   return getCreateSignalPinIntent();
+      case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
       default:                        return null;
     }
   }
@@ -163,13 +152,25 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       return STATE_UI_BLOCKING_UPGRADE;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_WELCOME_PUSH_SCREEN;
-    } else if (ExperienceUpgradeActivity.isUpdate(this)) {
-      return STATE_EXPERIENCE_UPGRADE;
+    } else if (SignalStore.storageServiceValues().needsAccountRestore()) {
+      return STATE_ENTER_SIGNAL_PIN;
+    } else if (userMustSetProfileName()) {
+      return STATE_CREATE_PROFILE_NAME;
+    } else if (userMustCreateSignalPin()) {
+      return STATE_CREATE_SIGNAL_PIN;
     } else {
       return STATE_NORMAL;
     }
   }
 
+  private boolean userMustCreateSignalPin() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed() && !SignalStore.kbsValues().hasOptedOut();
+  }
+
+  private boolean userMustSetProfileName() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
+  }
+
   private Intent getCreatePassphraseIntent() {
     return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
   }
@@ -185,14 +186,30 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
                                : getPushRegistrationIntent());
   }
 
-  private Intent getExperienceUpgradeIntent() {
-    return getRoutedIntent(ExperienceUpgradeActivity.class, getIntent());
-  }
-
   private Intent getPushRegistrationIntent() {
     return RegistrationNavigationActivity.newIntentForNewRegistration(this);
   }
 
+  private Intent getEnterSignalPinIntent() {
+    return getRoutedIntent(PinRestoreActivity.class, getIntent());
+  }
+
+  private Intent getCreateSignalPinIntent() {
+
+    final Intent intent;
+    if (userMustSetProfileName()) {
+      intent = getCreateProfileNameIntent();
+    } else {
+      intent = getIntent();
+    }
+
+    return getRoutedIntent(CreateKbsPinActivity.class, intent);
+  }
+
+  private Intent getCreateProfileNameIntent() {
+    return getRoutedIntent(EditProfileActivity.class, getIntent());
+  }
+
   private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
     final Intent intent = new Intent(this, destination);
     if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);
@@ -223,4 +240,12 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       clearKeyReceiver = null;
     }
   }
+
+  /**
+   * Puts an extra in {@code intent} so that {@code nextIntent} will be shown after it.
+   */
+  public static @NonNull Intent chainIntent(@NonNull Intent intent, @NonNull Intent nextIntent) {
+    intent.putExtra(NEXT_INTENT_EXTRA, nextIntent);
+    return intent;
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java

@@ -6,7 +6,7 @@ import android.widget.Button;
 
 import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity;
 
-public class PromptMmsActivity extends PassphraseRequiredActionBarActivity {
+public class PromptMmsActivity extends PassphraseRequiredActivity {
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {

app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java

@@ -45,16 +45,24 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
     getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
     super.onCreate(icicle, ready);
 
+    initializeToolbar();
+  }
+
+  protected void initializeToolbar() {
     getToolbar().setNavigationIcon(R.drawable.ic_check_24);
     getToolbar().setNavigationOnClickListener(v -> {
-      Intent                resultIntent     = getIntent();
-      List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
-      List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
-
-      resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
-
-      setResult(RESULT_OK, resultIntent);
-      finish();
+      onFinishedSelection();
     });
   }
+
+  protected final void onFinishedSelection() {
+    Intent                resultIntent     = getIntent();
+    List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
+    List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
+
+    resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
+
+    setResult(RESULT_OK, resultIntent);
+    finish();
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java

@@ -1,50 +0,0 @@
-package org.thoughtcrime.securesms;
-
-
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.widget.SwitchCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
-
-public class ReadReceiptsIntroFragment extends Fragment {
-
-  public static ReadReceiptsIntroFragment newInstance() {
-    ReadReceiptsIntroFragment fragment = new ReadReceiptsIntroFragment();
-    Bundle args = new Bundle();
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  public ReadReceiptsIntroFragment() {}
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    View         v          = inflater.inflate(R.layout.experience_upgrade_preference_fragment, container, false);
-    SwitchCompat preference = ViewUtil.findById(v, R.id.preference);
-
-    preference.setChecked(TextSecurePreferences.isReadReceiptsEnabled(getContext()));
-    preference.setOnCheckedChangeListener((buttonView, isChecked) -> {
-      TextSecurePreferences.setReadReceiptsEnabled(getContext(), isChecked);
-      ApplicationDependencies.getJobManager()
-                             .add(new MultiDeviceConfigurationUpdateJob(isChecked,
-                                                                        TextSecurePreferences.isTypingIndicatorsEnabled(requireContext()),
-                                                                        TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()),
-                                                                        TextSecurePreferences.isLinkPreviewsEnabled(getContext())));
-    });
-
-    return v;
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java

@@ -1,826 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Color;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.telephony.PhoneNumberUtils;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.ViewCompat;
-import androidx.fragment.app.Fragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-
-import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.color.MaterialColors;
-import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
-import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
-import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.IdentityDatabase;
-import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
-import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
-import org.thoughtcrime.securesms.database.loaders.RecipientMediaLoader;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.widgets.ColorPickerPreference;
-import org.thoughtcrime.securesms.preferences.widgets.ContactPreference;
-import org.thoughtcrime.securesms.recipients.LiveRecipient;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.IdentityUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.util.concurrent.ExecutionException;
-
-@SuppressLint("StaticFieldLeak")
-public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActivity implements LoaderManager.LoaderCallbacks<Cursor>
-{
-  private static final String TAG = RecipientPreferenceActivity.class.getSimpleName();
-
-  public static final String RECIPIENT_ID                 = "recipient_address";
-  public static final String CAN_HAVE_SAFETY_NUMBER_EXTRA = "can_have_safety_number";
-
-  private static final String PREFERENCE_MUTED                 = "pref_key_recipient_mute";
-  private static final String PREFERENCE_MESSAGE_TONE          = "pref_key_recipient_ringtone";
-  private static final String PREFERENCE_CALL_TONE             = "pref_key_recipient_call_ringtone";
-  private static final String PREFERENCE_MESSAGE_VIBRATE       = "pref_key_recipient_vibrate";
-  private static final String PREFERENCE_CALL_VIBRATE          = "pref_key_recipient_call_vibrate";
-  private static final String PREFERENCE_BLOCK                 = "pref_key_recipient_block";
-  private static final String PREFERENCE_COLOR                 = "pref_key_recipient_color";
-  private static final String PREFERENCE_IDENTITY              = "pref_key_recipient_identity";
-  private static final String PREFERENCE_ABOUT                 = "pref_key_number";
-  private static final String PREFERENCE_CUSTOM_NOTIFICATIONS  = "pref_key_recipient_custom_notifications";
-
-  private final DynamicTheme    dynamicTheme    = new DynamicDarkToolbarTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private ImageView               avatar;
-  private GlideRequests           glideRequests;
-  private RecipientId             recipientId;
-  private TextView                threadPhotoRailLabel;
-  private ThreadPhotoRailView     threadPhotoRailView;
-  private CollapsingToolbarLayout toolbarLayout;
-
-  @Override
-  public void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  public void onCreate(Bundle instanceState, boolean ready) {
-    setContentView(R.layout.recipient_preference_activity);
-    this.glideRequests = GlideApp.with(this);
-    this.recipientId   = getIntent().getParcelableExtra(RECIPIENT_ID);
-
-    LiveRecipient recipient = Recipient.live(recipientId);
-
-    initializeToolbar();
-    setHeader(recipient.get());
-    recipient.observe(this, this::setHeader);
-
-    getSupportLoaderManager().initLoader(0, null, this);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-  }
-
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
-    Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.preference_fragment);
-    fragment.onActivityResult(requestCode, resultCode, data);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onBackPressed() {
-    finish();
-    overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-  }
-
-  private void initializeToolbar() {
-    this.toolbarLayout        = ViewUtil.findById(this, R.id.collapsing_toolbar);
-    this.avatar               = ViewUtil.findById(this, R.id.avatar);
-    this.threadPhotoRailView  = ViewUtil.findById(this, R.id.recent_photos);
-    this.threadPhotoRailLabel = ViewUtil.findById(this, R.id.rail_label);
-
-    this.toolbarLayout.setExpandedTitleColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
-    this.toolbarLayout.setCollapsedTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
-
-    this.threadPhotoRailView.setListener(mediaRecord -> {
-      Intent intent = new Intent(RecipientPreferenceActivity.this, MediaPreviewActivity.class);
-      intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
-      intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
-      intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
-      intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
-      intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, ViewCompat.getLayoutDirection(threadPhotoRailView) == ViewCompat.LAYOUT_DIRECTION_LTR);
-      intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
-      startActivity(intent);
-    });
-
-    SimpleTask.run(
-      () -> DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId),
-      (threadId) -> {
-        if (threadId == null) {
-          Log.i(TAG, "No thread id for recipient.");
-        } else {
-          this.threadPhotoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(this, threadId)));
-        }
-      }
-    );
-
-    Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
-    setSupportActionBar(toolbar);
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setLogo(null);
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-      getWindow().setStatusBarColor(Color.TRANSPARENT);
-
-      ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.recipient_preference_root), (v, insets) -> {
-        ViewUtil.setTopMargin(toolbar, insets.getSystemWindowInsetTop());
-        return insets;
-      });
-    }
-  }
-
-  private void setHeader(@NonNull Recipient recipient) {
-    ContactPhoto         contactPhoto  = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient.getId(), String.valueOf(TextSecurePreferences.getProfileAvatarId(this)))
-                                                                   : recipient.getContactPhoto();
-    FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
-                                                                   : recipient.getFallbackContactPhoto();
-
-    glideRequests.load(contactPhoto)
-                 .fallback(fallbackPhoto.asCallCard(this))
-                 .error(fallbackPhoto.asCallCard(this))
-                 .diskCacheStrategy(DiskCacheStrategy.ALL)
-                 .into(this.avatar);
-
-    if (contactPhoto == null) this.avatar.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
-    else                      this.avatar.setScaleType(ImageView.ScaleType.CENTER_CROP);
-
-    this.avatar.setBackgroundColor(recipient.getColor().toActionBarColor(this));
-    this.toolbarLayout.setTitle(recipient.toShortString(this));
-    this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
-  }
-
-  @Override
-  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new RecipientMediaLoader(this, recipientId, RecipientMediaLoader.MediaType.GALLERY, MediaDatabase.Sorting.Newest);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
-    if (data != null && data.getCount() > 0) {
-      this.threadPhotoRailLabel.setVisibility(View.VISIBLE);
-      this.threadPhotoRailView.setVisibility(View.VISIBLE);
-    } else {
-      this.threadPhotoRailLabel.setVisibility(View.GONE);
-      this.threadPhotoRailView.setVisibility(View.GONE);
-    }
-
-    this.threadPhotoRailView.setCursor(glideRequests, data);
-
-    Bundle bundle = new Bundle();
-    bundle.putParcelable(RECIPIENT_ID, recipientId);
-    initFragment(R.id.preference_fragment, new RecipientPreferenceFragment(), null, bundle);
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-    this.threadPhotoRailView.setCursor(glideRequests, null);
-  }
-
-  public static class RecipientPreferenceFragment extends CorrectedPreferenceFragment {
-    private LiveRecipient recipient;
-    private boolean       canHaveSafetyNumber;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-      Log.i(TAG, "onCreate (fragment)");
-      super.onCreate(icicle);
-
-      initializeRecipients();
-
-      this.canHaveSafetyNumber = getActivity().getIntent()
-                                 .getBooleanExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA, false);
-
-      Preference customNotificationsPref  = this.findPreference(PREFERENCE_CUSTOM_NOTIFICATIONS);
-
-      if (NotificationChannels.supported()) {
-        ((SwitchPreferenceCompat) customNotificationsPref).setChecked(recipient.get().getNotificationChannel() != null);
-        customNotificationsPref.setOnPreferenceChangeListener(new CustomNotificationsChangedListener());
-
-        this.findPreference(PREFERENCE_MESSAGE_TONE).setDependency(PREFERENCE_CUSTOM_NOTIFICATIONS);
-        this.findPreference(PREFERENCE_MESSAGE_VIBRATE).setDependency(PREFERENCE_CUSTOM_NOTIFICATIONS);
-
-        if (recipient.get().getNotificationChannel() != null) {
-          final Context context = requireContext();
-          new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... voids) {
-              RecipientDatabase db = DatabaseFactory.getRecipientDatabase(getContext());
-              db.setMessageRingtone(recipient.getId(), NotificationChannels.getMessageRingtone(context, recipient.get()));
-              db.setMessageVibrate(recipient.getId(), NotificationChannels.getMessageVibrate(context, recipient.get()) ? VibrateState.ENABLED : VibrateState.DISABLED);
-              NotificationChannels.ensureCustomChannelConsistency(context);
-              return null;
-            }
-          }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
-        }
-      } else {
-        customNotificationsPref.setVisible(false);
-      }
-
-      this.findPreference(PREFERENCE_MESSAGE_TONE)
-          .setOnPreferenceChangeListener(new RingtoneChangeListener(false));
-      this.findPreference(PREFERENCE_MESSAGE_TONE)
-          .setOnPreferenceClickListener(new RingtoneClickedListener(false));
-      this.findPreference(PREFERENCE_CALL_TONE)
-          .setOnPreferenceChangeListener(new RingtoneChangeListener(true));
-      this.findPreference(PREFERENCE_CALL_TONE)
-          .setOnPreferenceClickListener(new RingtoneClickedListener(true));
-      this.findPreference(PREFERENCE_MESSAGE_VIBRATE)
-          .setOnPreferenceChangeListener(new VibrateChangeListener(false));
-      this.findPreference(PREFERENCE_CALL_VIBRATE)
-          .setOnPreferenceChangeListener(new VibrateChangeListener(true));
-      this.findPreference(PREFERENCE_MUTED)
-          .setOnPreferenceClickListener(new MuteClickedListener());
-      this.findPreference(PREFERENCE_BLOCK)
-          .setOnPreferenceClickListener(new BlockClickedListener());
-      this.findPreference(PREFERENCE_COLOR)
-          .setOnPreferenceChangeListener(new ColorChangeListener());
-      ((ContactPreference)this.findPreference(PREFERENCE_ABOUT))
-          .setListener(new AboutNumberClickedListener());
-    }
-
-    @Override
-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
-      Log.i(TAG, "onCreatePreferences...");
-      addPreferencesFromResource(R.xml.recipient_preferences);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-      Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-      setSummaries(recipient.get());
-    }
-
-    @Override
-    public void onDestroy() {
-      super.onDestroy();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-      if (requestCode == 1 && resultCode == RESULT_OK && data != null) {
-        Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
-
-        findPreference(PREFERENCE_MESSAGE_TONE).getOnPreferenceChangeListener().onPreferenceChange(findPreference(PREFERENCE_MESSAGE_TONE), uri);
-      } else if (requestCode == 2 && resultCode == RESULT_OK && data != null) {
-        Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
-
-        findPreference(PREFERENCE_CALL_TONE).getOnPreferenceChangeListener().onPreferenceChange(findPreference(PREFERENCE_CALL_TONE), uri);
-      }
-    }
-
-    @Override
-    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
-      RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
-      recyclerView.setItemAnimator(null);
-      recyclerView.setLayoutAnimation(null);
-      return recyclerView;
-    }
-
-    private void initializeRecipients() {
-      this.recipient = Recipient.live(getArguments().getParcelable(RECIPIENT_ID));
-      this.recipient.observe(this, this::setSummaries);
-    }
-
-    private void setSummaries(Recipient recipient) {
-      CheckBoxPreference    mutePreference            = (CheckBoxPreference) this.findPreference(PREFERENCE_MUTED);
-      Preference            customPreference          = this.findPreference(PREFERENCE_CUSTOM_NOTIFICATIONS);
-      Preference            ringtoneMessagePreference = this.findPreference(PREFERENCE_MESSAGE_TONE);
-      Preference            ringtoneCallPreference    = this.findPreference(PREFERENCE_CALL_TONE);
-      ListPreference        vibrateMessagePreference  = (ListPreference) this.findPreference(PREFERENCE_MESSAGE_VIBRATE);
-      ListPreference        vibrateCallPreference     = (ListPreference) this.findPreference(PREFERENCE_CALL_VIBRATE);
-      ColorPickerPreference colorPreference           = (ColorPickerPreference) this.findPreference(PREFERENCE_COLOR);
-      Preference            blockPreference           = this.findPreference(PREFERENCE_BLOCK);
-      Preference            identityPreference        = this.findPreference(PREFERENCE_IDENTITY);
-      PreferenceCategory    callCategory              = (PreferenceCategory)this.findPreference("call_settings");
-      PreferenceCategory    aboutCategory             = (PreferenceCategory)this.findPreference("about");
-      PreferenceCategory    aboutDivider              = (PreferenceCategory)this.findPreference("about_divider");
-      ContactPreference     aboutPreference           = (ContactPreference)this.findPreference(PREFERENCE_ABOUT);
-      PreferenceCategory    privacyCategory           = (PreferenceCategory) this.findPreference("privacy_settings");
-      PreferenceCategory    divider                   = (PreferenceCategory) this.findPreference("divider");
-
-      mutePreference.setChecked(recipient.isMuted());
-
-      ringtoneMessagePreference.setSummary(ringtoneMessagePreference.isEnabled() ? getRingtoneSummary(getContext(), recipient.getMessageRingtone()) : "");
-      ringtoneCallPreference.setSummary(getRingtoneSummary(getContext(), recipient.getCallRingtone()));
-
-      Pair<String, Integer> vibrateMessageSummary = getVibrateSummary(getContext(), recipient.getMessageVibrate());
-      Pair<String, Integer> vibrateCallSummary    = getVibrateSummary(getContext(), recipient.getCallVibrate());
-
-      vibrateMessagePreference.setSummary(vibrateMessagePreference.isEnabled() ? vibrateMessageSummary.first : "");
-      vibrateMessagePreference.setValueIndex(vibrateMessageSummary.second);
-
-      vibrateCallPreference.setSummary(vibrateCallSummary.first);
-      vibrateCallPreference.setValueIndex(vibrateCallSummary.second);
-
-      blockPreference.setVisible(RecipientUtil.isBlockable(recipient));
-      if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
-      else                       blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);
-
-      if (recipient.isLocalNumber()) {
-        mutePreference.setVisible(false);
-        customPreference.setVisible(false);
-        ringtoneMessagePreference.setVisible(false);
-        vibrateMessagePreference.setVisible(false);
-
-        if (identityPreference != null) identityPreference.setVisible(false);
-        if (aboutCategory      != null) aboutCategory.setVisible(false);
-        if (aboutDivider       != null) aboutDivider.setVisible(false);
-        if (privacyCategory    != null) privacyCategory.setVisible(false);
-        if (divider            != null) divider.setVisible(false);
-        if (callCategory       != null) callCategory.setVisible(false);
-      }
-
-      if (recipient.isGroup()) {
-        if (colorPreference    != null) colorPreference.setVisible(false);
-        if (identityPreference != null) identityPreference.setVisible(false);
-        if (callCategory       != null) callCategory.setVisible(false);
-        if (aboutCategory      != null) aboutCategory.setVisible(false);
-        if (aboutDivider       != null) aboutDivider.setVisible(false);
-        if (divider            != null) divider.setVisible(false);
-      } else {
-        colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
-        colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
-
-        if (FeatureFlags.profileDisplay()) {
-          aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
-          aboutPreference.setSummary(recipient.resolve().getE164().or(""));
-        } else {
-          aboutPreference.setTitle(formatRecipient(recipient));
-          aboutPreference.setSummary(recipient.getCustomLabel());
-        }
-
-        aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
-
-        IdentityUtil.getRemoteIdentityKey(getActivity(), recipient).addListener(new ListenableFuture.Listener<Optional<IdentityRecord>>() {
-          @Override
-          public void onSuccess(Optional<IdentityRecord> result) {
-            if (result.isPresent()) {
-              if (identityPreference != null) identityPreference.setOnPreferenceClickListener(new IdentityClickedListener(result.get()));
-              if (identityPreference != null) identityPreference.setEnabled(true);
-            } else if (canHaveSafetyNumber) {
-              if (identityPreference != null) identityPreference.setSummary(R.string.RecipientPreferenceActivity_available_once_a_message_has_been_sent_or_received);
-              if (identityPreference != null) identityPreference.setEnabled(false);
-            } else {
-              if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
-            }
-          }
-
-          @Override
-          public void onFailure(ExecutionException e) {
-            if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
-          }
-        });
-      }
-
-      if (recipient.isMmsGroup() && privacyCategory != null) {
-        privacyCategory.setVisible(false);
-      }
-    }
-
-    private @NonNull String formatRecipient(@NonNull Recipient recipient) {
-      if      (recipient.getE164().isPresent())  return PhoneNumberUtils.formatNumber(recipient.requireE164());
-      else if (recipient.getEmail().isPresent()) return recipient.requireEmail();
-      else                                       return "";
-    }
-
-    private @NonNull String getRingtoneSummary(@NonNull Context context, @Nullable Uri ringtone) {
-      if (ringtone == null) {
-        return context.getString(R.string.preferences__default);
-      } else if (ringtone.toString().isEmpty()) {
-        return context.getString(R.string.preferences__silent);
-      } else {
-        Ringtone tone = RingtoneManager.getRingtone(getActivity(), ringtone);
-
-        if (tone != null) {
-          return tone.getTitle(context);
-        }
-      }
-
-      return context.getString(R.string.preferences__default);
-    }
-
-    private @NonNull Pair<String, Integer> getVibrateSummary(@NonNull Context context, @NonNull VibrateState vibrateState) {
-      if (vibrateState == VibrateState.DEFAULT) {
-        return new Pair<>(context.getString(R.string.preferences__default), 0);
-      } else if (vibrateState == VibrateState.ENABLED) {
-        return new Pair<>(context.getString(R.string.RecipientPreferenceActivity_enabled), 1);
-      } else {
-        return new Pair<>(context.getString(R.string.RecipientPreferenceActivity_disabled), 2);
-      }
-    }
-
-    private class RingtoneChangeListener implements Preference.OnPreferenceChangeListener {
-
-      private final boolean calls;
-
-      RingtoneChangeListener(boolean calls) {
-        this.calls = calls;
-      }
-
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final Context context = preference.getContext();
-
-        Uri value = (Uri)newValue;
-
-        Uri defaultValue;
-
-        if (calls) defaultValue = TextSecurePreferences.getCallNotificationRingtone(context);
-        else       defaultValue = TextSecurePreferences.getNotificationRingtone(context);
-
-        if (defaultValue.equals(value)) value = null;
-        else if (value == null)         value = Uri.EMPTY;
-
-
-        new AsyncTask<Uri, Void, Void>() {
-          @Override
-          protected Void doInBackground(Uri... params) {
-            if (calls) {
-              DatabaseFactory.getRecipientDatabase(context).setCallRingtone(recipient.getId(), params[0]);
-            } else {
-              DatabaseFactory.getRecipientDatabase(context).setMessageRingtone(recipient.getId(), params[0]);
-              NotificationChannels.updateMessageRingtone(context, recipient.get(), params[0]);
-            }
-            return null;
-          }
-        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, value);
-
-        return false;
-      }
-    }
-
-    private class RingtoneClickedListener implements Preference.OnPreferenceClickListener {
-
-      private final boolean calls;
-
-      RingtoneClickedListener(boolean calls) {
-        this.calls = calls;
-      }
-
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        Uri current;
-        Uri defaultUri;
-
-        if (calls) {
-          current    = recipient.get().getCallRingtone();
-          defaultUri = TextSecurePreferences.getCallNotificationRingtone(getContext());
-        } else  {
-          current    = recipient.get().getMessageRingtone();
-          defaultUri = TextSecurePreferences.getNotificationRingtone(getContext());
-        }
-
-        if      (current == null)              current = Settings.System.DEFAULT_NOTIFICATION_URI;
-        else if (current.toString().isEmpty()) current = null;
-
-        Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, defaultUri);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, calls ? RingtoneManager.TYPE_RINGTONE : RingtoneManager.TYPE_NOTIFICATION);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, current);
-
-        startActivityForResult(intent, calls ? 2 : 1);
-
-        return true;
-      }
-    }
-
-    private class VibrateChangeListener implements Preference.OnPreferenceChangeListener {
-
-      private final boolean call;
-
-      VibrateChangeListener(boolean call) {
-        this.call = call;
-      }
-
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue) {
-              int          value        = Integer.parseInt((String) newValue);
-        final VibrateState vibrateState = VibrateState.fromId(value);
-        final Context      context      = preference.getContext();
-
-        new AsyncTask<Void, Void, Void>() {
-          @Override
-          protected Void doInBackground(Void... params) {
-            if (call) {
-              DatabaseFactory.getRecipientDatabase(context).setCallVibrate(recipient.getId(), vibrateState);
-            }
-            else {
-              DatabaseFactory.getRecipientDatabase(context).setMessageVibrate(recipient.getId(), vibrateState);
-              NotificationChannels.updateMessageVibrate(context, recipient.get(), vibrateState);
-            }
-            return null;
-          }
-        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
-
-        return false;
-      }
-    }
-
-    private class ColorChangeListener implements Preference.OnPreferenceChangeListener {
-
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final Context context = getContext();
-        if (context == null) return true;
-
-        final int           value         = (Integer) newValue;
-        final MaterialColor selectedColor = MaterialColors.CONVERSATION_PALETTE.getByColor(context, value);
-        final MaterialColor currentColor  = recipient.get().getColor();
-
-        if (selectedColor == null) return true;
-
-        if (preference.isEnabled() && !currentColor.equals(selectedColor)) {
-          new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-              DatabaseFactory.getRecipientDatabase(context).setColor(recipient.getId(), selectedColor);
-
-              if (recipient.get().resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {
-                ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(recipient.getId()));
-              }
-              return null;
-            }
-          }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        }
-        return true;
-      }
-    }
-
-    private class MuteClickedListener implements Preference.OnPreferenceClickListener {
-
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        if (recipient.get().isMuted()) handleUnmute(preference.getContext());
-        else                           handleMute(preference.getContext());
-
-        return true;
-      }
-
-      private void handleMute(@NonNull Context context) {
-        MuteDialog.show(context, until -> setMuted(context, recipient.get(), until));
-
-        setSummaries(recipient.get());
-      }
-
-      private void handleUnmute(@NonNull Context context) {
-        setMuted(context, recipient.get(), 0);
-      }
-
-      private void setMuted(@NonNull final Context context, final Recipient recipient, final long until) {
-        new AsyncTask<Void, Void, Void>() {
-          @Override
-          protected Void doInBackground(Void... params) {
-            DatabaseFactory.getRecipientDatabase(context)
-                           .setMuted(recipient.getId(), until);
-            return null;
-          }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-      }
-    }
-
-    private class IdentityClickedListener implements Preference.OnPreferenceClickListener {
-
-      private final IdentityRecord identityKey;
-
-      private IdentityClickedListener(IdentityRecord identityKey) {
-        Log.i(TAG, "Identity record: " + identityKey);
-        this.identityKey = identityKey;
-      }
-
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        Intent verifyIdentityIntent = new Intent(preference.getContext(), VerifyIdentityActivity.class);
-        verifyIdentityIntent.putExtra(VerifyIdentityActivity.RECIPIENT_EXTRA, recipient.getId());
-        verifyIdentityIntent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey.getIdentityKey()));
-        verifyIdentityIntent.putExtra(VerifyIdentityActivity.VERIFIED_EXTRA, identityKey.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
-        startActivity(verifyIdentityIntent);
-
-        return true;
-      }
-    }
-
-    private class BlockClickedListener implements Preference.OnPreferenceClickListener {
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        if (recipient.get().isBlocked()) handleUnblock(preference.getContext());
-        else                             handleBlock(preference.getContext());
-
-        return true;
-      }
-
-      private void handleBlock(@NonNull final Context context) {
-        new AsyncTask<Void, Void, Pair<Integer, Integer>>() {
-
-          @Override
-          protected Pair<Integer, Integer> doInBackground(Void... voids) {
-            int titleRes = R.string.RecipientPreferenceActivity_block_this_contact_question;
-            int bodyRes  = R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact;
-
-            if (recipient.get().isGroup()) {
-              bodyRes = R.string.RecipientPreferenceActivity_block_and_leave_group_description;
-
-              if (recipient.get().isGroup() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.get().requireGroupId())) {
-                titleRes = R.string.RecipientPreferenceActivity_block_and_leave_group;
-              } else {
-                titleRes = R.string.RecipientPreferenceActivity_block_group;
-              }
-            }
-
-            return new Pair<>(titleRes, bodyRes);
-          }
-
-          @Override
-          protected void onPostExecute(Pair<Integer, Integer> titleAndBody) {
-            new AlertDialog.Builder(context)
-                           .setTitle(titleAndBody.first)
-                           .setMessage(titleAndBody.second)
-                           .setCancelable(true)
-                           .setNegativeButton(android.R.string.cancel, null)
-                           .setPositiveButton(R.string.RecipientPreferenceActivity_block, (dialog, which) -> {
-                             setBlocked(context, recipient.get(), true);
-                           }).show();
-          }
-        }.execute();
-      }
-
-      private void handleUnblock(@NonNull Context context) {
-        int titleRes = R.string.RecipientPreferenceActivity_unblock_this_contact_question;
-        int bodyRes  = R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact;
-
-        if (recipient.resolve().isGroup()) {
-          titleRes = R.string.RecipientPreferenceActivity_unblock_this_group_question;
-          bodyRes  = R.string.RecipientPreferenceActivity_unblock_this_group_description;
-        }
-
-        new AlertDialog.Builder(context)
-                       .setTitle(titleRes)
-                       .setMessage(bodyRes)
-                       .setCancelable(true)
-                       .setNegativeButton(android.R.string.cancel, null)
-                       .setPositiveButton(R.string.RecipientPreferenceActivity_unblock, (dialog, which) -> setBlocked(context, recipient.get(), false)).show();
-      }
-
-      private void setBlocked(@NonNull final Context context, final Recipient recipient, final boolean blocked) {
-        SignalExecutors.BOUNDED.execute(() -> {
-          if (blocked) {
-            RecipientUtil.block(context, recipient);
-          } else {
-            RecipientUtil.unblock(context, recipient);
-          }
-        });
-      }
-    }
-
-    private class AboutNumberClickedListener implements ContactPreference.Listener {
-
-      @Override
-      public void onMessageClicked() {
-        CommunicationActions.startConversation(getContext(), recipient.get(), null);
-      }
-
-      @Override
-      public void onSecureCallClicked() {
-        CommunicationActions.startVoiceCall(getActivity(), recipient.get());
-      }
-
-      @Override
-      public void onSecureVideoClicked() {
-        CommunicationActions.startVideoCall(getActivity(), recipient.get());
-      }
-
-      @Override
-      public void onInSecureCallClicked() {
-        try {
-          Intent dialIntent = new Intent(Intent.ACTION_DIAL,
-                                         Uri.parse("tel:" + recipient.get().requireE164()));
-          startActivity(dialIntent);
-        } catch (ActivityNotFoundException anfe) {
-          Log.w(TAG, anfe);
-          Dialogs.showAlertDialog(getContext(),
-                                  getString(R.string.ConversationActivity_calls_not_supported),
-                                  getString(R.string.ConversationActivity_this_device_does_not_appear_to_support_dial_actions));
-        }
-      }
-    }
-
-    private class CustomNotificationsChangedListener implements Preference.OnPreferenceChangeListener {
-
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final Context context = preference.getContext();
-        final boolean enabled = (boolean) newValue;
-
-        new AsyncTask<Void, Void, Void>() {
-          @Override
-          protected Void doInBackground(Void... params) {
-            if (enabled) {
-              String channel = NotificationChannels.createChannelFor(context, recipient.get());
-              DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), channel);
-            } else {
-              NotificationChannels.deleteChannelFor(context, recipient.get());
-              DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), null);
-            }
-            return null;
-          }
-        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
-
-        return true;
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java

@@ -109,7 +109,7 @@ public class TransportOptions {
   public static @NonNull TransportOption getPushTransportOption(@NonNull Context context) {
     return new TransportOption(Type.TEXTSECURE,
                                R.drawable.ic_send_lock_24,
-                               context.getResources().getColor(R.color.textsecure_primary),
+                               context.getResources().getColor(R.color.core_ultramarine),
                                context.getString(R.string.ConversationActivity_transport_signal),
                                context.getString(R.string.conversation_activity__type_message_push),
                                new PushCharacterCalculator());

app/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java

@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms;
-
-
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.thoughtcrime.securesms.components.TypingIndicatorView;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-public class TypingIndicatorIntroFragment extends Fragment {
-
-  private Controller controller;
-
-  public static TypingIndicatorIntroFragment newInstance() {
-    TypingIndicatorIntroFragment fragment = new TypingIndicatorIntroFragment();
-    Bundle                       args     = new Bundle();
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  public TypingIndicatorIntroFragment() {}
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  public void onAttach(Context context) {
-    super.onAttach(context);
-
-    if (!(getActivity() instanceof Controller)) {
-      throw new IllegalStateException("Parent activity must implement the Controller interface.");
-    }
-
-    controller = (Controller) getActivity();
-  }
-
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    View view      = inflater.inflate(R.layout.experience_upgrade_typing_indicators_fragment, container, false);
-    View yesButton = view.findViewById(R.id.experience_yes_button);
-    View noButton  = view.findViewById(R.id.experience_no_button);
-
-    ((TypingIndicatorView) view.findViewById(R.id.typing_indicator)).startAnimation();
-
-    yesButton.setOnClickListener(v -> onButtonClicked(true));
-    noButton.setOnClickListener(v -> onButtonClicked(false));
-
-    return view;
-  }
-
-  private void onButtonClicked(boolean typingEnabled) {
-    TextSecurePreferences.setTypingIndicatorsEnabled(getContext(), typingEnabled);
-    ApplicationDependencies.getJobManager().add(new MultiDeviceConfigurationUpdateJob(TextSecurePreferences.isReadReceiptsEnabled(requireContext()),
-                                                                                      typingEnabled,
-                                                                                      TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()),
-                                                                                      TextSecurePreferences.isLinkPreviewsEnabled(getContext())));
-
-    controller.onTypingIndicatorsFinished();
-  }
-
-  public interface Controller {
-    void onTypingIndicatorsFinished();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java

@@ -34,17 +34,9 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.widget.SwitchCompat;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
@@ -62,13 +54,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.components.camera.CameraView;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.QrCode;
 import org.thoughtcrime.securesms.qr.ScanListener;
@@ -76,8 +77,8 @@ import org.thoughtcrime.securesms.qr.ScanningThread;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.DynamicDarkActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -103,24 +104,55 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
  * @author Moxie Marlinspike
  */
 @SuppressLint("StaticFieldLeak")
-public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity implements ScanListener, View.OnClickListener {
+public class VerifyIdentityActivity extends PassphraseRequiredActivity implements ScanListener, View.OnClickListener {
 
-  private static final String TAG = VerifyIdentityActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(VerifyIdentityActivity.class);
 
-  public static final String RECIPIENT_EXTRA = "recipient_id";
-  public static final String IDENTITY_EXTRA  = "recipient_identity";
-  public static final String VERIFIED_EXTRA  = "verified_state";
+  private static final String RECIPIENT_EXTRA = "recipient_id";
+  private static final String IDENTITY_EXTRA  = "recipient_identity";
+  private static final String VERIFIED_EXTRA  = "verified_state";
 
-  private final DynamicTheme    dynamicTheme    = new DynamicDarkActionBarTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private final DynamicTheme dynamicTheme = new DynamicDarkActionBarTheme();
 
-  private VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
-  private VerifyScanFragment    scanFragment    = new VerifyScanFragment();
+  private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
+  private final VerifyScanFragment    scanFragment    = new VerifyScanFragment();
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     identityRecord.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord,
+                                 boolean verified)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     verified);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull RecipientId recipientId,
+                                 @NonNull IdentityKey identityKey,
+                                 boolean verified)
+  {
+    Intent intent = new Intent(context, VerifyIdentityActivity.class);
+
+    intent.putExtra(RECIPIENT_EXTRA, recipientId);
+    intent.putExtra(IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey));
+    intent.putExtra(VERIFIED_EXTRA, verified);
+
+    return intent;
+  }
 
   @Override
   public void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
@@ -143,7 +175,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     scanFragment.setScanListener(this);
     displayFragment.setClickListener(this);
 
-    initFragment(android.R.id.content, displayFragment, dynamicLanguage.getCurrentLocale(), extras);
+    initFragment(android.R.id.content, displayFragment, Locale.getDefault(), extras);
   }
 
   @Override
@@ -275,7 +307,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
       byte[] localId;
       byte[] remoteId;
 
-      if (FeatureFlags.uuids() && recipient.resolve().getUuid().isPresent()) {
+      if (FeatureFlags.verifyV2() && recipient.resolve().getUuid().isPresent()) {
         Log.i(TAG, "Using UUID (version 2).");
         version  = 2;
         localId  = UuidUtil.toByteArray(TextSecurePreferences.getLocalUuid(requireContext()));
@@ -454,7 +486,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     }
 
     private void setRecipientText(Recipient recipient) {
-      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.toShortString(getContext()))));
+      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
       description.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
@@ -604,6 +636,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
                                                                          remoteIdentity,
                                                                          isChecked ? VerifiedStatus.VERIFIED :
                                                                                      VerifiedStatus.DEFAULT));
+            StorageSyncHelper.scheduleSyncForDataChange();
 
             IdentityUtil.markIdentityVerified(getActivity(), recipient.get(), isChecked, false);
           }

app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java

@@ -18,42 +18,57 @@
 package org.thoughtcrime.securesms;
 
 import android.Manifest;
-import android.app.Activity;
+import android.app.PictureInPictureParams;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.media.AudioManager;
+import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.View;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.util.Rational;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.ViewModelProviders;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcAnswerDeclineButton;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen;
+import org.thoughtcrime.securesms.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.ringrtc.RemotePeer;
 import org.thoughtcrime.securesms.service.WebRtcCallService;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.VerifySpan;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.webrtc.SurfaceViewRenderer;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
-public class WebRtcCallActivity extends Activity {
+public class WebRtcCallActivity extends AppCompatActivity {
+
 
   private static final String TAG = WebRtcCallActivity.class.getSimpleName();
 
@@ -66,8 +81,10 @@ public class WebRtcCallActivity extends Activity {
 
   public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
 
-  private WebRtcCallScreen callScreen;
-  private boolean          enableVideoIfAvailable;
+  private WebRtcCallView      callScreen;
+  private TooltipPopup        videoTooltip;
+  private WebRtcCallViewModel viewModel;
+  private boolean             enableVideoIfAvailable;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -78,10 +95,12 @@ public class WebRtcCallActivity extends Activity {
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
+    getSupportActionBar().hide();
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
     initializeResources();
+    initializeViewModel();
 
     processIntent(getIntent());
 
@@ -89,18 +108,21 @@ public class WebRtcCallActivity extends Activity {
     getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE);
   }
 
-
   @Override
   public void onResume() {
     Log.i(TAG, "onResume()");
     super.onResume();
     initializeScreenshotSecurity();
-    EventBus.getDefault().register(this);
+
+    if (!EventBus.getDefault().isRegistered(this)) {
+      EventBus.getDefault().register(this);
+    }
   }
 
   @Override
   public void onNewIntent(Intent intent){
     Log.i(TAG, "onNewIntent");
+    super.onNewIntent(intent);
     processIntent(intent);
   }
 
@@ -108,6 +130,17 @@ public class WebRtcCallActivity extends Activity {
   public void onPause() {
     Log.i(TAG, "onPause");
     super.onPause();
+
+    if (!isInPipMode()) {
+      EventBus.getDefault().unregister(this);
+    }
+  }
+
+  @Override
+  protected void onStop() {
+    Log.i(TAG, "onStop");
+    super.onStop();
+
     EventBus.getDefault().unregister(this);
   }
 
@@ -121,9 +154,42 @@ public class WebRtcCallActivity extends Activity {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
+  @Override
+  protected void onUserLeaveHint() {
+    enterPipModeIfPossible();
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (!enterPipModeIfPossible()) {
+      super.onBackPressed();
+    }
+  }
+
+  @Override
+  public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+    viewModel.setIsInPipMode(isInPictureInPictureMode);
+  }
+
+  private boolean enterPipModeIfPossible() {
+    if (isSystemPipEnabledAndAvailable()) {
+      PictureInPictureParams params = new PictureInPictureParams.Builder()
+              .setAspectRatio(new Rational(9, 16))
+              .build();
+      enterPictureInPictureMode(params);
+      return true;
+    }
+    return false;
+  }
+
+  private boolean isInPipMode() {
+    return isSystemPipEnabledAndAvailable() && isInPictureInPictureMode();
+  }
+
   private void processIntent(@NonNull Intent intent) {
     if (ANSWER_ACTION.equals(intent.getAction())) {
-      handleAnswerCall();
+      viewModel.setRecipient(EventBus.getDefault().getStickyEvent(WebRtcViewModel.class).getRecipient());
+      handleAnswerWithAudio();
     } else if (DENY_ACTION.equals(intent.getAction())) {
       handleDenyCall();
     } else if (END_CALL_ACTION.equals(intent.getAction())) {
@@ -141,26 +207,77 @@ public class WebRtcCallActivity extends Activity {
 
   private void initializeResources() {
     callScreen = ViewUtil.findById(this, R.id.callScreen);
-    callScreen.setHangupButtonListener(new HangupButtonListener());
-    callScreen.setIncomingCallActionListener(new IncomingCallActionListener());
-    callScreen.setAudioMuteButtonListener(new AudioMuteButtonListener());
-    callScreen.setVideoMuteButtonListener(new VideoMuteButtonListener());
-    callScreen.setCameraFlipButtonListener(new CameraFlipButtonListener());
-    callScreen.setSpeakerButtonListener(new SpeakerButtonListener());
-    callScreen.setBluetoothButtonListener(new BluetoothButtonListener());
+    callScreen.setControlsListener(new ControlsListener());
   }
 
-  private void handleSetAudioSpeaker(boolean enabled) {
+  private void initializeViewModel() {
+    viewModel = ViewModelProviders.of(this).get(WebRtcCallViewModel.class);
+    viewModel.setIsInPipMode(isInPipMode());
+    viewModel.getRemoteVideoEnabled().observe(this,callScreen::setRemoteVideoEnabled);
+    viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
+    viewModel.getCameraDirection().observe(this, callScreen::setCameraDirection);
+    viewModel.getLocalRenderState().observe(this, callScreen::setLocalRenderState);
+    viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
+    viewModel.getEvents().observe(this, this::handleViewModelEvent);
+    viewModel.getCallTime().observe(this, this::handleCallTime);
+    viewModel.displaySquareCallCard().observe(this, callScreen::showCallCard);
+  }
+
+  private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
+    if (isInPipMode()) {
+      return;
+    }
+
+    switch (event) {
+      case SHOW_VIDEO_TOOLTIP:
+        if (videoTooltip == null) {
+          videoTooltip = TooltipPopup.forTarget(callScreen.getVideoTooltipTarget())
+                                     .setBackgroundTint(ContextCompat.getColor(this, R.color.core_ultramarine))
+                                     .setTextColor(ContextCompat.getColor(this, R.color.core_white))
+                                     .setText(R.string.WebRtcCallActivity__tap_here_to_turn_on_your_video)
+                                     .setOnDismissListener(() -> viewModel.onDismissedVideoTooltip())
+                                     .show(TooltipPopup.POSITION_ABOVE);
+          return;
+        }
+        break;
+      case DISMISS_VIDEO_TOOLTIP:
+        if (videoTooltip != null) {
+          videoTooltip.dismiss();
+          videoTooltip = null;
+        }
+        break;
+      default:
+        throw new IllegalArgumentException("Unknown event: " + event);
+    }
+  }
+
+  private void handleCallTime(long callTime) {
+    EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(callTime);
+
+    if (ellapsedTimeFormatter == null) {
+      return;
+    }
+
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
+  }
+
+  private void handleSetAudioHandset() {
     Intent intent = new Intent(this, WebRtcCallService.class);
     intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
-    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, enabled);
     startService(intent);
   }
 
-  private void handleSetAudioBluetooth(boolean enabled) {
+  private void handleSetAudioSpeaker() {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, true);
+    startService(intent);
+  }
+
+  private void handleSetAudioBluetooth() {
     Intent intent = new Intent(this, WebRtcCallService.class);
     intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
-    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, enabled);
+    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, true);
     startService(intent);
   }
 
@@ -172,10 +289,24 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void handleSetMuteVideo(boolean muted) {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_VIDEO);
-    intent.putExtra(WebRtcCallService.EXTRA_MUTE, muted);
-    startService(intent);
+    Recipient recipient = viewModel.getRecipient().get();
+
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      String recipientDisplayName = recipient.getDisplayName(this);
+
+      Permissions.with(this)
+                 .request(Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
+                 .onAllGranted(() -> {
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_SET_ENABLE_VIDEO);
+                   intent.putExtra(WebRtcCallService.EXTRA_ENABLE, !muted);
+                   startService(intent);
+                 })
+                 .execute();
+    }
   }
 
   private void handleFlipCamera() {
@@ -184,21 +315,22 @@ public class WebRtcCallActivity extends Activity {
     startService(intent);
   }
 
-  private void handleAnswerCall() {
-    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+  private void handleAnswerWithAudio() {
+    Recipient recipient = viewModel.getRecipient().get();
 
-    if (event != null) {
+    if (!recipient.equals(Recipient.UNKNOWN)) {
       Permissions.with(this)
-                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .request(Manifest.permission.RECORD_AUDIO)
                  .ifNecessary()
-                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString(this)),
-                                      R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
+                                      R.drawable.ic_mic_solid_24)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
                  .onAllGranted(() -> {
-                   callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_answering), event.getLocalRenderer());
+                   callScreen.setRecipient(recipient);
+                   callScreen.setStatus(getString(R.string.RedPhone_answering));
 
                    Intent intent = new Intent(this, WebRtcCallService.class);
-                   intent.setAction(WebRtcCallService.ACTION_ANSWER_CALL);
+                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
                    startService(intent);
                  })
                  .onAnyDenied(this::handleDenyCall)
@@ -206,15 +338,42 @@ public class WebRtcCallActivity extends Activity {
     }
   }
 
-  private void handleDenyCall() {
-    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+  private void handleAnswerWithVideo() {
+    Recipient recipient = viewModel.getRecipient().get();
 
-    if (event != null) {
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
+                     R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
+                 .onAllGranted(() -> {
+                   callScreen.setRecipient(recipient);
+                   callScreen.setStatus(getString(R.string.RedPhone_answering));
+
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
+                   intent.putExtra(WebRtcCallService.EXTRA_ANSWER_WITH_VIDEO, true);
+                   startService(intent);
+
+                   handleSetMuteVideo(false);
+                 })
+                 .onAnyDenied(this::handleDenyCall)
+                 .execute();
+    }
+  }
+
+  private void handleDenyCall() {
+    Recipient recipient = viewModel.getRecipient().get();
+
+    if (!recipient.equals(Recipient.UNKNOWN)) {
       Intent intent = new Intent(this, WebRtcCallService.class);
       intent.setAction(WebRtcCallService.ACTION_DENY_CALL);
       startService(intent);
 
-      callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ending_call), event.getLocalRenderer());
+      callScreen.setRecipient(recipient);
+      callScreen.setStatus(getString(R.string.RedPhone_ending_call));
       delayedFinish();
     }
   }
@@ -227,44 +386,57 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void handleIncomingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setIncomingCall(event.getRecipient());
+    callScreen.setRecipient(event.getRecipient());
   }
 
   private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_dialing), event.getLocalRenderer());
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
   }
 
-  private void handleTerminate(@NonNull Recipient recipient, @NonNull SurfaceViewRenderer localRenderer /*, int terminationType */) {
-    Log.i(TAG, "handleTerminate called");
+  private void handleTerminate(@NonNull Recipient recipient, @NonNull HangupMessage.Type hangupType) {
+    Log.i(TAG, "handleTerminate called: " + hangupType.name());
+
+    callScreen.setRecipient(recipient);
+    callScreen.setStatusFromHangupType(hangupType);
 
-    callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call), localRenderer);
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
 
+    if (hangupType == HangupMessage.Type.NEED_PERMISSION) {
+      startActivity(CalleeMustAcceptMessageRequestActivity.createIntent(this, recipient.getId()));
+    }
     delayedFinish();
   }
 
   private void handleCallRinging(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ringing), event.getLocalRenderer());
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_ringing));
   }
 
   private void handleCallBusy(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_busy), event.getLocalRenderer());
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_busy));
 
     delayedFinish(BUSY_SIGNAL_DELAY_FINISH);
   }
 
   private void handleCallConnected(@NonNull WebRtcViewModel event) {
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_connected), "", event.getLocalRenderer(), event.getRemoteRenderer());
+    callScreen.setRecipient(event.getRecipient());
   }
 
   private void handleRecipientUnavailable(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_recipient_unavailable), event.getLocalRenderer());
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_recipient_unavailable));
     delayedFinish();
   }
 
   private void handleServerFailure(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_network_failed), event.getLocalRenderer());
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_network_failed));
     delayedFinish();
   }
 
@@ -278,44 +450,62 @@ public class WebRtcCallActivity extends Activity {
     dialog.setPositiveButton(R.string.RedPhone_got_it, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
       }
     });
     dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
       @Override
       public void onCancel(DialogInterface dialog) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
       }
     });
     dialog.show();
   }
 
   private void handleUntrustedIdentity(@NonNull WebRtcViewModel event) {
-    final IdentityKey theirIdentity = event.getIdentityKey();
-    final Recipient   recipient     = event.getRecipient();
+    final IdentityKey theirKey  = event.getIdentityKey();
+    final Recipient   recipient = event.getRecipient();
 
-    callScreen.setUntrustedIdentity(recipient, theirIdentity);
-    callScreen.setAcceptIdentityListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        synchronized (SESSION_LOCK) {
-          TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(WebRtcCallActivity.this);
-          identityKeyStore.saveIdentity(new SignalProtocolAddress(recipient.requireServiceId(), 1), theirIdentity, true);
-        }
+    if (theirKey == null) {
+      handleTerminate(recipient, HangupMessage.Type.NORMAL);
+    }
 
-        Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-        intent.putExtra(WebRtcCallService.EXTRA_REMOTE_RECIPIENT, recipient.getId());
-        intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL);
-        startService(intent);
-      }
-    });
+    String          name            = recipient.getDisplayName(this);
+    String          introduction    = getString(R.string.WebRtcCallScreen_new_safety_numbers, name, name);
+    SpannableString spannableString = new SpannableString(introduction + " " + getString(R.string.WebRtcCallScreen_you_may_wish_to_verify_this_contact));
 
-    callScreen.setCancelIdentityButton(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        handleTerminate(recipient, event.getLocalRenderer());
-      }
-    });
+    spannableString.setSpan(new VerifySpan(this, recipient.getId(), theirKey), introduction.length() + 1, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+    AppCompatTextView untrustedIdentityExplanation = new AppCompatTextView(this);
+    untrustedIdentityExplanation.setText(spannableString);
+    untrustedIdentityExplanation.setMovementMethod(LinkMovementMethod.getInstance());
+
+    new AlertDialog.Builder(this)
+                   .setView(untrustedIdentityExplanation)
+                   .setPositiveButton(R.string.WebRtcCallScreen_accept, (d, w) -> {
+                     synchronized (SESSION_LOCK) {
+                       TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(WebRtcCallActivity.this);
+                       identityKeyStore.saveIdentity(new SignalProtocolAddress(recipient.requireServiceId(), 1), theirKey, true);
+                     }
+
+                     d.dismiss();
+
+                     Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+                     intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
+                           .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(recipient.getId()));
+
+                     startService(intent);
+                   })
+                   .setNegativeButton(R.string.WebRtcCallScreen_end_call, (d, w) -> {
+                     d.dismiss();
+                     handleTerminate(recipient, HangupMessage.Type.NORMAL);
+                   })
+                   .show();
+  }
+
+  private boolean isSystemPipEnabledAndAvailable() {
+    return Build.VERSION.SDK_INT >= 26 &&
+           getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
   }
 
   private void delayedFinish() {
@@ -323,92 +513,114 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void delayedFinish(int delayMillis) {
-    callScreen.postDelayed(new Runnable() {
-      public void run() {
-        WebRtcCallActivity.this.finish();
-      }
-    }, delayMillis);
+    callScreen.postDelayed(WebRtcCallActivity.this::finish, delayMillis);
   }
 
   @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
   public void onEventMainThread(final WebRtcViewModel event) {
     Log.i(TAG, "Got message from service: " + event);
 
+    viewModel.setRecipient(event.getRecipient());
+
     switch (event.getState()) {
-      case CALL_CONNECTED:          handleCallConnected(event);                                      break;
-      case NETWORK_FAILURE:         handleServerFailure(event);                                      break;
-      case CALL_RINGING:            handleCallRinging(event);                                        break;
-      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), event.getLocalRenderer()); break;
-      case NO_SUCH_USER:            handleNoSuchUser(event);                                         break;
-      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                               break;
-      case CALL_INCOMING:           handleIncomingCall(event);                                       break;
-      case CALL_OUTGOING:           handleOutgoingCall(event);                                       break;
-      case CALL_BUSY:               handleCallBusy(event);                                           break;
-      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                  break;
+      case CALL_CONNECTED:          handleCallConnected(event);                                                break;
+      case NETWORK_FAILURE:         handleServerFailure(event);                                                break;
+      case CALL_RINGING:            handleCallRinging(event);                                                  break;
+      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);          break;
+      case CALL_ACCEPTED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.ACCEPTED);        break;
+      case CALL_DECLINED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.DECLINED);        break;
+      case CALL_ONGOING_ELSEWHERE:  handleTerminate(event.getRecipient(), HangupMessage.Type.BUSY);            break;
+      case CALL_NEEDS_PERMISSION:   handleTerminate(event.getRecipient(), HangupMessage.Type.NEED_PERMISSION); break;
+      case NO_SUCH_USER:            handleNoSuchUser(event);                                                   break;
+      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                                         break;
+      case CALL_INCOMING:           handleIncomingCall(event);                                                 break;
+      case CALL_OUTGOING:           handleOutgoingCall(event);                                                 break;
+      case CALL_BUSY:               handleCallBusy(event);                                                     break;
+      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                            break;
     }
 
-    callScreen.setRemoteVideoEnabled(event.isRemoteVideoEnabled());
-    callScreen.updateAudioState(event.isBluetoothAvailable(), event.isMicrophoneEnabled());
-    callScreen.setControlsEnabled(event.getState() != WebRtcViewModel.State.CALL_INCOMING);
-    callScreen.setLocalVideoState(event.getLocalCameraState(), event.getLocalRenderer());
+    callScreen.setLocalRenderer(event.getLocalRenderer());
+    callScreen.setRemoteRenderer(event.getRemoteRenderer());
 
-    if (event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable) {
+    boolean enableVideo = event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
+
+    viewModel.updateFromWebRtcViewModel(event, enableVideo);
+
+    if (enableVideo) {
       enableVideoIfAvailable = false;
       handleSetMuteVideo(false);
     }
   }
 
-  private class HangupButtonListener implements WebRtcCallScreen.HangupButtonListener {
-    public void onClick() {
+  private final class ControlsListener implements WebRtcCallView.ControlsListener {
+
+    @Override
+    public void onControlsFadeOut() {
+      if (videoTooltip != null) {
+        videoTooltip.dismiss();
+      }
+    }
+
+    @Override
+    public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
+      switch (audioOutput) {
+        case HANDSET:
+          handleSetAudioHandset();
+          break;
+        case HEADSET:
+          handleSetAudioBluetooth();
+          break;
+        case SPEAKER:
+          handleSetAudioSpeaker();
+          break;
+        default:
+          throw new IllegalStateException("Unknown output: " + audioOutput);
+      }
+    }
+
+    @Override
+    public void onVideoChanged(boolean isVideoEnabled) {
+      handleSetMuteVideo(!isVideoEnabled);
+    }
+
+    @Override
+    public void onMicChanged(boolean isMicEnabled) {
+      handleSetMuteAudio(!isMicEnabled);
+    }
+
+    @Override
+    public void onCameraDirectionChanged() {
+      handleFlipCamera();
+    }
+
+    @Override
+    public void onEndCallPressed() {
       handleEndCall();
     }
-  }
 
-  private class AudioMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
     @Override
-    public void onToggle(boolean isMuted) {
-      WebRtcCallActivity.this.handleSetMuteAudio(isMuted);
-    }
-  }
-
-  private class VideoMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
-    @Override
-    public void onToggle(boolean isMuted) {
-      WebRtcCallActivity.this.handleSetMuteVideo(isMuted);
-    }
-  }
-
-  private class CameraFlipButtonListener implements WebRtcCallControls.CameraFlipButtonListener {
-    @Override
-    public void onToggle() {
-      WebRtcCallActivity.this.handleFlipCamera();
-    }
-  }
-
-  private class SpeakerButtonListener implements WebRtcCallControls.SpeakerButtonListener {
-    @Override
-    public void onSpeakerChange(boolean isSpeaker) {
-      WebRtcCallActivity.this.handleSetAudioSpeaker(isSpeaker);
-    }
-  }
-
-  private class BluetoothButtonListener implements WebRtcCallControls.BluetoothButtonListener {
-    @Override
-    public void onBluetoothChange(boolean isBluetooth) {
-      WebRtcCallActivity.this.handleSetAudioBluetooth(isBluetooth);
-    }
-  }
-
-  private class IncomingCallActionListener implements WebRtcAnswerDeclineButton.AnswerDeclineListener {
-    @Override
-    public void onAnswered() {
-      WebRtcCallActivity.this.handleAnswerCall();
+    public void onDenyCallPressed() {
+      handleDenyCall();
     }
 
     @Override
-    public void onDeclined() {
-      WebRtcCallActivity.this.handleDenyCall();
+    public void onAcceptCallWithVoiceOnlyPressed() {
+      handleAnswerWithAudio();
+    }
+
+    @Override
+    public void onAcceptCallPressed() {
+      if (viewModel.isAnswerWithVideoAvailable()) {
+        handleAnswerWithVideo();
+      } else {
+        handleAnswerWithAudio();
+      }
+    }
+
+    @Override
+    public void onDownCaretPressed() {
+
     }
   }
 
-}
+}

app/src/main/java/org/thoughtcrime/securesms/animation/AnimationRepeatListener.java

@@ -0,0 +1,32 @@
+package org.thoughtcrime.securesms.animation;
+
+import android.animation.Animator;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Consumer;
+
+public final class AnimationRepeatListener implements Animator.AnimatorListener {
+
+  private final Consumer<Animator> animationConsumer;
+
+  public AnimationRepeatListener(@NonNull Consumer<Animator> animationConsumer) {
+    this.animationConsumer = animationConsumer;
+  }
+
+  @Override
+  public final void onAnimationStart(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationEnd(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationCancel(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationRepeat(Animator animation) {
+    this.animationConsumer.accept(animation);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleSquareImageViewTransition.java

@@ -0,0 +1,83 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.annotation.TargetApi;
+import android.graphics.drawable.Drawable;
+import android.transition.Transition;
+import android.transition.TransitionValues;
+import android.util.Property;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+
+@TargetApi(21)
+abstract class CircleSquareImageViewTransition extends Transition {
+
+  private static final String CIRCLE_RATIO = "CIRCLE_RATIO";
+
+  private final boolean toCircle;
+
+  CircleSquareImageViewTransition(boolean toCircle) {
+    this.toCircle = toCircle;
+  }
+
+  @Override
+  public void captureStartValues(TransitionValues transitionValues) {
+    View view = transitionValues.view;
+    if (view instanceof ImageView) {
+      transitionValues.values.put(CIRCLE_RATIO, toCircle ? 0f : 1f);
+    }
+  }
+
+  @Override
+  public void captureEndValues(TransitionValues transitionValues) {
+    View view = transitionValues.view;
+    if (view instanceof ImageView) {
+      transitionValues.values.put(CIRCLE_RATIO, toCircle ? 1f : 0f);
+    }
+  }
+
+  @Override
+  public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues, TransitionValues endValues) {
+    if (startValues == null || endValues == null) {
+      return null;
+    }
+
+    ImageView endImageView = (ImageView) endValues.view;
+    float     start        = (float) startValues.values.get(CIRCLE_RATIO);
+    float     end          = (float) endValues.values.get(CIRCLE_RATIO);
+
+    return ObjectAnimator.ofFloat(endImageView, new RadiusRatioProperty(), start, end);
+  }
+
+  static final class RadiusRatioProperty extends Property<ImageView, Float> {
+
+    private float ratio;
+
+    RadiusRatioProperty() {
+      super(Float.class, "circle_ratio");
+    }
+
+    @Override
+    final public void set(ImageView imageView, Float ratio) {
+      this.ratio = ratio;
+      Drawable imageViewDrawable = imageView.getDrawable();
+      if (imageViewDrawable instanceof RoundedBitmapDrawable) {
+        RoundedBitmapDrawable drawable = (RoundedBitmapDrawable) imageViewDrawable;
+        if (ratio > 0.95) {
+          drawable.setCircular(true);
+        } else {
+          drawable.setCornerRadius(Math.min(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()) * ratio * 0.5f);
+        }
+      }
+    }
+
+    @Override
+    public Float get(ImageView object) {
+      return ratio;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleToSquareImageViewTransition.java

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
+ */
+@TargetApi(21)
+public final class CircleToSquareImageViewTransition extends CircleSquareImageViewTransition {
+  public CircleToSquareImageViewTransition(Context context, AttributeSet attrs) {
+    super(false);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/SquareToCircleImageViewTransition.java

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
+ */
+@TargetApi(21)
+public final class SquareToCircleImageViewTransition extends CircleSquareImageViewTransition {
+  public SquareToCircleImageViewTransition(Context context, AttributeSet attrs) {
+    super(true);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
@@ -19,6 +21,8 @@ public abstract class Attachment {
   @Nullable
   private final String fileName;
 
+  private final int    cdnNumber;
+
   @Nullable
   private final String  location;
 
@@ -35,10 +39,11 @@ public abstract class Attachment {
   private final String fastPreflightId;
 
   private final boolean voiceNote;
-  private final int width;
-  private final int height;
-
+  private final boolean borderless;
+  private final int     width;
+  private final int     height;
   private final boolean quote;
+  private final long    uploadTimestamp;
 
   @Nullable
   private final String caption;
@@ -49,31 +54,54 @@ public abstract class Attachment {
   @Nullable
   private final BlurHash blurHash;
 
+  @Nullable
+  private final AudioHash audioHash;
+
   @NonNull
   private final TransformProperties transformProperties;
 
-  public Attachment(@NonNull String contentType, int transferState, long size, @Nullable String fileName,
-                    @Nullable String location, @Nullable String key, @Nullable String relay,
-                    @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                    int width, int height, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
-                    @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  public Attachment(@NonNull String contentType,
+                    int transferState,
+                    long size,
+                    @Nullable String fileName,
+                    int cdnNumber,
+                    @Nullable String location,
+                    @Nullable String key,
+                    @Nullable String relay,
+                    @Nullable byte[] digest,
+                    @Nullable String fastPreflightId,
+                    boolean voiceNote,
+                    boolean borderless,
+                    int width,
+                    int height,
+                    boolean quote,
+                    long uploadTimestamp,
+                    @Nullable String caption,
+                    @Nullable StickerLocator stickerLocator,
+                    @Nullable BlurHash blurHash,
+                    @Nullable AudioHash audioHash,
+                    @Nullable TransformProperties transformProperties)
   {
     this.contentType         = contentType;
     this.transferState       = transferState;
     this.size                = size;
     this.fileName            = fileName;
+    this.cdnNumber           = cdnNumber;
     this.location            = location;
     this.key                 = key;
     this.relay               = relay;
     this.digest              = digest;
     this.fastPreflightId     = fastPreflightId;
     this.voiceNote           = voiceNote;
+    this.borderless          = borderless;
     this.width               = width;
     this.height              = height;
     this.quote               = quote;
+    this.uploadTimestamp     = uploadTimestamp;
     this.stickerLocator      = stickerLocator;
     this.caption             = caption;
     this.blurHash            = blurHash;
+    this.audioHash           = audioHash;
     this.transformProperties = transformProperties != null ? transformProperties : TransformProperties.empty();
   }
 
@@ -106,6 +134,10 @@ public abstract class Attachment {
     return contentType;
   }
 
+  public int getCdnNumber() {
+    return cdnNumber;
+  }
+
   @Nullable
   public String getLocation() {
     return location;
@@ -135,6 +167,10 @@ public abstract class Attachment {
     return voiceNote;
   }
 
+  public boolean isBorderless() {
+    return borderless;
+  }
+
   public int getWidth() {
     return width;
   }
@@ -147,6 +183,10 @@ public abstract class Attachment {
     return quote;
   }
 
+  public long getUploadTimestamp() {
+    return uploadTimestamp;
+  }
+
   public boolean isSticker() {
     return stickerLocator != null;
   }
@@ -159,6 +199,10 @@ public abstract class Attachment {
     return blurHash;
   }
 
+  public @Nullable AudioHash getAudioHash() {
+    return audioHash;
+  }
+
   public @Nullable String getCaption() {
     return caption;
   }

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java

@@ -2,11 +2,10 @@ package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
@@ -21,16 +20,34 @@ public class DatabaseAttachment extends Attachment {
   private final boolean      hasThumbnail;
   private final int          displayOrder;
 
-  public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
-                            boolean hasData, boolean hasThumbnail,
-                            String contentType, int transferProgress, long size,
-                            String fileName, String location, String key, String relay,
-                            byte[] digest, String fastPreflightId, boolean voiceNote,
-                            int width, int height, boolean quote, @Nullable String caption,
-                            @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash,
-                            @Nullable TransformProperties transformProperties, int displayOrder)
+  public DatabaseAttachment(AttachmentId attachmentId,
+                            long mmsId,
+                            boolean hasData,
+                            boolean hasThumbnail,
+                            String contentType,
+                            int transferProgress,
+                            long size,
+                            String fileName,
+                            int cdnNumber,
+                            String location,
+                            String key,
+                            String relay,
+                            byte[] digest,
+                            String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            int width,
+                            int height,
+                            boolean quote,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
+                            @Nullable BlurHash blurHash,
+                            @Nullable AudioHash audioHash,
+                            @Nullable TransformProperties transformProperties,
+                            int displayOrder,
+                            long uploadTimestamp)
   {
-    super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;

app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase;
 public class MmsNotificationAttachment extends Attachment {
 
   public MmsNotificationAttachment(int status, long size) {
-    super("application/mms", getTransferStateFromStatus(status), size, null, null, null, null, null, null, false, 0, 0, false, null, null, null, null);
+    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, false, false, 0, 0, false, 0, null, null, null, null, null);
   }
 
   @Nullable

app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java

@@ -4,6 +4,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
@@ -17,14 +18,26 @@ import java.util.List;
 
 public class PointerAttachment extends Attachment {
 
-  private PointerAttachment(@NonNull String contentType, int transferState, long size,
-                            @Nullable String fileName,  @NonNull String location,
-                            @Nullable String key, @Nullable String relay,
-                            @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                            int width, int height, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+  private PointerAttachment(@NonNull String contentType,
+                            int transferState,
+                            long size,
+                            @Nullable String fileName,
+                            int cdnNumber,
+                            @NonNull String location,
+                            @Nullable String key,
+                            @Nullable String relay,
+                            @Nullable byte[] digest,
+                            @Nullable String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            int width,
+                            int height,
+                            long uploadTimestamp,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
                             @Nullable BlurHash blurHash)
   {
-    super(contentType, transferState, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, caption, stickerLocator, blurHash, null);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
   }
 
   @Nullable
@@ -90,19 +103,22 @@ public class PointerAttachment extends Attachment {
     }
 
     return Optional.of(new PointerAttachment(pointer.get().getContentType(),
-                                      AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
-                                      pointer.get().asPointer().getSize().or(0),
-                                      pointer.get().asPointer().getFileName().orNull(),
-                                      String.valueOf(pointer.get().asPointer().getId()),
-                                      encodedKey, null,
-                                      pointer.get().asPointer().getDigest().orNull(),
-                                      fastPreflightId,
-                                      pointer.get().asPointer().getVoiceNote(),
-                                      pointer.get().asPointer().getWidth(),
-                                      pointer.get().asPointer().getHeight(),
-                                      pointer.get().asPointer().getCaption().orNull(),
-                                      stickerLocator,
-                                      BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
+                                             AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                             pointer.get().asPointer().getSize().or(0),
+                                             pointer.get().asPointer().getFileName().orNull(),
+                                             pointer.get().asPointer().getCdnNumber(),
+                                             pointer.get().asPointer().getRemoteId().toString(),
+                                             encodedKey, null,
+                                             pointer.get().asPointer().getDigest().orNull(),
+                                             fastPreflightId,
+                                             pointer.get().asPointer().getVoiceNote(),
+                                             pointer.get().asPointer().isBorderless(),
+                                             pointer.get().asPointer().getWidth(),
+                                             pointer.get().asPointer().getHeight(),
+                                             pointer.get().asPointer().getUploadTimestamp(),
+                                             pointer.get().asPointer().getCaption().orNull(),
+                                             stickerLocator,
+                                             BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
 
   }
 
@@ -113,14 +129,17 @@ public class PointerAttachment extends Attachment {
                                              AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
                                              thumbnail != null ? thumbnail.asPointer().getSize().or(0) : 0,
                                              pointer.getFileName(),
-                                             String.valueOf(thumbnail != null ? thumbnail.asPointer().getId() : 0),
+                                             thumbnail != null ? thumbnail.asPointer().getCdnNumber() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getRemoteId().toString() : "0",
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orNull() : null,
                                              null,
                                              false,
+                                             false,
                                              thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getCaption().orNull() : null,
                                              null,
                                              null));

app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 public class TombstoneAttachment extends Attachment {
 
   public TombstoneAttachment(@NonNull String contentType, boolean quote) {
-    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, null, null, null, null, null, false, 0, 0, quote, null, null, null, null);
+    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, false, 0, 0, quote, 0, null, null, null, null, null);
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java

@@ -1,11 +1,12 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
@@ -14,20 +15,42 @@ public class UriAttachment extends Attachment {
   private final @NonNull  Uri dataUri;
   private final @Nullable Uri thumbnailUri;
 
-  public UriAttachment(@NonNull Uri uri, @NonNull String contentType, int transferState, long size,
-                       @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption,
-                       @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  public UriAttachment(@NonNull Uri uri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       @Nullable String fileName,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
   {
-    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator, blurHash, transformProperties);
+    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
   }
 
-  public UriAttachment(@NonNull Uri dataUri, @Nullable Uri thumbnailUri,
-                       @NonNull String contentType, int transferState, long size, int width, int height,
-                       @Nullable String fileName, @Nullable String fastPreflightId,
-                       boolean voiceNote, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
-                       @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  public UriAttachment(@NonNull Uri dataUri,
+                       @Nullable Uri thumbnailUri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       int width,
+                       int height,
+                       @Nullable String fileName,
+                       @Nullable String fastPreflightId,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
   {
-    super(contentType, transferState, size, fileName, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.dataUri      = dataUri;
     this.thumbnailUri = thumbnailUri;
   }

app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java

@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms.audio;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
+import org.whispersystems.util.Base64;
+
+import java.io.IOException;
+
+/**
+ * An AudioHash is a compact string representation of the wave form and duration for an audio file.
+ */
+public final class AudioHash {
+
+  @NonNull private final String            hash;
+  @NonNull private final AudioWaveFormData audioWaveForm;
+
+  private AudioHash(@NonNull String hash, @NonNull AudioWaveFormData audioWaveForm) {
+    this.hash          = hash;
+    this.audioWaveForm = audioWaveForm;
+  }
+
+  public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
+    this(Base64.encodeBytes(audioWaveForm.toByteArray()), audioWaveForm);
+  }
+
+  public static @Nullable AudioHash parseOrNull(@Nullable String hash) {
+    if (hash == null) return null;
+    try {
+      return new AudioHash(hash, AudioWaveFormData.parseFrom(Base64.decode(hash)));
+    } catch (IOException e) {
+      return null;
+    }
+  }
+
+  @NonNull AudioWaveFormData getAudioWaveForm() {
+    return audioWaveForm;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    AudioHash other = (AudioHash) o;
+    return hash.equals(other.hash);
+  }
+
+  @Override
+  public int hashCode() {
+    return hash.hashCode();
+  }
+
+  public @NonNull String getHash() {
+    return hash;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java

@@ -0,0 +1,311 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.Uri;
+import android.os.Build;
+import android.util.LruCache;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.WorkerThread;
+import androidx.core.util.Consumer;
+
+import com.google.protobuf.ByteString;
+
+import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
+import org.thoughtcrime.securesms.media.MediaInput;
+import org.thoughtcrime.securesms.mms.AudioSlide;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Locale;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+public final class AudioWaveForm {
+
+  private static final String TAG = Log.tag(AudioWaveForm.class);
+
+  private static final int BAR_COUNT       = 46;
+  private static final int SAMPLES_PER_BAR =  4;
+
+  private final Context    context;
+  private final AudioSlide slide;
+
+  public AudioWaveForm(@NonNull Context context, @NonNull AudioSlide slide) {
+    this.context = context.getApplicationContext();
+    this.slide   = slide;
+  }
+
+  private static final LruCache<String, AudioFileInfo> WAVE_FORM_CACHE        = new LruCache<>(200);
+  private static final Executor                        AUDIO_DECODER_EXECUTOR = new SerialExecutor(SignalExecutors.BOUNDED);
+
+  @AnyThread
+  public void getWaveForm(@NonNull Consumer<AudioFileInfo> onSuccess, @NonNull Runnable onFailure) {
+    Uri        uri        = slide.getUri();
+    Attachment attachment = slide.asAttachment();
+
+    if (uri == null) {
+      Log.w(TAG, "No uri");
+      Util.runOnMain(onFailure);
+      return;
+    }
+
+    if (!(attachment instanceof DatabaseAttachment)) {
+      Log.i(TAG, "Not yet in database");
+      Util.runOnMain(onFailure);
+      return;
+    }
+
+    String        cacheKey = uri.toString();
+    AudioFileInfo cached   = WAVE_FORM_CACHE.get(cacheKey);
+    if (cached != null) {
+      Log.i(TAG, "Loaded wave form from cache " + cacheKey);
+      Util.runOnMain(() -> onSuccess.accept(cached));
+      return;
+    }
+
+    AUDIO_DECODER_EXECUTOR.execute(() -> {
+      AudioFileInfo cachedInExecutor = WAVE_FORM_CACHE.get(cacheKey);
+      if (cachedInExecutor != null) {
+        Log.i(TAG, "Loaded wave form from cache inside executor" + cacheKey);
+        Util.runOnMain(() -> onSuccess.accept(cachedInExecutor));
+        return;
+      }
+
+      AudioHash audioHash = attachment.getAudioHash();
+      if (audioHash != null) {
+        AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
+        if (audioFileInfo.waveForm.length == 0) {
+          Log.w(TAG, "Recovering from a wave form generation error  " + cacheKey);
+          Util.runOnMain(onFailure);
+          return;
+        } else if (audioFileInfo.waveForm.length != BAR_COUNT) {
+          Log.w(TAG, "Wave form from database does not match bar count, regenerating " + cacheKey);
+        } else {
+          WAVE_FORM_CACHE.put(cacheKey, audioFileInfo);
+          Log.i(TAG, "Loaded wave form from DB " + cacheKey);
+          Util.runOnMain(() -> onSuccess.accept(audioFileInfo));
+          return;
+        }
+      }
+
+      try {
+        AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+        DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
+        long               startTime          = System.currentTimeMillis();
+
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), AudioWaveFormData.getDefaultInstance());
+
+        Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
+
+        AudioFileInfo fileInfo = generateWaveForm(uri);
+
+        Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
+
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
+
+        WAVE_FORM_CACHE.put(cacheKey, fileInfo);
+        Util.runOnMain(() -> onSuccess.accept(fileInfo));
+      } catch (Throwable e) {
+        Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
+        Util.runOnMain(onFailure);
+      }
+    });
+  }
+
+  /**
+   * Based on decode sample from:
+   * <p>
+   * https://android.googlesource.com/platform/cts/+/jb-mr2-release/tests/tests/media/src/android/media/cts/DecoderTest.java
+   */
+  @WorkerThread
+  @RequiresApi(api = 23)
+  private @NonNull AudioFileInfo generateWaveForm(@NonNull Uri uri) throws IOException {
+    try (MediaInput dataSource = DecryptableUriMediaInput.createForUri(context, uri)) {
+      long[] wave        = new long[BAR_COUNT];
+      int[]  waveSamples = new int[BAR_COUNT];
+
+      MediaExtractor extractor = dataSource.createExtractor();
+
+      if (extractor.getTrackCount() == 0) {
+        throw new IOException("No audio track");
+      }
+
+      MediaFormat format = extractor.getTrackFormat(0);
+
+      if (!format.containsKey(MediaFormat.KEY_DURATION)) {
+        throw new IOException("Unknown duration");
+      }
+
+      long   totalDurationUs = format.getLong(MediaFormat.KEY_DURATION);
+      String mime            = format.getString(MediaFormat.KEY_MIME);
+
+      if (!mime.startsWith("audio/")) {
+        throw new IOException("Mime not audio");
+      }
+
+      MediaCodec codec = MediaCodec.createDecoderByType(mime);
+
+      if (totalDurationUs == 0) {
+        throw new IOException("Zero duration");
+      }
+
+      codec.configure(format, null, null, 0);
+      codec.start();
+
+      ByteBuffer[] codecInputBuffers  = codec.getInputBuffers();
+      ByteBuffer[] codecOutputBuffers = codec.getOutputBuffers();
+
+      extractor.selectTrack(0);
+
+      long                  kTimeOutUs      = 5000;
+      MediaCodec.BufferInfo info            = new MediaCodec.BufferInfo();
+      boolean               sawInputEOS     = false;
+      boolean               sawOutputEOS    = false;
+      int                   noOutputCounter = 0;
+
+      while (!sawOutputEOS && noOutputCounter < 50) {
+        noOutputCounter++;
+        if (!sawInputEOS) {
+          int inputBufIndex = codec.dequeueInputBuffer(kTimeOutUs);
+          if (inputBufIndex >= 0) {
+            ByteBuffer dstBuf             = codecInputBuffers[inputBufIndex];
+            int        sampleSize         = extractor.readSampleData(dstBuf, 0);
+            long       presentationTimeUs = 0;
+
+            if (sampleSize < 0) {
+              sawInputEOS = true;
+              sampleSize  = 0;
+            } else {
+              presentationTimeUs = extractor.getSampleTime();
+            }
+
+            codec.queueInputBuffer(
+              inputBufIndex,
+              0,
+              sampleSize,
+              presentationTimeUs,
+              sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+
+            if (!sawInputEOS) {
+              int barSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              sawInputEOS = !extractor.advance();
+              int nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              while (!sawInputEOS && nextBarSampleIndex == barSampleIndex) {
+                sawInputEOS = !extractor.advance();
+                if (!sawInputEOS) {
+                  nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+                }
+              }
+            }
+          }
+        }
+
+        int outputBufferIndex;
+        do {
+          outputBufferIndex = codec.dequeueOutputBuffer(info, kTimeOutUs);
+          if (outputBufferIndex >= 0) {
+            if (info.size > 0) {
+              noOutputCounter = 0;
+            }
+
+            ByteBuffer buf = codecOutputBuffers[outputBufferIndex];
+            int barIndex = (int) ((wave.length * info.presentationTimeUs) / totalDurationUs);
+            long total = 0;
+            for (int i = 0; i < info.size; i += 2 * 4) {
+              short aShort = buf.getShort(i);
+              total += Math.abs(aShort);
+            }
+            if (barIndex >= 0 && barIndex < wave.length) {
+              wave[barIndex] += total;
+              waveSamples[barIndex] += info.size / 2;
+            }
+            codec.releaseOutputBuffer(outputBufferIndex, false);
+            if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+              sawOutputEOS = true;
+            }
+          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+            codecOutputBuffers = codec.getOutputBuffers();
+          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+            Log.d(TAG, "output format has changed to " + codec.getOutputFormat());
+          }
+        } while (outputBufferIndex >= 0);
+      }
+
+      codec.stop();
+      codec.release();
+      extractor.release();
+
+      float[] floats = new float[BAR_COUNT];
+      byte[]  bytes  = new byte[BAR_COUNT];
+      float   max    = 0;
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        if (waveSamples[i] == 0) continue;
+
+        floats[i] = wave[i] / (float) waveSamples[i];
+        if (floats[i] > max) {
+          max = floats[i];
+        }
+      }
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        float normalized = floats[i] / max;
+        bytes[i] = (byte) (255 * normalized);
+      }
+
+      return new AudioFileInfo(totalDurationUs, bytes);
+    }
+  }
+
+  public static class AudioFileInfo {
+    private final long    durationUs;
+    private final byte[]  waveFormBytes;
+    private final float[] waveForm;
+
+    private static @NonNull AudioFileInfo fromDatabaseProtobuf(@NonNull AudioWaveFormData audioWaveForm) {
+      return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
+    }
+
+    private AudioFileInfo(long durationUs, byte[] waveFormBytes) {
+      this.durationUs    = durationUs;
+      this.waveFormBytes = waveFormBytes;
+      this.waveForm      = new float[waveFormBytes.length];
+
+      for (int i = 0; i < waveFormBytes.length; i++) {
+        int unsigned = waveFormBytes[i] & 0xff;
+        this.waveForm[i] = unsigned / 255f;
+      }
+    }
+
+    public long getDuration(@NonNull TimeUnit timeUnit) {
+      return timeUnit.convert(durationUs, TimeUnit.MICROSECONDS);
+    }
+
+    public float[] getWaveForm() {
+      return waveForm;
+    }
+
+    private @NonNull AudioWaveFormData toDatabaseProtobuf() {
+      return AudioWaveFormData.newBuilder()
+                              .setDurationUs(durationUs)
+                              .setWaveForm(ByteString.copyFrom(waveFormBytes))
+                              .build();
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java

@@ -1,149 +0,0 @@
-package org.thoughtcrime.securesms.avatar;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.MediaStore;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
-import com.theartofdev.edmodo.cropper.CropImage;
-import com.theartofdev.edmodo.cropper.CropImageView;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.util.FileProviderUtil;
-import org.thoughtcrime.securesms.util.IntentUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import static android.provider.MediaStore.EXTRA_OUTPUT;
-
-public final class AvatarSelection {
-
-  private static final String TAG = AvatarSelection.class.getSimpleName();
-
-  private AvatarSelection() {
-  }
-
-  public static final int REQUEST_CODE_CROP_IMAGE = CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE;
-  public static final int REQUEST_CODE_AVATAR     = REQUEST_CODE_CROP_IMAGE + 1;
-
-  /**
-   * Returns result on {@link #REQUEST_CODE_CROP_IMAGE}
-   */
-  public static void circularCropImage(Activity activity, Uri inputFile, Uri outputFile, @StringRes int title) {
-    CropImage.activity(inputFile)
-             .setGuidelines(CropImageView.Guidelines.ON)
-             .setAspectRatio(1, 1)
-             .setCropShape(CropImageView.CropShape.OVAL)
-             .setOutputUri(outputFile)
-             .setAllowRotation(true)
-             .setAllowFlipping(true)
-             .setBackgroundColor(ContextCompat.getColor(activity, R.color.avatar_background))
-             .setActivityTitle(activity.getString(title))
-             .start(activity);
-  }
-
-  /**
-   * Returns result on {@link #REQUEST_CODE_CROP_IMAGE}
-   */
-  public static void circularCropImage(Fragment fragment, Uri inputFile, Uri outputFile, @StringRes int title) {
-    CropImage.activity(inputFile)
-             .setGuidelines(CropImageView.Guidelines.ON)
-             .setAspectRatio(1, 1)
-             .setCropShape(CropImageView.CropShape.OVAL)
-             .setOutputUri(outputFile)
-             .setAllowRotation(true)
-             .setAllowFlipping(true)
-             .setBackgroundColor(ContextCompat.getColor(fragment.requireContext(), R.color.avatar_background))
-             .setActivityTitle(fragment.requireContext().getString(title))
-             .start(fragment.requireContext(), fragment);
-  }
-
-  public static Uri getResultUri(Intent data) {
-    return CropImage.getActivityResult(data).getUri();
-  }
-
-  /**
-   * Returns result on {@link #REQUEST_CODE_AVATAR}
-   *
-   * @return Temporary capture file if created.
-   */
-  public static File startAvatarSelection(Activity activity, boolean includeClear, boolean attemptToIncludeCamera) {
-    File captureFile  = attemptToIncludeCamera ? getCaptureFile(activity) : null;
-
-    Intent chooserIntent = createAvatarSelectionIntent(activity, captureFile, includeClear);
-    activity.startActivityForResult(chooserIntent, REQUEST_CODE_AVATAR);
-    return captureFile;
-  }
-
-  /**
-   * Returns result on {@link #REQUEST_CODE_AVATAR}
-   *
-   * @return Temporary capture file if created.
-   */
-  public static File startAvatarSelection(Fragment fragment, boolean includeClear, boolean attemptToIncludeCamera) {
-    File captureFile  = attemptToIncludeCamera ? getCaptureFile(fragment.requireContext()) : null;
-
-    Intent chooserIntent = createAvatarSelectionIntent(fragment.requireContext(), captureFile, includeClear);
-    fragment.startActivityForResult(chooserIntent, REQUEST_CODE_AVATAR);
-    return captureFile;
-  }
-
-  private static @Nullable File getCaptureFile(@NonNull Context context) {
-    if (!Permissions.hasAll(context, Manifest.permission.CAMERA)) {
-      return null;
-    }
-
-    try {
-      return File.createTempFile("capture", "jpg", context.getExternalCacheDir());
-    } catch (IOException e) {
-      Log.w(TAG, e);
-      return null;
-    }
-  }
-
-  private static Intent createAvatarSelectionIntent(Context context, @Nullable File tempCaptureFile, boolean includeClear) {
-    List<Intent> extraIntents  = new LinkedList<>();
-    Intent       galleryIntent = new Intent(Intent.ACTION_PICK);
-
-    galleryIntent.setDataAndType(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*");
-
-    if (!IntentUtils.isResolvable(context, galleryIntent)) {
-      galleryIntent = new Intent(Intent.ACTION_GET_CONTENT);
-      galleryIntent.setType("image/*");
-    }
-
-    if (tempCaptureFile != null) {
-      Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-
-      if (cameraIntent.resolveActivity(context.getPackageManager()) != null) {
-        cameraIntent.putExtra(EXTRA_OUTPUT, FileProviderUtil.getUriFor(context, tempCaptureFile));
-        extraIntents.add(cameraIntent);
-      }
-    }
-
-    if (includeClear) {
-      extraIntents.add(new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"));
-    }
-
-    Intent chooserIntent = Intent.createChooser(galleryIntent, context.getString(R.string.CreateProfileActivity_profile_photo));
-
-    if (!extraIntents.isEmpty()) {
-      chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, extraIntents.toArray(new Intent[0]));
-    }
-
-    return chooserIntent;
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java

@@ -4,19 +4,25 @@ package org.thoughtcrime.securesms.backup;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
+import org.thoughtcrime.securesms.registration.fragments.RestoreBackupFragment;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.util.BackupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.text.AfterTextChanged;
 
 public class BackupDialog {
 
@@ -83,4 +89,35 @@ public class BackupDialog {
                    .create()
                    .show();
   }
+
+  public static void showVerifyBackupPassphraseDialog(@NonNull Context context) {
+    View        view   = LayoutInflater.from(context).inflate(R.layout.enter_backup_passphrase_dialog, null);
+    EditText    prompt = view.findViewById(R.id.restore_passphrase_input);
+    AlertDialog dialog = new AlertDialog.Builder(context)
+                                        .setTitle(R.string.BackupDialog_enter_backup_passphrase_to_verify)
+                                        .setView(view)
+                                        .setPositiveButton(R.string.BackupDialog_verify, null)
+                                        .setNegativeButton(android.R.string.cancel, null)
+                                        .show();
+
+    Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+    positiveButton.setEnabled(false);
+
+    RestoreBackupFragment.PassphraseAsYouTypeFormatter formatter = new RestoreBackupFragment.PassphraseAsYouTypeFormatter();
+
+    prompt.addTextChangedListener(new AfterTextChanged(editable -> {
+        formatter.afterTextChanged(editable);
+        positiveButton.setEnabled(editable.length() == BackupUtil.PASSPHRASE_LENGTH);
+      }));
+
+    positiveButton.setOnClickListener(v -> {
+                                        String passphrase = prompt.getText().toString();
+                                        if (passphrase.equals(BackupPassphrase.get(context))) {
+                                          Toast.makeText(context, R.string.BackupDialog_you_successfully_entered_your_backup_passphrase, Toast.LENGTH_SHORT).show();
+                                          dialog.dismiss();
+                                        } else {
+                                          Toast.makeText(context, R.string.BackupDialog_passphrase_was_not_correct, Toast.LENGTH_SHORT).show();
+                                        }
+                                      });
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.backup;
 
 import android.content.Context;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -12,26 +13,30 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 /**
  * Allows the getting and setting of the backup passphrase, which is stored encrypted on API >= 23.
  */
-public class BackupPassphrase {
+public final class BackupPassphrase {
+
+  private BackupPassphrase() {
+  }
 
   private static final String TAG = BackupPassphrase.class.getSimpleName();
 
-  public static String get(@NonNull Context context) {
+  public static @Nullable String get(@NonNull Context context) {
     String passphrase          = TextSecurePreferences.getBackupPassphrase(context);
     String encryptedPassphrase = TextSecurePreferences.getEncryptedBackupPassphrase(context);
 
     if (Build.VERSION.SDK_INT < 23 || (passphrase == null && encryptedPassphrase == null)) {
-      return passphrase;
+      return stripSpaces(passphrase);
     }
 
     if (encryptedPassphrase == null) {
       Log.i(TAG, "Migrating to encrypted passphrase.");
       set(context, passphrase);
       encryptedPassphrase = TextSecurePreferences.getEncryptedBackupPassphrase(context);
+      if (encryptedPassphrase == null) throw new AssertionError("Passphrase migration failed");
     }
 
     KeyStoreHelper.SealedData data = KeyStoreHelper.SealedData.fromString(encryptedPassphrase);
-    return new String(KeyStoreHelper.unseal(data));
+    return stripSpaces(new String(KeyStoreHelper.unseal(data)));
   }
 
   public static void set(@NonNull Context context, @Nullable String passphrase) {
@@ -44,4 +49,8 @@ public class BackupPassphrase {
       TextSecurePreferences.setBackupPassphrase(context, null);
     }
   }
+
+  private static String stripSpaces(@Nullable String passphrase) {
+    return passphrase != null ? passphrase.replace(" ", "") : null;
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java

@@ -21,15 +21,16 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
 import org.thoughtcrime.securesms.database.JobDatabase;
+import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
+import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -40,7 +41,6 @@ import org.whispersystems.libsignal.kdf.HKDFv3;
 import org.whispersystems.libsignal.util.ByteUtil;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,7 +48,6 @@ import java.io.OutputStream;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -74,7 +73,8 @@ public class FullBackupExporter extends FullBackupBase {
     SearchDatabase.MMS_FTS_TABLE_NAME,
     JobDatabase.JOBS_TABLE_NAME,
     JobDatabase.CONSTRAINTS_TABLE_NAME,
-    JobDatabase.DEPENDENCIES_TABLE_NAME
+    JobDatabase.DEPENDENCIES_TABLE_NAME,
+    KeyValueDatabase.TABLE_NAME
   );
 
   public static void export(@NonNull Context context,
@@ -96,7 +96,9 @@ public class FullBackupExporter extends FullBackupBase {
 
       for (String table : tables) {
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMessage, null, count);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count);
+        } else if (table.equals(SmsDatabase.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
@@ -116,9 +118,11 @@ public class FullBackupExporter extends FullBackupBase {
 
       stopwatch.split("prefs");
 
-      for (File avatar : AvatarHelper.getAvatarFiles(context)) {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
-        outputStream.write(avatar.getName(), new FileInputStream(avatar), avatar.length());
+      for (AvatarHelper.Avatar avatar : AvatarHelper.getAvatars(context)) {
+        if (avatar != null) {
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+          outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
+        }
       }
 
       stopwatch.split("avatars");
@@ -281,11 +285,15 @@ public class FullBackupExporter extends FullBackupBase {
     return result;
   }
 
-  private static boolean isNonExpiringMessage(@NonNull Cursor cursor) {
+  private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
     return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
            cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
   }
 
+  private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
+    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
+  }
+
   private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long mmsId) {
     String[] columns = new String[] { MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE};
     String   where   = MmsDatabase.ID + " = ?";

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java

@@ -165,6 +165,7 @@ public class FullBackupImporter extends FullBackupBase {
 
     ContentValues contentValues = new ContentValues();
     contentValues.put(StickerDatabase.FILE_PATH, dataFile.getAbsolutePath());
+    contentValues.put(StickerDatabase.FILE_LENGTH, sticker.getLength());
     contentValues.put(StickerDatabase.FILE_RANDOM, output.first);
 
     db.update(StickerDatabase.TABLE_NAME, contentValues,
@@ -175,7 +176,7 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processAvatar(@NonNull Context context, @NonNull SQLiteDatabase db, @NonNull BackupProtos.Avatar avatar, @NonNull BackupRecordInputStream inputStream) throws IOException {
     if (avatar.hasRecipientId()) {
       RecipientId recipientId = RecipientId.from(avatar.getRecipientId());
-      inputStream.readAttachmentTo(new FileOutputStream(AvatarHelper.getAvatarFile(context, recipientId)), avatar.getLength());
+      inputStream.readAttachmentTo(AvatarHelper.getOutputStream(context, recipientId), avatar.getLength());
     } else {
       if (avatar.hasName() && SqlUtil.tableExists(db, "recipient_preferences")) {
         Log.w(TAG, "Avatar is missing a recipientId. Clearing signal_profile_avatar (legacy) so it can be fetched later.");

app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
 import android.graphics.Color;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
@@ -26,6 +27,7 @@ public enum MaterialColor {
   PLUM       (R.color.conversation_plumb,       R.color.conversation_plumb_tint,       R.color.conversation_plumb_shade,       "pink"),
   TAUPE      (R.color.conversation_taupe,       R.color.conversation_taupe_tint,       R.color.conversation_taupe_shade,       "blue_grey"),
   STEEL      (R.color.conversation_steel,       R.color.conversation_steel_tint,       R.color.conversation_steel_shade,       "grey"),
+  ULTRAMARINE(R.color.conversation_ultramarine, R.color.conversation_ultramarine_tint, R.color.conversation_ultramarine_shade, "ultramarine"),
   GROUP      (R.color.conversation_group,       R.color.conversation_group_tint,       R.color.conversation_group_shade,       "blue");
 
   private static final Map<String, MaterialColor> COLOR_MATCHES = new HashMap<String, MaterialColor>() {{
@@ -48,6 +50,7 @@ public enum MaterialColor {
     put("lime",        WINTERGREEN);
     put("blue_grey",   TAUPE);
     put("grey",        STEEL);
+    put("ultramarine", ULTRAMARINE);
     put("group_color", GROUP);
   }};
 

app/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java

@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
+
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -11,18 +13,19 @@ import java.util.List;
 public class MaterialColors {
 
   public static final MaterialColorList CONVERSATION_PALETTE = new MaterialColorList(new ArrayList<>(Arrays.asList(
-    MaterialColor.PLUM,
-    MaterialColor.CRIMSON,
-    MaterialColor.VERMILLION,
-    MaterialColor.VIOLET,
-    MaterialColor.BLUE,
-    MaterialColor.INDIGO,
-    MaterialColor.FOREST,
-    MaterialColor.WINTERGREEN,
-    MaterialColor.TEAL,
-    MaterialColor.BURLAP,
-    MaterialColor.TAUPE,
-    MaterialColor.STEEL
+      MaterialColor.PLUM,
+      MaterialColor.CRIMSON,
+      MaterialColor.VERMILLION,
+      MaterialColor.VIOLET,
+      MaterialColor.INDIGO,
+      MaterialColor.TAUPE,
+      MaterialColor.ULTRAMARINE,
+      MaterialColor.BLUE,
+      MaterialColor.TEAL,
+      MaterialColor.FOREST,
+      MaterialColor.WINTERGREEN,
+      MaterialColor.BURLAP,
+      MaterialColor.STEEL
   )));
 
   public static class MaterialColorList {
@@ -51,7 +54,7 @@ public class MaterialColors {
       return null;
     }
 
-    public int[] asConversationColorArray(@NonNull Context context) {
+    public @ColorInt int[] asConversationColorArray(@NonNull Context context) {
       int[] results = new int[colors.size()];
       int   index   = 0;
 
@@ -61,9 +64,6 @@ public class MaterialColors {
 
       return results;
     }
-
   }
-
-
 }
 

app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java

@@ -2,20 +2,14 @@ package org.thoughtcrime.securesms.components;
 
 
 import android.content.Context;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
-import android.widget.ToggleButton;
 
-public class AccessibleToggleButton extends ToggleButton {
+import androidx.appcompat.widget.AppCompatToggleButton;
+
+public class AccessibleToggleButton extends AppCompatToggleButton {
 
   private OnCheckedChangeListener listener;
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-  }
-
   public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
   }