Bump version to 4.63.2

Fixes #9626

.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

.tx/config

@@ -1,10 +0,0 @@
-[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
-
-[signal-android.master]
-file_filter = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
-source_lang = en
-type = ANDROID
-

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-2017 Open Whisper Systems
+Copyright 2013-2020 Signal
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

app/.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+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
+source_file = src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

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,122 +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:ringrtc-android:0.2.0'
-
-    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'
-    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
-    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
-        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    testImplementation 'org.robolectric:robolectric:4.2'
-    testImplementation 'org.robolectric:shadows-multidex:4.2'
-}
-
-dependencyVerification {
-    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
-}
-
-def canonicalVersionCode = 582
-def canonicalVersionName = "4.52.2"
+def canonicalVersionCode = 655
+def canonicalVersionName = "4.63.2"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -229,17 +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", "USER_AGENT", "\"OWA\""
-        buildConfigField "boolean", "DEV_BUILD", "false"
-        buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
-        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"f2e2a5004794a6c1bac5c4949eadbc243dd02e02d1a93f10fe24584fb70815d8\""
-        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"f51f435802ada769e67aaf5744372bb7e7d519eecf996d335eb5b46b872b5789\""
+        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
+        buildConfigField "String", "CDS_MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
+        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"
 
@@ -257,6 +144,8 @@ android {
                 universalApk true
             }
         }
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
@@ -305,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", "\"b5a865941f95887018c86725cc92308d34a3084dc2b4e7bd2de5e5e1690b50c6\""
+            buildConfigField "String", "CDS_MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
+            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
@@ -345,32 +240,6 @@ android {
         }
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile '../AndroidManifest.xml'
-            java.srcDirs = ['../src']
-            resources.srcDirs = ['../src']
-            aidl.srcDirs = ['../src']
-            renderscript.srcDirs = ['../src']
-            res.srcDirs = ['../res']
-            assets.srcDirs = ['../assets']
-            jniLibs.srcDirs = ['../libs']
-            proto.srcDir '../protobuf'
-        }
-        androidTest {
-            java.srcDirs = ['../test/androidTest/java']
-        }
-        test {
-            java.srcDirs = ['../test/unitTest/java']
-            resources.srcDirs = ['../test/unitTest/resources']
-        }
-        staging {
-            res.srcDirs = ['../staging/res']
-        }
-
-        website.manifest.srcFile '../website/AndroidManifest.xml'
-    }
-
     lintOptions {
         abortOnError true
         baseline file("lint-baseline.xml")
@@ -384,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.0.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.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: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') {
+        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");

app/lint-baseline.xml

@@ -7,7 +7,7 @@
         errorLine1="    List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
             line="101"
             column="35"/>
     </issue>
@@ -18,7 +18,7 @@
         errorLine1="                drawables.getColor(1, 0xff000000);"
         errorLine2="                                   ~">
         <location
-            file="src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
             line="187"
             column="36"/>
     </issue>

app/lint.xml

@@ -17,9 +17,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/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java

@@ -0,0 +1,93 @@
+package org.thoughtcrime.securesms.lock;
+
+import org.junit.Test;
+import org.thoughtcrime.securesms.util.Hex;
+import org.whispersystems.signalservice.api.kbs.HashedPin;
+import org.whispersystems.signalservice.api.kbs.KbsData;
+import org.whispersystems.signalservice.api.kbs.MasterKey;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public final class PinHashing_hashPin_Test {
+
+  @Test
+  public void argon2_hashed_pin_password() throws IOException {
+    String    pin       = "password";
+    byte[]    backupId  = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("ab7e8499d21f80a6600b3b9ee349ac6d72c07e3359fe885a934ba7aa844429f8"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("3f33ce58eb25b40436592a30eae2a8fabab1899095f4e2fba6e2d0dc43b4a2d9cac5a3931748522393951e0e54dec769"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_another_password() throws IOException {
+    String    pin       = "anotherpassword";
+    byte[]    backupId  = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("88a787415a2ecd79da0d1016a82a27c5c695c9a19b88b0aa1d35683280aa9a67"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("301d9dd1e96f20ce51083f67d3298fd37b97525de8324d5e12ed2d407d3d927b"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("9d9b05402ea39c17ff1c9298c8a0e86784a352aa02a74943bf8bcf07ec0f4b574a5b786ad0182c8d308d9eb06538b8c9"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_password_with_spaces_diacritics_and_non_arabic_numerals() throws IOException {
+    String    pin       = " Pass६örd ";
+    byte[]    backupId  = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("9571f3fde1e58588ba49bcf82be1b301ca3859a6f59076f79a8f47181ef952bf"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("ab645acdccc1652a48a34b2ac6926340ff35c03034013f68760f20013f028dd8"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("11c0ba1834db15e47c172f6c987c64bd4cfc69c6047dd67a022afeec0165a10943f204d5b8f37b3cb7bab21c6dfc39c8"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    assertEquals("577939bccb2b6638c39222d5a97998a867c5e154e30b82cc120f2dd07a3de987", kbsData.getMasterKey().deriveRegistrationLock());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_password_with_just_non_arabic_numerals() throws IOException {
+    String    pin       = " ६१८ ";
+    byte[]    backupId  = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("0432d735b32f66d0e3a70d4f9cc821a8529521a4937d26b987715d8eff4e4c54"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("d2fedabd0d4c17a371491c9722578843a26be3b4923e28d452ab2fc5491e794b"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("877ef871ef1fc668401c717ef21aa12e8523579fb1ff4474b76f28c2293537c80cc7569996c9e0229bea7f378e3a824e"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    assertEquals("23a75cb1df1a87df45cc2ed167c2bdc85ab1220b847c88761b0005cac907fce5", kbsData.getMasterKey().deriveRegistrationLock());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+}

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

@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Signal Staging</string>
+  <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,7 +117,9 @@
               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:launchMode="singleTask"/>
 
     <activity android:name=".InviteActivity"
@@ -148,7 +150,7 @@
     <activity android:name=".preferences.MmsPreferencesActivity"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ShareActivity"
+    <activity android:name=".sharing.ShareActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:excludeFromRecents="true"
               android:launchMode="singleTask"
@@ -156,7 +158,6 @@
               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,8 +170,15 @@
             <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>
@@ -245,6 +253,14 @@
           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/TextSecure.LightNoActionBar" />
+
+    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
@@ -255,12 +271,7 @@
               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"
@@ -331,7 +342,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,6 +353,11 @@
               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:windowSoftInputMode="stateHidden"
@@ -398,6 +414,10 @@
               android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".mediasend.AvatarSelectionActivity"
+              android:theme="@style/TextSecure.FullScreenMedia"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".BlockedContactsActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -406,19 +426,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=".CreateProfileActivity"
+    <activity android:name=".profiles.edit.EditProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:windowSoftInputMode="stateVisible|adjustResize" />
+
+    <activity android:name=".lock.v2.CreateKbsPinActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            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,6 +452,11 @@
         </intent-filter>
     </activity>
 
+    <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"/>
@@ -449,20 +480,31 @@
             android:theme="@style/TextSecure.LightNoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity
-        android:name=".usernames.ProfileEditActivityV2"
-        android:theme="@style/TextSecure.LightNoActionBar"
-        android:windowSoftInputMode="adjustResize"/>
-
     <activity android:name=".MainActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
+    <activity android:name=".pin.PinRestoreActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
+              android:theme="@style/TextSecure.LightNoActionBar" />
+
+    <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
+              android:theme="@style/TextSecure.LightNoActionBar" />
+
+    <activity android:name=".groups.ui.addmembers.AddMembersActivity"
+              android:theme="@style/TextSecure.LightNoActionBar" />
+
+    <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
+              android:theme="@style/TextSecure.LightNoActionBar" />
+
     <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"
@@ -501,7 +543,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>
@@ -613,11 +657,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"/>
@@ -673,17 +712,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,62 +17,59 @@
 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;
 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.jobs.RefreshPreKeysJob;
 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.UncaughtExceptionLogger;
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
+import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
+import org.thoughtcrime.securesms.messages.InitialMessageRetriever;
 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.messages.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.util.FrameRateTracker;
+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;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
@@ -130,8 +127,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeRingRtc();
     initializePendingMessages();
     initializeBlobProvider();
-    initializeCameraX();
+    initializeCleanup();
+
+    FeatureFlags.init();
     NotificationChannels.create(this);
+    RefreshPreKeysJob.scheduleIfNecessary();
+    StorageSyncHelper.scheduleRoutineSync();
+    RegistrationUtil.markRegistrationPossiblyComplete();
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
     if (Build.VERSION.SDK_INT < 21) {
@@ -145,10 +147,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   public void onStart(@NonNull LifecycleOwner owner) {
     isAppVisible = true;
     Log.i(TAG, "App is now visible.");
+    FeatureFlags.refreshIfNecessary();
     ApplicationDependencies.getRecipientCache().warmUp();
     executePendingContactSync();
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
+    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
+    catchUpOnMessages();
   }
 
   @Override
@@ -156,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();
   }
 
@@ -217,7 +222,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   private void initializeCrashHandling() {
     final Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
-    Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionLogger(originalHandler));
+    Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
   }
 
   private void initializeApplicationMigrations() {
@@ -236,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);
@@ -304,6 +302,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         add("Moto G4");
         add("TA-1053");
         add("Mi A1");
+        add("Mi A2");
         add("E5823"); // Sony z5 compact
         add("Redmi Note 5");
         add("FP2"); // Fairphone FP2
@@ -323,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);
     }
   }
 
@@ -367,22 +366,46 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   private void initializeBlobProvider() {
-    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+    SignalExecutors.BOUNDED.execute(() -> {
       BlobProvider.getInstance().onSessionStart(this);
     });
   }
 
-  @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();
+  private void initializeCleanup() {
+    SignalExecutors.BOUNDED.execute(() -> {
+      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    });
+  }
+
+  private void catchUpOnMessages() {
+    InitialMessageRetriever retriever = ApplicationDependencies.getInitialMessageRetriever();
+
+    if (retriever.isCaughtUp()) {
+      return;
     }
+
+    SignalExecutors.UNBOUNDED.execute(() -> {
+      long startTime = System.currentTimeMillis();
+
+      switch (retriever.begin(TimeUnit.SECONDS.toMillis(60))) {
+        case SUCCESS:
+          Log.i(TAG, "Successfully caught up on messages. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case FAILURE_TIMEOUT:
+          Log.w(TAG, "Did not finish catching up due to a timeout. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case FAILURE_ERROR:
+          Log.w(TAG, "Did not finish catching up due to an error. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case SKIPPED_ALREADY_CAUGHT_UP:
+          Log.i(TAG, "Already caught up. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case SKIPPED_ALREADY_RUNNING:
+          Log.i(TAG, "Already in the process of catching up. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+      }
+    });
   }
 
   @Override

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;
@@ -38,11 +39,10 @@ import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.StoragePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.usernames.ProfileEditActivityV2;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
@@ -67,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();
@@ -155,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));
 
@@ -241,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();
         }
@@ -266,14 +272,12 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     private class ProfileClickListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        if (FeatureFlags.USERNAMES) {
-          requireActivity().startActivity(ProfileEditActivityV2.getLaunchIntent(requireContext()));
-        } else {
-          Intent intent = new Intent(preference.getContext(), CreateProfileActivity.class);
-          intent.putExtra(CreateProfileActivity.EXCLUDE_SYSTEM, true);
+        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(intent);
         return true;
       }
     }

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

@@ -0,0 +1,152 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.View;
+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 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.Target;
+
+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 PassphraseRequiredActionBarActivity {
+
+  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);
+
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    ImageView avatar = findViewById(R.id.avatar);
+
+    setSupportActionBar(toolbar);
+
+    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    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();
+
+      GlideApp.with(this).load(contactPhoto)
+                   .fallback(fallbackPhoto.asCallCard(this))
+                   .error(fallbackPhoto.asCallCard(this))
+                   .diskCacheStrategy(DiskCacheStrategy.ALL)
+                   .addListener(new RequestListener<Drawable>() {
+                     @Override
+                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                       Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
+                       finish();
+                       return false;
+                     }
+
+                     @Override
+                     public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                       return false;
+                     }
+                   })
+                   .into(avatar);
+
+      toolbar.setTitle(recipient.toShortString(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;
+  }
+}

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

@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.contactshare.Contact;
 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;
@@ -45,5 +46,6 @@ public interface BindableConversationItem extends Unbindable {
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
     void onReactionClicked(long messageId, boolean isMms);
+    void onGroupMemberAvatarClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
   }
 }

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

@@ -10,8 +10,8 @@ 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);
 }

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,15 +1,8 @@
 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;
@@ -17,6 +10,13 @@ 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 +25,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 {
 
-  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 +48,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 +69,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 +107,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 +136,5 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
         ((BlockedContactListItem) view).set(glideRequests, recipient);
       }
     }
-
   }
-
 }

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

@@ -0,0 +1,49 @@
+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();
+
+    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

@@ -5,12 +5,13 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import androidx.appcompat.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
@@ -20,13 +21,12 @@ import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.PushDecryptJob;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.VerifySpan;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -179,7 +179,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
 
             long pushId = pushDatabase.insert(envelope);
 
-            ApplicationDependencies.getJobManager().add(new PushDecryptJob(getContext(), pushId, messageRecord.getId()));
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
           } catch (IOException e) {
             throw new AssertionError(e);
           }

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;
@@ -46,12 +44,14 @@ import java.lang.ref.WeakReference;
  */
 public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
                                                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);
@@ -121,6 +118,17 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   @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

@@ -0,0 +1,646 @@
+/*
+ * 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.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.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.fragment.app.Fragment;
+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.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.adapter.FixedViewsAdapter;
+import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Fragment for selecting a one or more contacts from a list.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public final class ContactSelectionListFragment extends    Fragment
+                                                implements LoaderManager.LoaderCallbacks<Cursor>
+{
+  @SuppressWarnings("unused")
+  private static final String TAG = Log.tag(ContactSelectionListFragment.class);
+
+  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 OnContactSelectedListener   onContactSelectedListener;
+  private SwipeRefreshLayout          swipeRefresh;
+  private View                        showContactsLayout;
+  private Button                      showContactsButton;
+  private TextView                    showContactsDescription;
+  private ProgressWheel               showContactsProgress;
+  private String                      cursorFilter;
+  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 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 ListCallback) {
+      listCallback = (ListCallback) context;
+    }
+
+    if (context instanceof ScrollCallback) {
+      scrollCallback = (ScrollCallback) context;
+    }
+  }
+
+  @Override
+  public void onActivityCreated(Bundle icicle) {
+    super.onActivityCreated(icicle);
+
+    initializeCursor();
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+
+    Permissions.with(this)
+               .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
+               .ifNecessary()
+               .onAllGranted(() -> {
+                 if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
+                   handleContactPermissionGranted();
+                 } else {
+                   LoaderManager.getInstance(this).initLoader(0, null, this);
+                 }
+               })
+               .onAnyDenied(() -> {
+                 FragmentActivity activity = requireActivity();
+
+                 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();
+                 }
+               })
+               .execute();
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
+
+    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);
+
+    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() {
+    if (cursorRecyclerViewAdapter == null) {
+      return Collections.emptyList();
+    }
+
+    return cursorRecyclerViewAdapter.getSelectedContacts();
+  }
+
+  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(),
+                                                                glideRequests,
+                                                                null,
+                                                                new ListClickListener(),
+                                                                isMulti(),
+                                                                currentSelection);
+
+    RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
+
+    if (listCallback != null && FeatureFlags.newGroupUI()) {
+      if (FeatureFlags.groupsV2create() && FeatureFlags.groupsV2internalTest()) {
+        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback), createNewGroupsV1GroupItem(listCallback));
+      } else {
+        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
+      }
+      headerAdapter.hide();
+      concatenateAdapter.addAdapter(headerAdapter);
+    }
+
+    concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
+
+    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 ListCallback listCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
+    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;
+  }
+
+  private View createNewGroupsV1GroupItem(@NonNull ListCallback listCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_new_group_v1_item, (ViewGroup) requireView(), false);
+    view.setOnClickListener(v -> listCallback.onNewGroup(true));
+    return view;
+  }
+
+  private void initializeNoContactsPermission() {
+    swipeRefresh.setVisibility(View.GONE);
+
+    showContactsLayout.setVisibility(View.VISIBLE);
+    showContactsProgress.setVisibility(View.INVISIBLE);
+    showContactsDescription.setText(R.string.contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them);
+    showContactsButton.setVisibility(View.VISIBLE);
+
+    showContactsButton.setOnClickListener(v -> {
+      Permissions.with(this)
+                 .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
+                 .ifNecessary()
+                 .withPermanentDenialDialog(getString(R.string.ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts))
+                 .onSomeGranted(permissions -> {
+                   if (permissions.contains(Manifest.permission.WRITE_CONTACTS)) {
+                     handleContactPermissionGranted();
+                   }
+                 })
+                 .execute();
+    });
+  }
+
+  public void setQueryFilter(String filter) {
+    this.cursorFilter = filter;
+    LoaderManager.getInstance(this).restartLoader(0, null, this);
+  }
+
+  public void resetQueryFilter() {
+    setQueryFilter(null);
+    swipeRefresh.setRefreshing(false);
+  }
+
+  public boolean hasQueryFilter() {
+    return !TextUtils.isEmpty(cursorFilter);
+  }
+
+  public void setRefreshing(boolean refreshing) {
+    swipeRefresh.setRefreshing(refreshing);
+  }
+
+  public void reset() {
+    cursorRecyclerViewAdapter.clearSelectedContacts();
+
+    if (!isDetached() && !isRemoving() && getActivity() != null && !getActivity().isFinishing()) {
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
+    }
+  }
+
+  @Override
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    FragmentActivity activity = requireActivity();
+    return new ContactsCursorLoader(activity,
+                                    activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
+                                    cursorFilter, activity.getIntent().getBooleanExtra(RECENTS, false));
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, @Nullable Cursor data) {
+    swipeRefresh.setVisibility(View.VISIBLE);
+    showContactsLayout.setVisibility(View.GONE);
+
+    cursorRecyclerViewAdapter.changeCursor(data);
+
+    if (footerAdapter != null) {
+      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);
+    if (useFastScroller) {
+      fastScroller.setVisibility(View.VISIBLE);
+      fastScroller.setRecyclerView(recyclerView);
+    } else {
+      fastScroller.setRecyclerView(null);
+      fastScroller.setVisibility(View.GONE);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+    cursorRecyclerViewAdapter.changeCursor(null);
+    fastScroller.setVisibility(View.GONE);
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private void handleContactPermissionGranted() {
+    final Context context = requireContext();
+
+    new AsyncTask<Void, Void, Boolean>() {
+      @Override
+      protected void onPreExecute() {
+        swipeRefresh.setVisibility(View.GONE);
+        showContactsLayout.setVisibility(View.VISIBLE);
+        showContactsButton.setVisibility(View.INVISIBLE);
+        showContactsDescription.setText(R.string.ConversationListFragment_loading);
+        showContactsProgress.setVisibility(View.VISIBLE);
+        showContactsProgress.spin();
+      }
+
+      @Override
+      protected Boolean doInBackground(Void... voids) {
+        try {
+          DirectoryHelper.refreshDirectory(context, false);
+          return true;
+        } catch (IOException e) {
+          Log.w(TAG, e);
+        }
+        return false;
+      }
+
+      @Override
+      protected void onPostExecute(Boolean result) {
+        if (result) {
+          showContactsLayout.setVisibility(View.GONE);
+          swipeRefresh.setVisibility(View.VISIBLE);
+          reset();
+        } else {
+          Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
+          initializeNoContactsPermission();
+        }
+      }
+    }.execute();
+  }
+
+  private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
+    @Override
+    public void onItemClick(ContactSelectionListItem contact) {
+      SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
+                                                                 : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());
+
+      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());
+
+          SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
+            return UsernameUtil.fetchUuidForUsername(requireContext(), contact.getNumber());
+          }, uuid -> {
+            loadingDialog.dismiss();
+            if (uuid.isPresent()) {
+              Recipient recipient = Recipient.externalUsername(requireContext(), uuid.get(), contact.getNumber());
+              SelectedContact selected = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
+              markContactSelected(selected);
+              cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+
+              if (onContactSelectedListener != null) {
+                onContactSelectedListener.onContactSelected(Optional.of(recipient.getId()), null);
+              }
+            } else {
+              new AlertDialog.Builder(requireContext())
+                             .setTitle(R.string.ContactSelectionListFragment_username_not_found)
+                             .setMessage(getString(R.string.ContactSelectionListFragment_s_is_not_a_signal_user, contact.getNumber()))
+                             .setPositiveButton(R.string.ContactSelectionListFragment_okay, (dialog, which) -> dialog.dismiss())
+                             .show();
+            }
+          });
+        } else {
+          markContactSelected(selectedContact);
+          cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+
+          if (onContactSelectedListener != null) {
+            onContactSelectedListener.onContactSelected(contact.getRecipientId(), contact.getNumber());
+          }
+        }
+      } else {
+        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() && FeatureFlags.newGroupUI()) {
+      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) {
+    this.onContactSelectedListener = onContactSelectedListener;
+  }
+
+  public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
+    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);
+    void onContactDeselected(Optional<RecipientId> recipientId, String number);
+  }
+
+  public interface ListCallback {
+    void onInvite();
+    void onNewGroup(boolean forceV1);
+  }
+
+  public interface ScrollCallback {
+    void onBeginScroll();
+  }
+}

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

@@ -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

@@ -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))

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

@@ -18,20 +18,14 @@
 package org.thoughtcrime.securesms;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 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;
@@ -42,6 +36,10 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
@@ -52,28 +50,35 @@ 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.conversation.ConversationActivity;
 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.GroupId;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.GroupManager.GroupActionResult;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity;
+import org.thoughtcrime.securesms.mediasend.AvatarSelectionBottomSheetDialogFragment;
+import org.thoughtcrime.securesms.mediasend.Media;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.profiles.AvatarHelper;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 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.FeatureFlags;
 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.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -81,7 +86,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Activity to create and update groups
+ * Activity to create and update {@link GroupId.V1} groups
  *
  * @author Jake McGinty
  */
@@ -92,27 +97,31 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
   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 static final String GROUP_ID_EXTRA     = "group_id";
+  private static final String GROUP_THREAD_EXTRA = "group_thread";
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
 
-  private static final int PICK_CONTACT = 1;
-  public static final  int AVATAR_SIZE  = 210;
+  private static final short REQUEST_CODE_SELECT_AVATAR = 26165;
+  private static final int   PICK_CONTACT               = 1;
 
-  private EditText     groupName;
-  private ListView     lv;
-  private ImageView    avatar;
-  private TextView     creatingText;
-  private Bitmap       avatarBmp;
+  private EditText  groupName;
+  private ListView  listView;
+  private ImageView avatar;
+  private TextView  creatingText;
+  private Bitmap    avatarBmp;
 
   @NonNull private Optional<GroupData> groupToUpdate = Optional.absent();
 
+  public static Intent newEditGroupIntent(@NonNull Context context, @NonNull GroupId.V1 groupId) {
+    Intent intent = new Intent(context, GroupCreateActivity.class);
+    intent.putExtra(GroupCreateActivity.GROUP_ID_EXTRA, groupId.toString());
+    return intent;
+  }
+
   @Override
   protected void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
@@ -128,7 +137,6 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
     updateViewState();
   }
 
@@ -185,27 +193,42 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   }
 
   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);
+    RecipientsEditor    recipientsEditor = findViewById(R.id.recipients_text);
+    PushRecipientsPanel recipientsPanel  = findViewById(R.id.recipients);
+
+    listView     = findViewById(R.id.selected_contacts_list);
+    avatar       = findViewById(R.id.avatar);
+    groupName    = findViewById(R.id.group_name);
+    creatingText = findViewById(R.id.creating_group_text);
+
     SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(this);
     adapter.setOnRecipientDeletedListener(this);
-    lv.setAdapter(adapter);
+    listView.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));
+
+    avatar.setImageDrawable(getDefaultGroupAvatar());
+    avatar.setOnClickListener(view -> AvatarSelectionBottomSheetDialogFragment.create(avatarBmp != null, false, REQUEST_CODE_SELECT_AVATAR, true).show(getSupportFragmentManager(), null));
+  }
+
+  private Drawable getDefaultGroupAvatar() {
+    return new ResourceContactPhoto(R.drawable.ic_group_outline_34, R.drawable.ic_group_outline_20).asDrawable(this, ContactColors.UNKNOWN_COLOR.toConversationColor(this));
   }
 
   private void initializeExistingGroup() {
-    final String groupId = getIntent().getStringExtra(GROUP_ID_EXTRA);
+    final GroupId groupId = GroupId.parseNullableOrThrow(getIntent().getStringExtra(GROUP_ID_EXTRA));
 
     if (groupId != null) {
-      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupId);
+      GroupId.V1 groupIdV1 = groupId.requireV1();
+
+      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupIdV1);
+
+      if (FeatureFlags.newGroupUI()) {
+        avatar.setOnClickListener(v -> startActivity(EditProfileActivity.getIntentForGroupProfile(this, groupIdV1)));
+      }
     }
   }
 
@@ -260,8 +283,8 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleGroupUpdate() {
-    new UpdateSignalGroupTask(this, groupToUpdate.get().id, avatarBmp,
-                              getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    new UpdateSignalGroupV1Task(this, groupToUpdate.get().id, avatarBmp,
+                                getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }
 
   private void handleOpenConversation(long threadId, Recipient recipient) {
@@ -274,7 +297,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   }
 
   private SelectedRecipientsAdapter getAdapter() {
-    return (SelectedRecipientsAdapter)lv.getAdapter();
+    return (SelectedRecipientsAdapter) listView.getAdapter();
   }
 
   private @Nullable String getGroupName() {
@@ -284,7 +307,6 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   @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;
@@ -299,23 +321,27 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         }
 
         break;
+      case REQUEST_CODE_SELECT_AVATAR:
+        if (data.getBooleanExtra("delete", false)) {
+          avatarBmp = null;
+          avatar.setImageDrawable(getDefaultGroupAvatar());
+          return;
+        }
+
+        final Media          result         = data.getParcelableExtra(AvatarSelectionActivity.EXTRA_MEDIA);
+        final DecryptableUri decryptableUri = new DecryptableUri(result.getUri());
 
-      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)
+                .load(decryptableUri)
                 .skipMemoryCache(true)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .centerCrop()
-                .override(AVATAR_SIZE, AVATAR_SIZE)
+                .override(AvatarHelper.AVATAR_DIMENSIONS, AvatarHelper.AVATAR_DIMENSIONS)
                 .into(new SimpleTarget<Bitmap>() {
                   @Override
                   public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
-                    setAvatar(resultUri, resource);
+                    setAvatar(decryptableUri, resource);
                   }
                 });
     }
@@ -352,7 +378,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
       }
       memberAddresses.add(Recipient.self().getId());
 
-      String      groupId          = DatabaseFactory.getGroupDatabase(activity).getOrCreateGroupForMembers(memberAddresses, true);
+      GroupId.Mms groupId          = DatabaseFactory.getGroupDatabase(activity).getOrCreateMmsGroupForMembers(memberAddresses);
       RecipientId groupRecipientId = DatabaseFactory.getRecipientDatabase(activity).getOrInsertFromGroupId(groupId);
       Recipient   groupRecipient   = Recipient.resolved(groupRecipientId);
       long        threadId         = DatabaseFactory.getThreadDatabase(activity).getThreadIdFor(groupRecipient, ThreadDatabase.DistributionTypes.DEFAULT);
@@ -416,7 +442,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
     @Override
     protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
-      return Optional.of(GroupManager.createGroup(activity, members, avatar, name, false));
+      return Optional.of(GroupManager.createGroupV1(activity, members, BitmapUtil.toByteArray(avatar), name, false));
     }
 
     @Override
@@ -433,11 +459,11 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
-  private static class UpdateSignalGroupTask extends SignalGroupTask {
-    private String groupId;
+  private static class UpdateSignalGroupV1Task extends SignalGroupTask {
+    private final GroupId.V1 groupId;
 
-    public UpdateSignalGroupTask(GroupCreateActivity activity, String groupId,
-                                 Bitmap avatar, String name, Set<Recipient> members)
+    UpdateSignalGroupV1Task(GroupCreateActivity activity, GroupId.V1 groupId,
+                            Bitmap avatar, String name, Set<Recipient> members)
     {
       super(activity, avatar, name, members);
       this.groupId = groupId;
@@ -445,11 +471,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
     @Override
     protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
-      try {
-        return Optional.of(GroupManager.updateGroup(activity, groupId, members, avatar, name));
-      } catch (InvalidNumberException e) {
-        return Optional.absent();
-      }
+      return Optional.fromNullable(GroupManager.updateGroup(activity, groupId, members, BitmapUtil.toByteArray(avatar), name));
     }
 
     @Override
@@ -458,7 +480,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         if (!activity.isFinishing()) {
           Intent intent = activity.getIntent();
           intent.putExtra(GROUP_THREAD_EXTRA, result.get().getThreadId());
-          intent.putExtra(GROUP_ID_EXTRA, result.get().getGroupRecipient().requireGroupId());
+          intent.putExtra(GROUP_ID_EXTRA, result.get().getGroupRecipient().requireGroupId().toString());
           activity.setResult(RESULT_OK, intent);
           activity.finish();
         }
@@ -525,7 +547,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
-  private static class FillExistingGroupInfoAsyncTask extends ProgressDialogAsyncTask<String,Void,Optional<GroupData>> {
+  private static class FillExistingGroupInfoAsyncTask extends ProgressDialogAsyncTask<GroupId.V1, Void, Optional<GroupData>> {
     private GroupCreateActivity activity;
 
     public FillExistingGroupInfoAsyncTask(GroupCreateActivity activity) {
@@ -536,18 +558,24 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     }
 
     @Override
-    protected Optional<GroupData> doInBackground(String... groupIds) {
+    protected Optional<GroupData> doInBackground(GroupId.V1... groupIds) {
       final GroupDatabase         db               = DatabaseFactory.getGroupDatabase(activity);
-      final List<Recipient>       recipients       = db.getGroupMembers(groupIds[0], false);
+      final List<Recipient>       recipients       = db.getGroupMembers(groupIds[0], GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
       final Optional<GroupRecord> group            = db.getGroup(groupIds[0]);
       final Set<Recipient>        existingContacts = new HashSet<>(recipients.size());
       existingContacts.addAll(recipients);
 
       if (group.isPresent()) {
+        Bitmap avatar = null;
+        try {
+          avatar = BitmapFactory.decodeStream(AvatarHelper.getAvatar(getContext(), group.get().getRecipientId()));
+        } catch (IOException e) {
+          Log.w(TAG, "Failed to read avatar.");
+        }
         return Optional.of(new GroupData(groupIds[0],
                                          existingContacts,
-                                         BitmapUtil.fromByteArray(group.get().getAvatar()),
-                                         group.get().getAvatar(),
+                                         avatar,
+                                         BitmapUtil.toByteArray(avatar),
                                          group.get().getTitle()));
       } else {
         return Optional.absent();
@@ -567,7 +595,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         }
         SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(activity, group.get().recipients);
         adapter.setOnRecipientDeletedListener(activity);
-        activity.lv.setAdapter(adapter);
+        activity.listView.setAdapter(adapter);
         activity.updateViewState();
       }
     }
@@ -584,13 +612,13 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   }
 
   private static class GroupData {
-    String         id;
+    GroupId.V1     id;
     Set<Recipient> recipients;
     Bitmap         avatarBmp;
     byte[]         avatarBytes;
     String         name;
 
-    public GroupData(String id, Set<Recipient> recipients, Bitmap avatarBmp, byte[] avatarBytes, String name) {
+    GroupData(GroupId.V1 id, Set<Recipient> recipients, Bitmap avatarBmp, byte[] avatarBytes, String name) {
       this.id          = id;
       this.recipients  = recipients;
       this.avatarBmp   = avatarBmp;

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

@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
+
+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.ui.bottomsheet.RecipientBottomSheetDialogFragment;
+
+import java.util.List;
+
+public final class GroupMembersDialog {
+
+  private final FragmentActivity fragmentActivity;
+  private final Recipient        groupRecipient;
+
+  public GroupMembersDialog(@NonNull FragmentActivity activity,
+                            @NonNull Recipient groupRecipient)
+  {
+    this.fragmentActivity = activity;
+    this.groupRecipient   = groupRecipient;
+  }
+
+  public void display() {
+    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 void contactClick(@NonNull Recipient recipient) {
+    RecipientBottomSheetDialogFragment.create(recipient.getId(), groupRecipient.requireGroupId())
+                                      .show(fragmentActivity.getSupportFragmentManager(), "BOTTOM");
+  }
+}

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,6 +40,7 @@ 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 {
@@ -135,14 +134,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 +175,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/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

@@ -64,6 +64,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;
@@ -116,6 +117,20 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private boolean               showThread;
   private MediaDatabase.Sorting sorting;
 
+  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
+                                                      @NonNull MediaRecord mediaRecord,
+                                                      boolean leftIsRecent)
+  {
+    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, mediaRecord.getAttachment().getSize());
+    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
+    intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
+    intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
+    return intent;
+  }
+
   @SuppressWarnings("ConstantConditions")
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {

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

@@ -31,7 +31,11 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.Loader;
 
 import org.thoughtcrime.securesms.conversation.ConversationItem;
+import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.logging.Log;
+
+import android.os.Parcelable;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,7 +55,6 @@ 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;
@@ -61,6 +64,7 @@ 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.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.lang.ref.WeakReference;
@@ -131,13 +135,13 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
     assert getSupportActionBar() != null;
     getSupportActionBar().setTitle(R.string.AndroidManifest__message_details);
 
-    MessageNotifier.setVisibleThread(threadId);
+    ApplicationDependencies.getMessageNotifier().setVisibleThread(threadId);
   }
 
   @Override
   protected void onPause() {
     super.onPause();
-    MessageNotifier.setVisibleThread(-1L);
+    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
   }
 
   @Override
@@ -268,7 +272,9 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
     }
     toFrom.setText(toFromRes);
     conversationItem.bind(messageRecord, Optional.absent(), Optional.absent(), glideRequests, dynamicLanguage.getCurrentLocale(), new HashSet<>(), recipient, null, false);
+    Parcelable state = recipientsList.onSaveInstanceState();
     recipientsList.setAdapter(new MessageDetailsRecipientAdapter(this, glideRequests, messageRecord, recipients, isPushGroup));
+    recipientsList.onRestoreInstanceState(state);
   }
 
   private void inflateMessageViewIfAbsent(MessageRecord messageRecord) {
@@ -276,9 +282,9 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
       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);
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_sent_multimedia, itemParent, false);
       } else {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_received, itemParent, false);
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_received_multimedia, itemParent, false);
       }
       itemParent.addView(conversationItem);
     }
@@ -368,7 +374,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
         List<GroupReceiptInfo> receiptInfoList = DatabaseFactory.getGroupReceiptDatabase(context).getGroupReceiptInfo(messageRecord.getId());
 
         if (receiptInfoList.isEmpty()) {
-          List<Recipient> group = DatabaseFactory.getGroupDatabase(context).getGroupMembers(messageRecord.getRecipient().requireGroupId(), false);
+          List<Recipient> group = DatabaseFactory.getGroupDatabase(context).getGroupMembers(messageRecord.getRecipient().requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
 
           for (Recipient recipient : group) {
             recipients.add(new RecipientDeliveryStatus(recipient, RecipientDeliveryStatus.Status.UNKNOWN, false, -1));
@@ -438,8 +444,8 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
     }
 
     private void onResendClicked(View v) {
-      MessageSender.resend(MessageDetailsActivity.this, messageRecord);
       resendButton.setVisibility(View.GONE);
+      SignalExecutors.BOUNDED.execute(() -> MessageSender.resend(MessageDetailsActivity.this, messageRecord));
     }
   }
 }

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

@@ -81,23 +81,45 @@ public class MessageRecipientListItem extends RelativeLayout
     this.deliveryStatusView       = findViewById(R.id.delivery_status);
   }
 
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    observeMember();
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    unsubscribeFromMember();
+    super.onDetachedFromWindow();
+  }
+
   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);
+    unsubscribeFromMember();
 
     this.glideRequests = glideRequests;
     this.member        = member;
+    observeMember();
 
-    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 observeMember() {
+    if (isAttachedToWindow() && member != null && member.getRecipient() != null) {
+      member.getRecipient().live().observeForever(this);
+    }
+  }
+
+  private void unsubscribeFromMember() {
+    if (member != null && member.getRecipient() != null) member.getRecipient().live().removeForeverObserver(this);
+  }
+
   private void setIssueIndicators(final MessageRecord record,
                                   final boolean isPushGroup)
   {
@@ -162,7 +184,7 @@ public class MessageRecipientListItem extends RelativeLayout
   }
 
   public void unbind() {
-    if (this.member != null && this.member.getRecipient() != null) this.member.getRecipient().live().removeForeverObserver(this);
+    unsubscribeFromMember();
   }
 
   @Override

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,16 @@ 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 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.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.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 +37,7 @@ import java.util.UUID;
  *
  */
 public class NewConversationActivity extends ContactSelectionActivity
-                                    implements ContactSelectionListFragment.InviteCallback
+                                    implements ContactSelectionListFragment.ListCallback
 {
 
   @SuppressWarnings("unused")
@@ -112,7 +96,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void handleCreateGroup() {
-    startActivity(new Intent(this, GroupCreateActivity.class));
+    startActivity(CreateGroupActivity.newIntent(this));
   }
 
   private void handleInvite() {
@@ -120,10 +104,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 +115,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/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/PassphraseRequiredActionBarActivity.java

@@ -14,10 +14,15 @@ 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;
@@ -27,14 +32,17 @@ import java.util.Locale;
 public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity implements MasterSecretListener {
   private static final String TAG = PassphraseRequiredActionBarActivity.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;
@@ -149,7 +157,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 +173,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();
+  }
+
+  private boolean userMustSetProfileName() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
+  }
+
   private Intent getCreatePassphraseIntent() {
     return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
   }
@@ -185,14 +207,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 +261,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/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/RecipientPreferenceActivity.java

@@ -1,11 +1,11 @@
 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.graphics.drawable.Drawable;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
@@ -22,10 +22,10 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 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;
@@ -37,7 +37,11 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.recyclerview.widget.RecyclerView;
 
+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.Target;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import org.thoughtcrime.securesms.color.MaterialColor;
@@ -48,9 +52,7 @@ 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;
@@ -72,17 +74,16 @@ 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.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.Util;
 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;
 
@@ -93,8 +94,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 {
   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";
+  public static final String RECIPIENT_ID = "recipient";
 
   private static final String PREFERENCE_MUTED                 = "pref_key_recipient_mute";
   private static final String PREFERENCE_MESSAGE_TONE          = "pref_key_recipient_ringtone";
@@ -107,8 +107,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
   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 final DynamicTheme dynamicTheme = new DynamicDarkToolbarTheme();
 
   private ImageView               avatar;
   private GlideRequests           glideRequests;
@@ -117,10 +116,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
   private ThreadPhotoRailView     threadPhotoRailView;
   private CollapsingToolbarLayout toolbarLayout;
 
+  public static @NonNull Intent getLaunchIntent(@NonNull Context context, @NonNull RecipientId id) {
+    Intent intent = new Intent(context, RecipientPreferenceActivity.class);
+    intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, id);
+
+    return intent;
+  }
+
   @Override
   public void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
@@ -135,14 +140,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     setHeader(recipient.get());
     recipient.observe(this, this::setHeader);
 
-    getSupportLoaderManager().initLoader(0, null, this);
+    LoaderManager.getInstance(this).initLoader(0, null, this);
   }
 
   @Override
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
   }
 
   @Override
@@ -164,31 +168,19 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     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        = findViewById(R.id.collapsing_toolbar);
+    this.avatar               = findViewById(R.id.avatar);
+    this.threadPhotoRailView  = findViewById(R.id.recent_photos);
+    this.threadPhotoRailLabel = findViewById(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);
-    });
+    this.threadPhotoRailView.setListener(mediaRecord ->
+      startActivity(MediaPreviewActivity.intentFromMediaRecord(RecipientPreferenceActivity.this,
+                                                               mediaRecord,
+                                                               ViewCompat.getLayoutDirection(threadPhotoRailView) == ViewCompat.LAYOUT_DIRECTION_LTR)));
 
     SimpleTask.run(
       () -> DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId),
@@ -201,7 +193,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       }
     );
 
-    Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
+    Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setLogo(null);
@@ -209,11 +201,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     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)))
+    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();
@@ -222,6 +219,20 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
                  .fallback(fallbackPhoto.asCallCard(this))
                  .error(fallbackPhoto.asCallCard(this))
                  .diskCacheStrategy(DiskCacheStrategy.ALL)
+                 .addListener(new RequestListener<Drawable>() {
+                   @Override
+                   public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                     avatar.setOnClickListener(null);
+                     return false;
+                   }
+
+                   @Override
+                   public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                     avatar.setOnClickListener(v -> startActivity(AvatarPreviewActivity.intentFromRecipientId(RecipientPreferenceActivity.this, recipient.getId()),
+                                                                  AvatarPreviewActivity.createTransitionBundle(RecipientPreferenceActivity.this, avatar)));
+                     return false;
+                   }
+                 })
                  .into(this.avatar);
 
     if (contactPhoto == null) this.avatar.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
@@ -270,8 +281,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
       initializeRecipients();
 
-      this.canHaveSafetyNumber = getActivity().getIntent()
-                                 .getBooleanExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA, false);
+      this.canHaveSafetyNumber = recipient.get().isRegistered() && !recipient.get().isLocalNumber();
 
       Preference customNotificationsPref  = this.findPreference(PREFERENCE_CUSTOM_NOTIFICATIONS);
 
@@ -429,7 +439,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
         colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
 
-        if (FeatureFlags.PROFILE_DISPLAY) {
+        if (FeatureFlags.profileDisplay()) {
           aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
           aboutPreference.setSummary(recipient.resolve().getE164().or(""));
         } else {
@@ -437,7 +447,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
           aboutPreference.setSummary(recipient.getCustomLabel());
         }
 
-        aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
+        aboutPreference.setState(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED, recipient.isBlocked());
 
         IdentityUtil.getRemoteIdentityKey(getActivity(), recipient).addListener(new ListenableFuture.Listener<Optional<IdentityRecord>>() {
           @Override
@@ -679,11 +689,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
       @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);
+        startActivity(VerifyIdentityActivity.newIntent(preference.getContext(), identityKey));
 
         return true;
       }
@@ -692,72 +698,15 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     private class BlockClickedListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        if (recipient.get().isBlocked()) handleUnblock(preference.getContext());
-        else                             handleBlock(preference.getContext());
+        Context context = 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;
+        if (recipient.get().isBlocked()) {
+          BlockUnblockDialog.showUnblockFor(context, getLifecycle(), recipient.get(), () -> RecipientUtil.unblock(context, recipient.get()));
+        } else {
+          BlockUnblockDialog.showBlockFor(context, getLifecycle(), recipient.get(), () -> RecipientUtil.block(context, recipient.get()));
         }
 
-        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);
-          }
-        });
+        return true;
       }
     }
 
@@ -780,15 +729,15 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
       @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));
+        CommunicationActions.startInsecureCall(requireActivity(), recipient.get());
+      }
+
+      @Override
+      public void onLongClick() {
+        if (recipient.get().hasE164()) {
+          Util.copyToClipboard(requireContext(), recipient.get().requireE164());
+          ServiceUtil.getVibrator(requireContext()).vibrate(250);
+          Toast.makeText(requireContext(), R.string.RecipientBottomSheet_copied_to_clipboard, Toast.LENGTH_SHORT).show();
         }
       }
     }

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/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;
@@ -105,22 +106,53 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 @SuppressLint("StaticFieldLeak")
 public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity 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.uuids() && recipient.resolve().getUuid().isPresent()) {
         Log.i(TAG, "Using UUID (version 2).");
         version  = 2;
         localId  = UuidUtil.toByteArray(TextSecurePreferences.getLocalUuid(requireContext()));
@@ -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

@@ -0,0 +1,610 @@
+/*
+ * Copyright (C) 2016 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.Manifest;
+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 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.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.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.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.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 AppCompatActivity {
+
+
+  private static final String TAG = WebRtcCallActivity.class.getSimpleName();
+
+  private static final int STANDARD_DELAY_FINISH    = 1000;
+  public  static final int BUSY_SIGNAL_DELAY_FINISH = 5500;
+
+  public static final String ANSWER_ACTION   = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
+  public static final String DENY_ACTION     = WebRtcCallActivity.class.getCanonicalName() + ".DENY_ACTION";
+  public static final String END_CALL_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".END_CALL_ACTION";
+
+  public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
+
+  private WebRtcCallView      callScreen;
+  private TooltipPopup        videoTooltip;
+  private WebRtcCallViewModel viewModel;
+  private boolean             enableVideoIfAvailable;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    Log.i(TAG, "onCreate()");
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    super.onCreate(savedInstanceState);
+
+    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    setContentView(R.layout.webrtc_call_activity);
+    getSupportActionBar().hide();
+
+    setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
+
+    initializeResources();
+    initializeViewModel();
+
+    processIntent(getIntent());
+
+    enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false);
+    getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE);
+  }
+
+  @Override
+  public void onResume() {
+    Log.i(TAG, "onResume()");
+    super.onResume();
+    initializeScreenshotSecurity();
+
+    if (!EventBus.getDefault().isRegistered(this)) {
+      EventBus.getDefault().register(this);
+    }
+  }
+
+  @Override
+  public void onNewIntent(Intent intent){
+    Log.i(TAG, "onNewIntent");
+    super.onNewIntent(intent);
+    processIntent(intent);
+  }
+
+  @Override
+  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);
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  @Override
+  protected void onUserLeaveHint() {
+    if (deviceSupportsPipMode()) {
+      PictureInPictureParams params = new PictureInPictureParams.Builder()
+                                                                .setAspectRatio(new Rational(16, 9))
+                                                                .build();
+      setPictureInPictureParams(params);
+
+      //noinspection deprecation
+      enterPictureInPictureMode();
+    }
+  }
+
+  @Override
+  public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+    viewModel.setIsInPipMode(isInPictureInPictureMode);
+  }
+
+  private boolean isInPipMode() {
+    return deviceSupportsPipMode() && isInPictureInPictureMode();
+  }
+
+  private void processIntent(@NonNull Intent intent) {
+    if (ANSWER_ACTION.equals(intent.getAction())) {
+      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())) {
+      handleEndCall();
+    }
+  }
+
+  private void initializeScreenshotSecurity() {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+  }
+
+  private void initializeResources() {
+    callScreen = ViewUtil.findById(this, R.id.callScreen);
+    callScreen.setControlsListener(new ControlsListener());
+  }
+
+  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);
+    startService(intent);
+  }
+
+  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, true);
+    startService(intent);
+  }
+
+  private void handleSetMuteAudio(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_AUDIO);
+    intent.putExtra(WebRtcCallService.EXTRA_MUTE, enabled);
+    startService(intent);
+  }
+
+  private void handleSetMuteVideo(boolean muted) {
+    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() {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_FLIP_CAMERA);
+    startService(intent);
+  }
+
+  private void handleAnswerWithAudio() {
+    Recipient recipient = viewModel.getRecipient().get();
+
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO)
+                 .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)
+                 .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);
+                   startService(intent);
+                 })
+                 .onAnyDenied(this::handleDenyCall)
+                 .execute();
+    }
+  }
+
+  private void handleAnswerWithVideo() {
+    Recipient recipient = viewModel.getRecipient().get();
+
+    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.setRecipient(recipient);
+      callScreen.setStatus(getString(R.string.RedPhone_ending_call));
+      delayedFinish();
+    }
+  }
+
+  private void handleEndCall() {
+    Log.i(TAG, "Hangup pressed, handling termination now...");
+    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP);
+    startService(intent);
+  }
+
+  private void handleIncomingCall(@NonNull WebRtcViewModel event) {
+    callScreen.setRecipient(event.getRecipient());
+  }
+
+  private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
+  }
+
+  private void handleTerminate(@NonNull Recipient recipient, @NonNull HangupMessage.Type hangupType) {
+    Log.i(TAG, "handleTerminate called: " + hangupType.name());
+
+    callScreen.setRecipient(recipient);
+    callScreen.setStatusFromHangupType(hangupType);
+
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+
+    delayedFinish();
+  }
+
+  private void handleCallRinging(@NonNull WebRtcViewModel event) {
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_ringing));
+  }
+
+  private void handleCallBusy(@NonNull WebRtcViewModel event) {
+    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.setRecipient(event.getRecipient());
+  }
+
+  private void handleRecipientUnavailable(@NonNull WebRtcViewModel event) {
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_recipient_unavailable));
+    delayedFinish();
+  }
+
+  private void handleServerFailure(@NonNull WebRtcViewModel event) {
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_network_failed));
+    delayedFinish();
+  }
+
+  private void handleNoSuchUser(final @NonNull WebRtcViewModel event) {
+    if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie
+    AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+    dialog.setTitle(R.string.RedPhone_number_not_registered);
+    dialog.setIconAttribute(R.attr.dialog_alert_icon);
+    dialog.setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice);
+    dialog.setCancelable(true);
+    dialog.setPositiveButton(R.string.RedPhone_got_it, new OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
+      }
+    });
+    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
+      }
+    });
+    dialog.show();
+  }
+
+  private void handleUntrustedIdentity(@NonNull WebRtcViewModel event) {
+    final IdentityKey theirKey  = event.getIdentityKey();
+    final Recipient   recipient = event.getRecipient();
+
+    if (theirKey == null) {
+      handleTerminate(recipient, HangupMessage.Type.NORMAL);
+    }
+
+    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));
+
+    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 deviceSupportsPipMode() {
+    return Build.VERSION.SDK_INT >= 26 &&
+           FeatureFlags.callingPip()   &&
+           getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
+  }
+
+  private void delayedFinish() {
+    delayedFinish(STANDARD_DELAY_FINISH);
+  }
+
+  private void delayedFinish(int 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(), 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 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.setLocalRenderer(event.getLocalRenderer());
+    callScreen.setRemoteRenderer(event.getRemoteRenderer());
+
+    viewModel.updateFromWebRtcViewModel(event);
+
+    if (event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable) {
+      enableVideoIfAvailable = false;
+      handleSetMuteVideo(false);
+    }
+  }
+
+  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();
+    }
+
+    @Override
+    public void onDenyCallPressed() {
+      handleDenyCall();
+    }
+
+    @Override
+    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/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,10 @@ public abstract class Attachment {
   private final String fastPreflightId;
 
   private final boolean voiceNote;
-  private final int width;
-  private final int height;
-
+  private final int     width;
+  private final int     height;
   private final boolean quote;
+  private final long    uploadTimestamp;
 
   @Nullable
   private final String caption;
@@ -49,19 +53,24 @@ 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,
+                    int cdnNumber, @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)
+                    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;
@@ -71,9 +80,11 @@ public abstract class Attachment {
     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 +117,10 @@ public abstract class Attachment {
     return contentType;
   }
 
+  public int getCdnNumber() {
+    return cdnNumber;
+  }
+
   @Nullable
   public String getLocation() {
     return location;
@@ -147,6 +162,10 @@ public abstract class Attachment {
     return quote;
   }
 
+  public long getUploadTimestamp() {
+    return uploadTimestamp;
+  }
+
   public boolean isSticker() {
     return stickerLocator != null;
   }
@@ -159,6 +178,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/AttachmentId.java

@@ -1,12 +1,15 @@
 package org.thoughtcrime.securesms.attachments;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.thoughtcrime.securesms.util.Util;
 
-public class AttachmentId {
+public class AttachmentId implements Parcelable {
 
   @JsonProperty
   private final long rowId;
@@ -19,6 +22,11 @@ public class AttachmentId {
     this.uniqueId = uniqueId;
   }
 
+  private AttachmentId(Parcel in) {
+    this.rowId    = in.readLong();
+    this.uniqueId = in.readLong();
+  }
+
   public long getRowId() {
     return rowId;
   }
@@ -54,4 +62,28 @@ public class AttachmentId {
   public int hashCode() {
     return Util.hashCode(rowId, uniqueId);
   }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(rowId);
+    dest.writeLong(uniqueId);
+  }
+
+  public static final Creator<AttachmentId> CREATOR = new Creator<AttachmentId>() {
+    @Override
+    public AttachmentId createFromParcel(Parcel in) {
+      return new AttachmentId(in);
+    }
+
+    @Override
+    public AttachmentId[] newArray(int size) {
+      return new AttachmentId[size];
+    }
+  };
+
 }

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

@@ -2,36 +2,40 @@ 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;
 
+import java.util.Comparator;
+
 public class DatabaseAttachment extends Attachment {
 
   private final AttachmentId attachmentId;
   private final long         mmsId;
   private final boolean      hasData;
   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,
+                            String fileName, int cdnNumber, 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)
+                            @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, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;
     this.mmsId        = mmsId;
+    this.displayOrder = displayOrder;
   }
 
   @Override
@@ -58,6 +62,10 @@ public class DatabaseAttachment extends Attachment {
     return attachmentId;
   }
 
+  public int getDisplayOrder() {
+    return displayOrder;
+  }
+
   @Override
   public boolean equals(Object other) {
     return other != null &&
@@ -81,4 +89,11 @@ public class DatabaseAttachment extends Attachment {
   public boolean hasThumbnail() {
     return hasThumbnail;
   }
+
+  public static class DisplayOrderComparator implements Comparator<DatabaseAttachment> {
+    @Override
+    public int compare(DatabaseAttachment lhs, DatabaseAttachment rhs) {
+      return Integer.compare(lhs.getDisplayOrder(), rhs.getDisplayOrder());
+    }
+  }
 }

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, 0, 0, false, 0, null, null, null, null, null);
   }
 
   @Nullable