Bump version to 4.30.3

.github/workflows/android.yml

@@ -1,30 +0,0 @@
-name: Android CI
-
-on:
-  pull_request:
-  push:
-    branches:
-    - 'master'
-    - '4.**'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    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

.gitignore

@@ -1,5 +1,4 @@
 .classpath
-captures/
 project.properties
 .project
 .settings
@@ -9,6 +8,7 @@ gen/
 *.iml
 out
 tests
+lint.xml
 local.properties
 ant.properties
 .DS_Store
@@ -25,4 +25,3 @@ obj/
 jni/libspeex/.deps/
 *.sh
 pkcs11.password
-dev.keystore

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th,hi_IN:hi-rIN,qu_EC:qu-rEC
+
+[signal-android.master]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+

AndroidManifest.xml

@@ -0,0 +1,657 @@
+<?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">
+
+    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference"/>
+
+    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
+                android:label="Access to TextSecure Secrets"
+                android:protectionLevel="signature" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+    <uses-feature android:name="android.hardware.location" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
+    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
+    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
+                     tools:ignore="ProtectedPermissions"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
+
+    <!-- For sending/receiving events -->
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+
+
+    <!-- Normal -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
+    <!-- So we can add a TextSecure 'Account' -->
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+
+    <!-- For conversation 'shortcuts' on the desktop -->
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+
+    <!-- For fixing MMS -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
+    <!-- Set image as wallpaper -->
+    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+
+    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
+                android:protectionLevel="signature" />
+    <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
+
+    <application android:name=".ApplicationContext"
+                 android:icon="@mipmap/ic_launcher"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+                 tools:replace="android:allowBackup"
+                 android:allowBackup="false"
+                 android:theme="@style/TextSecure.LightTheme"
+                 android:largeHeap="true">
+
+    <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
+
+    <meta-data android:name="com.google.android.gms.version"
+               android:value="@integer/google_play_services_version" />
+
+    <meta-data android:name="com.google.android.gms.car.application"
+               android:resource="@xml/automotive_app_desc" />
+
+    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
+              android:excludeFromRecents="true"
+              android:screenOrientation="portrait"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:launchMode="singleTask"/>
+
+    <activity android:name=".CountrySelectionActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".InviteActivity"
+              android:theme="@style/TextSecure.HighlightTheme"
+              android:windowSoftInputMode="stateHidden"
+              android:parentActivityName=".ConversationListActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <meta-data
+            android:name="android.support.PARENT_ACTIVITY"
+            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
+    <activity android:name=".PromptMmsActivity"
+              android:label="Configure MMS Settings"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DeviceProvisioningActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="tsdevice"/>
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".preferences.MmsPreferencesActivity"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ShareActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:excludeFromRecents="true"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:noHistory="true"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.SEND" />
+            <category android:name="android.intent.category.DEFAULT"/>
+            <data android:mimeType="audio/*" />
+            <data android:mimeType="image/*" />
+            <data android:mimeType="text/plain" />
+            <data android:mimeType="video/*" />
+            <data android:mimeType="application/*"/>
+            <data android:mimeType="text/*"/>
+            <data android:mimeType="*/*"/>
+        </intent-filter>
+
+        <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value=".service.DirectShareService" />
+
+    </activity>
+
+    <activity android:name=".ConversationListActivity"
+              android:label="@string/app_name"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="true" />
+
+    <activity-alias android:name=".RoutingActivity"
+                    android:targetActivity=".ConversationListActivity"
+                    android:exported="true">
+
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+        </intent-filter>
+
+        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
+                   android:resource="@mipmap/ic_launcher" />
+        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
+                   android:resource="@mipmap/ic_launcher" />
+
+    </activity-alias>
+
+    <activity android:name=".ConversationListArchiveActivity"
+              android:label="@string/AndroidManifest_archived_conversations"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".ConversationListActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
+    <activity android:name=".ConversationActivity"
+              android:windowSoftInputMode="stateUnchanged"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".ConversationListActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
+    <activity android:name=".ConversationPopupActivity"
+              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:excludeFromRecents="true"
+              android:theme="@style/TextSecure.LightTheme.Popup"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".MessageDetailsActivity"
+              android:label="@string/AndroidManifest__message_details"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".GroupCreateActivity"
+          android:windowSoftInputMode="stateVisible"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DatabaseMigrationActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DatabaseUpgradeActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ExperienceUpgradeActivity"
+              android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphraseCreateActivity"
+              android:label="@string/AndroidManifest__create_passphrase"
+              android:windowSoftInputMode="stateUnchanged"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphrasePromptActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightIntroTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".NewConversationActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PushContactSelectionActivity"
+          android:label="@string/AndroidManifest__select_contacts"
+          android:windowSoftInputMode="stateHidden"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".giph.ui.GiphyActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphraseChangeActivity"
+              android:label="@string/AndroidManifest__change_passphrase"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".VerifyIdentityActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ApplicationPreferencesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".RegistrationActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+     <activity android:name=".DeviceActivity"
+               android:label="@string/AndroidManifest__linked_devices"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".LogSubmitActivity"
+              android:label="@string/AndroidManifest__log_submit"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".MediaPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".MediaOverviewActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DummyActivity"
+              android:theme="@android:style/Theme.NoDisplay"
+              android:enabled="true"
+              android:allowTaskReparenting="true"
+              android:noHistory="true"
+              android:excludeFromRecents="true"
+              android:alwaysRetainTaskState="false"
+              android:stateNotNeeded="true"
+              android:clearTaskOnLaunch="true"
+              android:finishOnTaskLaunch="true" />
+
+    <activity android:name=".PlayServicesProblemActivity"
+              android:theme="@style/TextSecure.DialogActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".SmsSendtoActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.SENDTO" />
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
+        </intent-filter>
+    </activity>
+
+    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
+              android:excludeFromRecents="true"
+              android:theme="@style/NoAnimation.Theme.BlackScreen"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
+        </intent-filter>
+
+    </activity>
+
+    <activity android:name=".RecipientPreferenceActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              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"/>
+
+    <activity android:name=".scribbles.ScribbleActivity"
+              android:theme="@style/TextSecure.ScribbleTheme"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".scribbles.StickerSelectActivity"
+              android:theme="@style/TextSecure.ScribbleTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
+
+    <activity android:name=".CreateProfileActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:windowSoftInputMode="stateVisible"
+              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">
+
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".contactshare.ContactShareEditActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.ContactNameEditActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.SharedContactDetailsActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ShortcutLauncherActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:exported="true"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".camera.CameraActivity"
+              android:theme="@style/TextSecure.ScribbleTheme"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
+    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
+    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
+    <service android:enabled="true" android:name=".service.IncomingMessageObserver$ForegroundService"/>
+
+    <service android:name=".service.QuickResponseService"
+             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+             android:exported="true" >
+        <intent-filter>
+            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+    </service>
+
+    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.accounts.AccountAuthenticator" />
+        </intent-filter>
+        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
+    </service>
+
+    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.content.SyncAdapter"/>
+        </intent-filter>
+        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
+    </service>
+
+    <service android:name=".service.DirectShareService"
+             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+        <intent-filter>
+            <action android:name="android.service.chooser.ChooserTargetService" />
+        </intent-filter>
+    </service>
+
+    <service android:name=".service.GenericForegroundService"/>
+
+    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
+        <intent-filter>
+            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            <category android:name="org.thoughtcrime.securesms" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.SmsListener"
+              android:permission="android.permission.BROADCAST_SMS"
+              android:enabled="true"
+              android:exported="true">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.SmsDeliveryListener"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.MmsListener"
+              android:enabled="true"
+              android:exported="true"
+              android:permission="android.permission.BROADCAST_WAP_PUSH">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MarkReadReceiver"
+              android:enabled="true"
+              android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.RemoteReplyReceiver"
+              android:enabled="true"
+              android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.ExpirationListener" />
+
+    <provider android:name=".providers.PartProvider"
+              android:grantUriPermissions="true"
+              android:exported="false"
+              android:authorities="org.thoughtcrime.provider.securesms" />
+
+    <provider android:name=".providers.MmsBodyProvider"
+              android:grantUriPermissions="true"
+              android:exported="false"
+              android:authorities="org.thoughtcrime.provider.securesms.mms" />
+
+    <provider android:name="android.support.v4.content.FileProvider"
+              android:authorities="org.thoughtcrime.securesms.fileprovider"
+              android:exported="false"
+              android:grantUriPermissions="true">
+
+        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
+
+    </provider>
+
+    <provider android:name=".database.DatabaseContentProviders$Conversation"
+              android:authorities="org.thoughtcrime.securesms.database.conversation"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$ConversationList"
+              android:authorities="org.thoughtcrime.securesms.database.conversationlist"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Attachment"
+              android:authorities="org.thoughtcrime.securesms.database.attachment"
+              android:exported="false" />
+
+    <provider
+              android:name="androidx.work.impl.WorkManagerInitializer"
+              android:authorities="${applicationId}.workmanager-init"
+              android:exported="false"
+              tools:node="remove" />
+
+    <receiver android:name=".service.BootReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            <action android:name="org.thoughtcrime.securesms.RESTART"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.DirectoryRefreshListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.RotateSignedPreKeyListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.LocalBackupListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.PersistentConnectionBootListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.LocaleChangedReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.LOCALE_CHANGED"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.DeleteNotificationReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
+        </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">
+        <intent-filter>
+            <action android:name="info.guardianproject.panic.action.TRIGGER" />
+        </intent-filter>
+    </receiver>
+
+    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
+    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
+    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
+
+</application>
+</manifest>

BUILDING.md

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

CONTRIBUTING.md

@@ -83,7 +83,7 @@ There are several other ways to get involved:
 * Try to reproduce issues and help with troubleshooting.
 * Discover solutions to open issues and post any relevant findings.
 * Test other people's pull requests.
-* [Donate to Signal.](https://signal.org/donate/)
+* Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/).
 * Share Signal with your friends and family.
 
 Signal is made for you. Thank you for your feedback and support.

Dockerfile

@@ -12,7 +12,7 @@ RUN dpkg --add-architecture i386 && \
 ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz
 ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME}
 ENV ANDROID_API_LEVELS android-28
-ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
+ENV ANDROID_BUILD_TOOLS_VERSION 27.0.3
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /usr/local/ && \

README.md

@@ -27,6 +27,7 @@ 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.
 
@@ -59,7 +60,9 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2013-2020 Signal
+Copyright 2011 Whisper Systems
+
+Copyright 2013-2017 Open Whisper Systems
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

ReproducibleBuilds.md

@@ -1,287 +0,0 @@
-# Reproducible Builds
-
-
-## TL;DR
-
-You can just use these [instructions](https://signal.org/blog/reproducible-android/) from the official announcement at Open Whisper Systems's blog:
-```
-# Clone the Signal Android source repository
-$ git clone https://github.com/signalapp/Signal-Android.git && cd Signal-Android
-
-# Check out the release tag for the version you'd like to compare
-$ git checkout v[the version number]
-
-# Build using the Docker environment
-$ docker run --rm -v $(pwd):/project -w /project whispersystems/signal-android:1.3 ./gradlew clean assembleRelease
-
-# Verify the APKs
-$ python3 apkdiff/apkdiff.py build/outputs/apks/project-release-unsigned.apk path/to/SignalFromPlay.apk
-```
-
-Note that the instructions above use a pre-built Signal Docker image from [Docker Hub](https://hub.docker.com/u/whispersystems/). If you wish to compile the image yourself, continue reading the longer version below.
-
-
-***
-
-
-## Introduction
-
-Since version 3.15.0 Signal for Android has supported reproducible builds. This is achieved by replicating the build environment as a Docker image. You'll need to build the image, run a container instance of it, compile Signal inside the container and finally compare the resulted APK to the APK that is distributed in the Google Play Store.
-
-The command line parts in this guide are written for Linux but with some little modifications you can adapt them to macOS (OS X) and Windows. In the following sections we will use `3.15.2` as an example Signal version. You'll just need to replace all occurrences of `3.15.2` with the version number you are about to verify.
-
-
-## Setting up directories
-
-First let's create a new directory for this whole reproducible builds project. In your home folder (`~`), create a new directory called `reproducible-signal`.
-```
-user@host:$ mkdir ~/reproducible-signal
-```
-
-Next create another directory inside `reproducible-signal` called `apk-from-google-play-store`.
-```
-user@host:$ mkdir ~/reproducible-signal/apk-from-google-play-store
-```
-
-We will use this directory to share APKs between the host OS and the Docker container.
-
-Finally create one more directory inside `reproducible-signal` called `image-build-context`.
-```
-user@host:$ mkdir ~/reproducible-signal/image-build-context
-```
-
-This directory will be used later to build our Docker image.
-
-
-## Getting the Google Play Store version of Signal APK
-
-To compare the APKs we of course need a version of Signal from the Google Play Store.
-
-First make sure that the Signal version you want to verify is installed on your Android device. You'll need `adb` for this part.
-
-Plug your device to your computer and run this command to pull the APK from the device:
-
-```
-user@host:$ adb pull $(adb shell pm path org.thoughtcrime.securesms | grep /base.apk | awk -F':' '{print $2}') ~/reproducible-signal/apk-from-google-play-store/Signal-$(adb shell dumpsys package org.thoughtcrime.securesms | grep versionName | awk -F'=' '{print $2}').apk
-```
-
-This will pull a file into `~/reproducible-signal/apk-from-google-play-store/` with the name `Signal-<version>.apk`
-
-Alternatively, you can do this step-by-step:
-
-```
-user@host:$ adb shell pm path org.thoughtcrime.securesms
-```
-This will output something like:
-```
-package:/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk
-```
-
-The output will tell you where the Signal APK is located in your device. (In this example the path is `/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk`)
-
-Now using this information, pull the APK from your device to the `reproducible-signal/apk-from-google-play-store` directory you created before:
-```
-user@host:$ adb pull \
-              /data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk \
-              ~/reproducible-signal/apk-from-google-play-store/Signal-3.15.2.apk
-```
-
-We will use this APK in the final part when we compare it with the self-built APK from GitHub.
-
-## Identifying the ABI
-
-Since v4.37.0, the APKs have been split by ABI, the CPU architecture of the target device. Google play will serve the correct one to you for your device.
-
-To identify which ABIs the google play APK supports, we can look inside the APK, which is just a zip file:
-
-```
-user@host:$ unzip -l ~/reproducible-signal/apk-from-google-play-store/Signal-*.apk | grep lib/
-```
-
-Example:
-
-```
-  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
-   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
-  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
-    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
-  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
-```
-
-As there is just one sub directory of `lib/` called `armeabi-v7a`, that is your ABI. Make a note of that for later. If you see more than one subdirectory of `lib/`:
-
-```
-  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
-   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
-  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
-    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
-  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
-  2111376  00-00-1980 00:00   lib/x86/libconscrypt_jni.so
-   201056  00-00-1980 00:00   lib/x86/libcurve25519.so
-  7303888  00-00-1980 00:00   lib/x86/libjingle_peerconnection_so.so
-     5596  00-00-1980 00:00   lib/x86/libnative-utils.so
-  3977636  00-00-1980 00:00   lib/x86/libsqlcipher.so
-```
-
-Then that means you have the `universal` APK.
-
-## Installing Docker
-
-Install Docker by following the instructions for your platform at https://docs.docker.com/engine/installation/
-
-Your platform might also have its own preferred way of installing Docker. E.g. Ubuntu has its own Docker package (`docker.io`) if you do not want to follow Docker's instructions.
-
-In the following sections we will assume that your Docker installation works without issues. So after installing, please make sure that everything is running smoothly before continuing.
-
-
-## Building a Docker image for Signal
-
-#### Grabbing the `Dockerfile`
-
-First you will need the `Dockerfile` for Signal Android. It comes bundled with Signal's source code. The `Dockerfile` contains instructions on how to automatically build a Docker image for Signal. You just need to run it and it builds itself.
-
-Download the `Dockerfile` to the `image-build-context` directory.
-
-```
-user@host:$ wget -O ~/reproducible-signal/image-build-context/Dockerfile_v3.15.2 \
-                    https://raw.githubusercontent.com/signalapp/Signal-Android/v3.15.2/Dockerfile
-```
-
-Note that the `Dockerfile` is specific to the Signal version you want to compare to. Again you have to adjust the URL above to match the right version. (Though sometimes the file might not be up to date, see the [Troubleshooting section](#troubleshooting))
-
-
-#### Building the image
-
-Now we have everything we need to build the Docker image for Signal. Go to the `image-build-context` directory:
-
-```
-user@host:$ cd ~/reproducible-signal/image-build-context
-```
-
-And list the contents.
-```
-user@host:$ ls
-```
-The output should look like this:
-```
-Dockerfile_v3.15.2
-```
-
-Now in this directory build the image using `Dockerfile_v3.15.2`:
-```
-user@host:$ docker build --file Dockerfile_v3.15.2 --tag signal-android .
-```
-
-(Note that there is a dot at the end of that command!)
-
-Wait a few years for the build to finish... :construction_worker:
-
-(Depending on your computer and network connection, this may take several minutes.)
-
-:calendar: :sleeping:
-
-After the build has finished, you may wish to list all your Docker images to see that it's really there:
-```
-user@host:$ docker images
-```
-Output should look something like this:
-```
-REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-signal-android      latest              c6b84450b896        46 seconds ago      2.94 GB
-ubuntu              14.04.3             8693db7e8a00        9 weeks ago         187.9 MB
-```
-
-
-## Compiling Signal inside a container
-
-Next we will run a container of the image we just built, grab Signal's source code and compile Signal.
-
-First go to the `reproducible-signal` directory:
-
-```
-user@host:$ cd ~/reproducible-signal/
-```
-
-To run a new ephemeral container with an interactive terminal session execute the following long command:
-```
-user@host:$ docker run \
-              --name signal \
-              --rm \
-              --interactive \
-              --tty \
-              --volume $(pwd)/apk-from-google-play-store:/signal-build/apk-from-google-play-store \
-              --workdir /signal-build \
-              signal-android
-```
-Now you are inside the container.
-
-Grab Signal's source code from GitHub and go to the repository directory:
-```
-root@container:# git clone https://github.com/signalapp/Signal-Android.git
-root@container:# cd Signal-Android
-```
-
-Before you can compile, you **must** ensure that you are at the right commit. In other words you **must** checkout the version you wish to verify (here we are verifying 3.15.2):
-```
-root@container:# git checkout --quiet v3.15.2
-```
-
-Now you may compile the release APK by running:
-```
-root@container:# ./gradlew clean assemblePlayRelease --exclude-task signProductionPlayRelease
-```
-This will take a few minutes :sleeping:
-
-
-#### Checking if the APKs match
-
-After the build has completed successfully we can finally compare if the APKs match. For the comparison we need of course the Google Play Store version of Signal APK which you copied to the `apk-from-google-play-store` directory in the beginning of this guide. Because we used that directory as a `--volume` parameter for our container, we can see all the files in that directory within our container.
-
-So now we can compare the APKs using the `apkdiff.py` tool.
-
-The above build step produced several APKs, one for each supported ABI and one universal one. You will need to determine the correct APK to compare.
-
-Currently, the most common ABI is `armeabi-v7a`. Other options at this time include `x86` and `universal`. In the future it will also include 64-bit options, such as `x86_64` and `arm64-v8a`.
-
-See [Identifying the ABI](#identifying-the-abi) above if you don't know the ABI of your play store APK.
-
-Once you have determined the ABI, add an `abi` environment variable. For example, suppose we determine that `armeabi-v7a` is the ABI google play has served:
-
-```
-root@container:# export abi=armeabi-v7a
-```
-
-And the diff script to compare:
-```
-root@container:# python3 apkdiff/apkdiff.py \
-                   build/outputs/apk/play/release/*play-$abi-release-unsigned*.apk \
-                   ../apk-from-google-play-store/Signal-3.15.2.apk
-```
-Output:
-```
-APKs match!
-```
-
-If you get `APKs match!`, you have successfully verified that the Google Play release matches with your own self-built version of Signal. Congratulations! Your APKs are a match made in heaven! :sparkles:
-
-If you get `APKs don't match!`, you did something wrong in the previous steps. See the [Troubleshooting section](#troubleshooting) for more info.
-
-
-## Comparing next time
-
-If the build environment (i.e. `Dockerfile`) has not changed, you don't need to build the image again to verify a newer APK. You can just [run the container again](#compiling-signal-inside-a-container).
-
-
-## Troubleshooting
-
-If you cannot get things to work, please do not open an issue or comment on an existing issue at GitHub. Instead, ask for help at https://community.signalusers.org/c/development
-
-Some common issues why things may not work:
-- some pinned packages in the `Dockerfile` are not available anymore and building of the Docker image fails
-- the Android packages in the Docker image are outdated and compiling Signal fails
-- you built the Docker image with a wrong version of the `Dockerfile`
-- you didn't checkout the correct Signal version tag with Git before compiling
-- the ABI you selected is not the correct ABI, particularly if you see an error along the lines of `Sorted manifests don't match, lib/x86/libcurve25519.so vs lib/armeabi-v7a/libcurve25519.so`.
-- this guide is outdated
-- you are in a dream
-- if you run into this issue: https://issuetracker.google.com/issues/110237303 try to add `resources.arsc` to the list of ignored files and compare again

apkdiff/apkdiff.py

@@ -1,21 +1,20 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
 
 import sys
 from zipfile import ZipFile
 
 class ApkDiff:
-    # resources.arsc is ignored due to https://issuetracker.google.com/issues/110237303
-    # May be fixed in Android Gradle Plugin 3.4
-    IGNORE_FILES = ["META-INF/MANIFEST.MF", "META-INF/SIGNAL_S.RSA", "META-INF/SIGNAL_S.SF", "resources.arsc"]
+
+    IGNORE_FILES = ["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"]
 
     def compare(self, sourceApk, destinationApk):
         sourceZip      = ZipFile(sourceApk, 'r')
         destinationZip = ZipFile(destinationApk, 'r')
 
         if self.compareManifests(sourceZip, destinationZip) and self.compareEntries(sourceZip, destinationZip) == True:
-            print("APKs match!")
+            print "APKs match!"
         else:
-            print("APKs don't match!")
+            print "APKs don't match!"
 
     def compareManifests(self, sourceZip, destinationZip):
         sourceEntrySortedList      = sorted(sourceZip.namelist())
@@ -24,23 +23,23 @@ class ApkDiff:
         for ignoreFile in self.IGNORE_FILES:
             while ignoreFile in sourceEntrySortedList: sourceEntrySortedList.remove(ignoreFile)
             while ignoreFile in destinationEntrySortedList: destinationEntrySortedList.remove(ignoreFile)
-
+                    
         if len(sourceEntrySortedList) != len(destinationEntrySortedList):
-            print("Manifest lengths differ!")
-
+            print "Manifest lengths differ!"
+        
         for (sourceEntryName, destinationEntryName) in zip(sourceEntrySortedList, destinationEntrySortedList):
             if sourceEntryName != destinationEntryName:
-                print("Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName))
+                print "Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName)   
                 return False
 
         return True
-
+            
     def compareEntries(self, sourceZip, destinationZip):
-        sourceInfoList      = list(filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist()))
-        destinationInfoList = list(filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist()))
-
+        sourceInfoList      = filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist())
+        destinationInfoList = filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist())
+        
         if len(sourceInfoList) != len(destinationInfoList):
-            print("APK info lists of different length!")
+            print "APK info lists of different length!"
             return False
 
         for sourceEntryInfo in sourceInfoList:
@@ -50,19 +49,19 @@ class ApkDiff:
                     destinationEntry = destinationZip.open(destinationEntryInfo, 'r')
 
                     if self.compareFiles(sourceEntry, destinationEntry) != True:
-                        print("APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename))
+                        print "APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename)
                         return False
 
                     destinationInfoList.remove(destinationEntryInfo)
                     break
-
+                
         return True
 
     def compareFiles(self, sourceFile, destinationFile):
         sourceChunk      = sourceFile.read(1024)
         destinationChunk = destinationFile.read(1024)
 
-        while sourceChunk != b"" or destinationChunk != b"":
+        while sourceChunk != "" or destinationChunk != "":
             if sourceChunk != destinationChunk:
                 return False
 
@@ -73,7 +72,7 @@ class ApkDiff:
 
 if __name__ == '__main__':
     if len(sys.argv) != 3:
-        print("Usage: apkdiff <pathToFirstApk> <pathToSecondApk>")
+        print "Usage: apkdiff <pathToFirstApk> <pathToSecondApk>"
         sys.exit(1)
 
     ApkDiff().compare(sys.argv[1], sys.argv[2])

app/.tx/config

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

@@ -1,484 +0,0 @@
-import org.signal.signing.ApkSignerUtil
-
-import java.security.MessageDigest
-
-buildscript {
-    repositories {
-        google()
-        maven {
-            url "https://repo1.maven.org/maven2"
-        }
-        jcenter {
-            content {
-                includeVersion 'org.jetbrains.trove4j', 'trove4j', '20160824'
-            }
-        }
-    }
-    dependencies {
-        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'
-    }
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'androidx.navigation.safeargs'
-apply plugin: 'witness'
-apply from: 'translations.gradle'
-apply from: 'witness-verifications.gradle'
-
-repositories {
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/photoview/releases/"
-        content {
-            includeGroupByRegex "com\\.github\\.chrisbanes.*"
-        }
-    }
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
-        content {
-            includeGroupByRegex "me\\.leolin.*"
-        }
-    }
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
-        content {
-            includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
-        }
-    }
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
-        content {
-            includeGroupByRegex "org\\.signal.*"
-        }
-    }
-    maven { // textdrawable
-        url 'https://dl.bintray.com/amulyakhare/maven'
-        content {
-            includeGroupByRegex "com\\.amulyakhare.*"
-        }
-    }
-    google()
-    mavenCentral()
-    jcenter()
-    mavenLocal()
-}
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.10.0'
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java {
-                    option "lite"
-                }
-            }
-        }
-    }
-}
-
-def canonicalVersionCode = 713
-def canonicalVersionName = "4.72.4"
-
-def postFixSize = 10
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
-
-android {
-    flavorDimensions "none"
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
-    useLibrary 'org.apache.http.legacy'
-
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
-    signingConfigs {
-        staging {
-            storeFile file("${project.rootDir}/dev.keystore")
-            storePassword 'android'
-            keyAlias 'staging'
-            keyPassword 'android'
-        }
-    }
-
-    defaultConfig {
-        versionCode canonicalVersionCode * postFixSize
-        versionName canonicalVersionName
-
-        minSdkVersion 19
-        targetSdkVersion 28
-        multiDexEnabled true
-
-        vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal");
-
-        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
-        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
-        buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
-        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
-        buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
-        buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
-        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
-        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
-        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
-        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
-        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
-        buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
-        buildConfigField "String", "KBS_SERVICE_ID", "\"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"
-
-        ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-        }
-
-        resConfigs autoResConfig()
-
-        splits {
-            abi {
-                enable true
-                reset()
-                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                universalApk true
-            }
-        }
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
-        exclude 'asm-license.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/proguard/androidx-annotations.pro'
-    }
-
-    aaptOptions {
-        ignoreAssetsPattern '!contours.tfl:!LMprec_600.emd:!blazeface.tfl'
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard/proguard-firebase-messaging.pro',
-                    'proguard/proguard-google-play-services.pro',
-                    'proguard/proguard-jackson.pro',
-                    'proguard/proguard-sqlite.pro',
-                    'proguard/proguard-appcompat-v7.pro',
-                    'proguard/proguard-square-okhttp.pro',
-                    'proguard/proguard-square-okio.pro',
-                    'proguard/proguard-spongycastle.pro',
-                    'proguard/proguard-rounded-image-view.pro',
-                    'proguard/proguard-glide.pro',
-                    'proguard/proguard-shortcutbadger.pro',
-                    'proguard/proguard-retrofit.pro',
-                    'proguard/proguard-webrtc.pro',
-                    'proguard/proguard-klinker.pro',
-                    'proguard/proguard-retrolambda.pro',
-                    'proguard/proguard-okhttp.pro',
-                    'proguard/proguard-ez-vcard.pro',
-                    'proguard/proguard.cfg'
-            testProguardFiles 'proguard/proguard-automation.pro',
-                    'proguard/proguard.cfg'
-        }
-        staging {
-            initWith debug
-            applicationIdSuffix ".staging"
-            signingConfig signingConfigs.staging
-
-            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", "CDS_MRENCLAVE", "\"bd123560b01c8fa92935bc5ae15cd2064e5c45215f23f0bd40364d521329d2ad\""
-            buildConfigField "String", "KBS_ENCLAVE_NAME", "\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\""
-            buildConfigField "String", "KBS_SERVICE_ID", "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\""
-            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
-            proguardFiles = buildTypes.debug.proguardFiles
-        }
-    }
-
-    productFlavors {
-        play {
-            dimension "none"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-        }
-
-        website {
-            dimension "none"
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
-        }
-    }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-            def abiName = output.getFilter("ABI") ?: 'universal'
-            def postFix = abiPostFix.get(abiName, 0)
-
-            if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
-
-            output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-        }
-    }
-
-    lintOptions {
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        disable "LintError"
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-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.7.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.11.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.makeramen:roundedimageview:2.1.0'
-    implementation 'com.pnikosis:materialish-progress:1.5'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'pl.tajchert:waitingdots:0.1.0'
-    implementation 'com.melnykov:floatingactionbutton:1.3.0'
-    implementation 'com.google.zxing:android-integration:3.1.0'
-    implementation 'mobi.upod:time-duration-picker:1.1.3'
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.google.zxing:core:3.2.1'
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
-        exclude group: 'com.squareup.okhttp', module: 'okhttp'
-        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
-    }
-    implementation 'com.annimon:stream:1.1.8'
-    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
-
-    implementation 'com.airbnb.android:lottie:3.0.7'
-
-    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
-    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
-    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
-    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }
-    implementation 'dnsjava:dnsjava:2.1.9'
-
-    flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
-    flipperImplementation 'com.facebook.soloader:soloader:0.8.2'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation 'org.mockito:mockito-core:2.8.9'
-    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
-    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.4'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.7.4'
-
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation ('org.robolectric:robolectric:4.2') {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    testImplementation 'org.robolectric:shadows-multidex:4.2'
-
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
-
-dependencyVerification {
-    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
-}
-
-
-def assembleWebsiteDescriptor = { variant, file ->
-    if (file.exists()) {
-        MessageDigest md = MessageDigest.getInstance("SHA-256");
-        file.eachByte 4096, {bytes, size ->
-            md.update(bytes, 0, size);
-        }
-
-        String digest  = md.digest().collect {String.format "%02x", it}.join();
-        String url     = variant.productFlavors.get(0).ext.websiteUpdateUrl
-        String apkName = file.getName()
-
-        String descriptor = "{" +
-                "\"versionCode\" : ${canonicalVersionCode * postFixSize + abiPostFix['universal']}," +
-                "\"versionName\" : \"$canonicalVersionName\"," +
-                "\"sha256sum\" : \"$digest\"," +
-                "\"url\" : \"$url/$apkName\"" +
-                "}"
-
-        File descriptorFile = new File(file.getParent(), apkName.replace(".apk", ".json"))
-
-        descriptorFile.write(descriptor)
-    }
-}
-
-def signProductionRelease = { variant ->
-    variant.outputs.collect { output ->
-        String apkName    = output.outputFile.name
-        File   inputFile  = new File(output.outputFile.path)
-        File   outputFile = new File(output.outputFile.parent, apkName.replace('-unsigned', ''))
-
-        new ApkSignerUtil('sun.security.pkcs11.SunPKCS11',
-                          'pkcs11.config',
-                          'PKCS11',
-                          'file:pkcs11.password').calculateSignature(inputFile.getAbsolutePath(),
-                                                                     outputFile.getAbsolutePath())
-
-        inputFile.delete()
-        outputFile
-    }
-}
-
-task signProductionPlayRelease {
-    doLast {
-        signProductionRelease(android.applicationVariants.find { (it.name == 'playRelease') })
-    }
-}
-
-task signProductionWebsiteRelease {
-    doLast {
-        def  variant       = android.applicationVariants.find { (it.name == 'websiteRelease') }
-        File signedRelease = signProductionRelease(variant).find { it.name.contains('universal') }
-        assembleWebsiteDescriptor(variant, signedRelease)
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name.equals("assemblePlayRelease")) {
-        task.finalizedBy signProductionPlayRelease
-    }
-
-    if (task.name.equals("assembleWebsiteRelease")) {
-        task.finalizedBy signProductionWebsiteRelease
-    }
-}
-
-def getLastCommitTimestamp() {
-    new ByteArrayOutputStream().withStream { os ->
-        def result = exec {
-            executable = 'git'
-            args = ['log', '-1', '--pretty=format:%ct']
-            standardOutput = os
-        }
-
-        return os.toString() + "000"
-    }
-}
-
-tasks.withType(Test) {
-    testLogging {
-        events "failed"
-        exceptionFormat "full"
-        showCauses true
-        showExceptions true
-        showStackTraces true
-    }
-}

app/jni/Application.mk

@@ -1,6 +0,0 @@
-# Built with NDK 19.2.5345600
-APP_ABI      := armeabi-v7a x86 arm64-v8a x86_64
-APP_PLATFORM := android-19
-APP_STL      := c++_static
-APP_CPPFLAGS += -fexceptions
-APP_OPTIM    := debug

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp

@@ -1,45 +0,0 @@
-#include "org_thoughtcrime_securesms_util_FileUtils.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <linux/memfd.h>
-#include <syscall.h>
-
-jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
-  (JNIEnv *env, jclass clazz, jobject fileDescriptor)
-{
-  jclass fdClass = env->GetObjectClass(fileDescriptor);
-
-  if (fdClass == NULL) {
-    return -1;
-  }
-
-  jfieldID fdFieldId = env->GetFieldID(fdClass, "descriptor", "I");
-
-  if (fdFieldId == NULL) {
-    return -1;
-  }
-
-  int fd = env->GetIntField(fileDescriptor, fdFieldId);
-
-  struct stat stat_struct;
-
-  if (fstat(fd, &stat_struct) != 0) {
-    return -1;
-  }
-
-  return stat_struct.st_uid;
-}
-
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
-  (JNIEnv *env, jclass clazz, jstring jname)
-{
-  const char *name = env->GetStringUTFChars(jname, NULL);
-
-  int fd = syscall(SYS_memfd_create, name, MFD_CLOEXEC);
-
-  env->ReleaseStringUTFChars(jname, name);
-
-  return fd;
-}

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h

@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_thoughtcrime_securesms_util_FileUtils */
-
-#ifndef _Included_org_thoughtcrime_securesms_util_FileUtils
-#define _Included_org_thoughtcrime_securesms_util_FileUtils
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_thoughtcrime_securesms_util_FileUtils
- * Method:    getFileDescriptorOwner
- * Signature: (Ljava/io/FileDescriptor;)I
- */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_thoughtcrime_securesms_util_FileUtils
- * Method:    createMemoryFileDescriptor
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
-  (JNIEnv *, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

app/lint-baseline.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.3.2" client="gradle" variant="playRelease" version="3.3.2">
-
-    <issue
-        id="MissingPermission"
-        message="Call requires permission which may be rejected by user: code should explicitly check to see if permission is available (with `checkPermission`) or explicitly handle a potential `SecurityException`"
-        errorLine1="    List&lt;SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
-            line="101"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type styleable"
-        errorLine1="                drawables.getColor(1, 0xff000000);"
-        errorLine2="                                   ~">
-        <location
-            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
-            line="187"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="AppLinkUrlError"
-        message="Missing URL"
-        errorLine1="        &lt;intent-filter>"
-        errorLine2="        ^">
-        <location
-            file="AndroidManifest.xml"
-            line="368"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="AppLinkUrlError"
-        message="Missing URL"
-        errorLine1="        &lt;intent-filter>"
-        errorLine2="        ^">
-        <location
-            file="AndroidManifest.xml"
-            line="381"
-            column="9"/>
-    </issue>
-
-</issues>

app/lint.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-
-    <!-- Wont pass lint or qa with a STOPSHIP in a comment -->
-    <issue id="StopShip" severity="fatal" />
-
-    <!-- L10N errors -->
-    <!-- This is a runtime crash so we don't want to ship with this. -->
-    <issue id="StringFormatMatches" severity="error" />
-
-    <!-- L10N warnings -->
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingQuantity" severity="warning" />
-    <issue id="MissingDefaultResource" severity="error">
-        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English, excludeNonTranslatables task will remove these -->
-    </issue>
-    <issue id="ExtraTranslation" severity="warning" />
-    <issue id="ImpliedQuantity" severity="warning" />
-    <issue id="TypographyDashes" severity="error" >
-        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English -->
-    </issue>
-
-    <issue id="CanvasSize" severity="error" />
-    <issue id="HardcodedText" severity="error" />
-    <issue id="VectorRaster" severity="error" />
-    <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/proguard/proguard-firebase-messaging.pro

@@ -1 +0,0 @@
--dontwarn com.google.firebase.analytics.connector.AnalyticsConnector

app/proguard/proguard.cfg

@@ -1,11 +0,0 @@
--dontoptimize
--dontobfuscate
--keepattributes SourceFile,LineNumberTable
--keep class org.whispersystems.** { *; }
--keep class org.thoughtcrime.securesms.** { *; }
--keepclassmembers class ** {
-    public void onEvent*(**);
-}
-
-# Protobuf lite
--keep class * extends com.google.protobuf.GeneratedMessageLite { *; }

app/sampledata/contacts.json

@@ -1,29 +0,0 @@
-{
-  "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

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

@@ -1,16 +0,0 @@
-<?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">
-
-        <activity
-            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-            android:exported="true" />
-
-    </application>
-
-</manifest>

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

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

@@ -1,257 +0,0 @@
-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 org.thoughtcrime.securesms.logging.Log;
-
-import java.lang.reflect.Field;
-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> {
-
-  private static final String TAG = Log.tag(FlipperSqlCipherAdapter.class);
-
-  public FlipperSqlCipherAdapter(Context context) {
-    super(context);
-  }
-
-  @Override
-  public List<Descriptor> getDatabases() {
-    try {
-      Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
-      databaseHelperField.setAccessible(true);
-      SQLCipherOpenHelper sqlCipherOpenHelper = (SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext()));
-      return Collections.singletonList(new Descriptor(sqlCipherOpenHelper));
-    } catch (Exception e) {
-      Log.i(TAG, "Unable to use reflection to access raw database.", e);
-    }
-    return Collections.emptyList();
-  }
-
-  @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 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (Flipper)</string>
-</resources>

app/src/main/AndroidManifest.xml

@@ -1,787 +0,0 @@
-<?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">
-
-    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
-
-    <permission android:name="${applicationId}.ACCESS_SECRETS"
-                android:label="Access to TextSecure Secrets"
-                android:protectionLevel="signature" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
-    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-
-    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
-    <uses-permission android:name="android.permission.READ_PROFILE"/>
-    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
-    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
-                     tools:ignore="ProtectedPermissions"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
-
-    <!-- For sending/receiving events -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
-
-    <!-- Normal -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <!-- So we can add a TextSecure 'Account' -->
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-
-    <!-- For conversation 'shortcuts' on the desktop -->
-    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-
-    <!-- For fixing MMS -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-
-    <!-- Set image as wallpaper -->
-    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
-
-    <application android:name=".ApplicationContext"
-                 android:icon="@mipmap/ic_launcher"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-                 tools:replace="android:allowBackup"
-                 android:allowBackup="false"
-                 android:theme="@style/TextSecure.LightTheme"
-                 android:largeHeap="true">
-
-    <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
-
-    <meta-data android:name="com.google.android.gms.version"
-               android:value="@integer/google_play_services_version" />
-
-    <meta-data android:name="com.google.android.gms.car.application"
-               android:resource="@xml/automotive_app_desc" />
-
-    <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-    <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
-
-    <activity android:name=".WebRtcCallActivity"
-              android:theme="@style/TextSecure.LightTheme.WebRTCCall"
-              android:excludeFromRecents="true"
-              android:screenOrientation="portrait"
-              android:supportsPictureInPicture="true"
-              android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-              android:taskAffinity=".calling"
-              android:launchMode="singleTask"/>
-
-    <activity android:name=".messagerequests.CalleeMustAcceptMessageRequestActivity"
-              android:theme="@style/TextSecure.DarkNoActionBar"
-              android:screenOrientation="portrait"
-              android:noHistory="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".InviteActivity"
-              android:theme="@style/Signal.Light.NoActionBar.Invite"
-              android:windowSoftInputMode="stateHidden"
-              android:parentActivityName=".MainActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value=".MainActivity" />
-    </activity>
-
-    <activity android:name=".PromptMmsActivity"
-              android:label="Configure MMS Settings"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DeviceProvisioningActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="tsdevice"/>
-        </intent-filter>
-    </activity>
-
-    <activity android:name=".preferences.MmsPreferencesActivity"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".sharing.ShareActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:excludeFromRecents="true"
-              android:launchMode="singleTask"
-              android:taskAffinity=""
-              android:noHistory="true"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.SEND" />
-            <category android:name="android.intent.category.DEFAULT"/>
-            <data android:mimeType="audio/*" />
-            <data android:mimeType="image/*" />
-            <data android:mimeType="text/plain" />
-            <data android:mimeType="video/*" />
-            <data android:mimeType="application/*"/>
-            <data android:mimeType="text/*"/>
-            <data android:mimeType="*/*"/>
-        </intent-filter>
-
-        <intent-filter>
-            <action android:name="android.intent.action.SEND_MULTIPLE" />
-            <category android:name="android.intent.category.DEFAULT"/>
-            <data android:mimeType="image/*" />
-            <data android:mimeType="video/*" />
-        </intent-filter>
-
-      <meta-data
-          android:name="android.service.chooser.chooser_target_service"
-                android:value=".service.DirectShareService" />
-
-    </activity>
-
-    <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:launchMode="singleTask"
-              android:noHistory="true"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="sgnl"
-                  android:host="addstickers" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https"
-                  android:host="signal.art"
-                  android:pathPrefix="/addstickers"/>
-        </intent-filter>
-    </activity>
-
-    <activity-alias android:name=".RoutingActivity"
-                    android:targetActivity=".MainActivity"
-                    android:exported="true">
-
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
-        </intent-filter>
-
-        <intent-filter android:autoVerify="true"
-                       tools:targetApi="23">
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https"
-                  android:host="signal.group"/>
-        </intent-filter>
-
-        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
-                   android:resource="@mipmap/ic_launcher" />
-        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
-                   android:resource="@mipmap/ic_launcher" />
-
-    </activity-alias>
-
-    <activity android:name=".conversation.ConversationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".MainActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.MainActivity" />
-    </activity>
-
-    <activity android:name=".longmessage.LongMessageActivity" />
-
-    <activity android:name=".conversation.ConversationPopupActivity"
-              android:windowSoftInputMode="stateVisible"
-              android:launchMode="singleTask"
-              android:taskAffinity=""
-              android:excludeFromRecents="true"
-              android:theme="@style/TextSecure.LightTheme.Popup"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".messagedetails.MessageDetailsActivity"
-              android:label="@string/AndroidManifest__message_details"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
-              android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
-              android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DatabaseMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".migrations.ApplicationMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-      <activity android:name=".PassphraseCreateActivity"
-              android:label="@string/AndroidManifest__create_passphrase"
-              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphrasePromptActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".NewConversationActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateAlwaysVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PushContactSelectionActivity"
-          android:label="@string/AndroidManifest__select_contacts"
-          android:windowSoftInputMode="stateHidden"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".mediasend.MediaSendActivity"
-              android:theme="@style/TextSecure.FullScreenMedia"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTop"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseChangeActivity"
-              android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".VerifyIdentityActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ApplicationPreferencesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
-        </intent-filter>
-    </activity>
-
-    <activity android:name=".registration.RegistrationNavigationActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".revealable.ViewOnceMessageActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.FullScreenMedia"
-              android:windowSoftInputMode="stateHidden"
-              android:excludeFromRecents="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".stickers.StickerManagementActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-     <activity android:name=".DeviceActivity"
-               android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".logsubmit.SubmitDebugLogActivity"
-              android:label="@string/AndroidManifest__log_submit"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MediaPreviewActivity"
-              android:label="@string/AndroidManifest__media_preview"
-              android:windowSoftInputMode="stateHidden"
-              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/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DummyActivity"
-              android:theme="@android:style/Theme.NoDisplay"
-              android:enabled="true"
-              android:allowTaskReparenting="true"
-              android:noHistory="true"
-              android:excludeFromRecents="true"
-              android:alwaysRetainTaskState="false"
-              android:stateNotNeeded="true"
-              android:clearTaskOnLaunch="true"
-              android:finishOnTaskLaunch="true" />
-
-    <activity android:name=".PlayServicesProblemActivity"
-              android:theme="@style/TextSecure.DialogActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".SmsSendtoActivity">
-        <intent-filter>
-            <action android:name="android.intent.action.SENDTO" />
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="sms" />
-            <data android:scheme="smsto" />
-            <data android:scheme="mms" />
-            <data android:scheme="mmsto" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
-        </intent-filter>
-    </activity>
-
-    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
-              android:excludeFromRecents="true"
-              android:theme="@style/NoAnimation.Theme.BlackScreen"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
-        </intent-filter>
-
-    </activity>
-
-    <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"/>
-
-    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
-              android:theme="@style/TextSecure.DarkTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".profiles.edit.EditProfileActivity"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
-
-    <activity android:name=".lock.v2.CreateKbsPinActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="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">
-
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </activity>
-
-    <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert" />
-
-    <activity android:name=".messagerequests.MessageRequestMegaphoneActivity"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="adjustResize"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.ContactShareEditActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ShortcutLauncherActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:exported="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity
-            android:name=".maps.PlacePickerActivity"
-            android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MainActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".pin.PinRestoreActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.addmembers.AddMembersActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".megaphone.ClientDeprecatedActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:launchMode="singleTask" />
-
-    <service android:enabled="true" android:name=".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=".messages.IncomingMessageObserver$ForegroundService"/>
-
-    <service android:name=".service.QuickResponseService"
-             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
-             android:exported="true" >
-        <intent-filter>
-            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:scheme="sms" />
-            <data android:scheme="smsto" />
-            <data android:scheme="mms" />
-            <data android:scheme="mmsto" />
-        </intent-filter>
-    </service>
-
-    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
-        </intent-filter>
-        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
-    </service>
-
-    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.content.SyncAdapter"/>
-        </intent-filter>
-        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
-        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
-    </service>
-
-    <service android:name=".service.DirectShareService"
-             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-        <intent-filter>
-            <action android:name="android.service.chooser.ChooserTargetService" />
-        </intent-filter>
-    </service>
-
-    <service android:name=".service.GenericForegroundService"/>
-
-    <service android:name=".gcm.FcmFetchService" />
-
-    <service android:name=".gcm.FcmReceiveService">
-        <intent-filter>
-            <action android:name="com.google.firebase.MESSAGING_EVENT" />
-        </intent-filter>
-    </service>
-
-    <receiver android:name=".service.SmsListener"
-              android:permission="android.permission.BROADCAST_SMS"
-              android:enabled="true"
-              android:exported="true">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
-             </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.SmsDeliveryListener"
-              android:exported="true">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.MmsListener"
-              android:enabled="true"
-              android:exported="true"
-              android:permission="android.permission.BROADCAST_WAP_PUSH">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MarkReadReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.RemoteReplyReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.ExpirationListener" />
-
-    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
-
-    <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
-
-    <provider android:name=".providers.PartProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.part" />
-
-    <provider android:name=".providers.MmsBodyProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.mms" />
-
-    <provider android:name="androidx.core.content.FileProvider"
-              android:authorities="${applicationId}.fileprovider"
-              android:exported="false"
-              android:grantUriPermissions="true">
-
-        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
-
-    </provider>
-
-    <provider android:name=".database.DatabaseContentProviders$Conversation"
-              android:authorities="${applicationId}.database.conversation"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$ConversationList"
-              android:authorities="${applicationId}.database.conversationlist"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$Attachment"
-              android:authorities="${applicationId}.database.attachment"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$Sticker"
-              android:authorities="${applicationId}.database.sticker"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$StickerPack"
-              android:authorities="${applicationId}.database.stickerpack"
-              android:exported="false" />
-
-    <receiver android:name=".service.BootReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-            <action android:name="org.thoughtcrime.securesms.RESTART"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.DirectoryRefreshListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSignedPreKeyListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSenderCertificateListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.LocalBackupListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.PersistentConnectionBootListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.LocaleChangedReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.LOCALE_CHANGED"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
-
-    <receiver android:name=".notifications.DeleteNotificationReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver
-        android:name=".service.PanicResponderListener"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="info.guardianproject.panic.action.TRIGGER" />
-        </intent-filter>
-    </receiver>
-
-    <service
-        android:name=".gcm.FcmJobService"
-        android:permission="android.permission.BIND_JOB_SERVICE"
-        android:enabled="@bool/enable_job_service"
-        tools:targetApi="26" />
-
-    <service
-        android:name=".jobmanager.JobSchedulerScheduler$SystemService"
-        android:permission="android.permission.BIND_JOB_SERVICE"
-        android:enabled="@bool/enable_job_service"
-        tools:targetApi="26" />
-
-    <service
-        android:name=".jobmanager.KeepAliveService"
-        android:enabled="@bool/enable_alarm_manager" />
-
-    <receiver
-        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
-        android:enabled="@bool/enable_alarm_manager" />
-
-    <!-- Probably don't need this one -->
-    <receiver
-        android:name=".jobmanager.BootReceiver"
-        android:enabled="true">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <uses-library android:name="org.apache.http.legacy" android:required="false"/>
-
-    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
-    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
-
-</application>
-</manifest>

app/src/main/java/org/signal/glide/Log.java

@@ -1,58 +0,0 @@
-package org.signal.glide;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public final class Log {
-
-  private Log() {}
-
-  public static void v(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().v(tag, message);
-  }
-
-  public static void d(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().d(tag, message);
-  }
-
-  public static void i(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().i(tag, message);
-  }
-
-  public static void w(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().w(tag, message);
-  }
-
-  public static void e(@NonNull String tag, @NonNull String message) {
-    e(tag, message, null);
-  }
-
-  public static void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable) {
-    SignalGlideCodecs.getLogProvider().e(tag, message, throwable);
-  }
-
-  public interface Provider {
-    void v(@NonNull String tag, @NonNull String message);
-    void d(@NonNull String tag, @NonNull String message);
-    void i(@NonNull String tag, @NonNull String message);
-    void w(@NonNull String tag, @NonNull String message);
-    void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable);
-
-    Provider EMPTY = new Provider() {
-      @Override
-      public void v(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void d(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void i(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void w(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void e(@NonNull String tag, @NonNull String message, @NonNull Throwable throwable) { }
-    };
-  }
-}

app/src/main/java/org/signal/glide/SignalGlideCodecs.java

@@ -1,18 +0,0 @@
-package org.signal.glide;
-
-import androidx.annotation.NonNull;
-
-public final class SignalGlideCodecs {
-
-  private static Log.Provider logProvider = Log.Provider.EMPTY;
-
-  private SignalGlideCodecs() {}
-
-  public static void setLogProvider(@NonNull Log.Provider provider) {
-    logProvider = provider;
-  }
-
-  public static @NonNull Log.Provider getLogProvider() {
-    return logProvider;
-  }
-}

app/src/main/java/org/signal/glide/apng/APNGDrawable.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng;
-
-import android.content.Context;
-
-import org.signal.glide.common.FrameAnimationDrawable;
-import org.signal.glide.apng.decode.APNGDecoder;
-import org.signal.glide.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.loader.AssetStreamLoader;
-import org.signal.glide.common.loader.FileLoader;
-import org.signal.glide.common.loader.Loader;
-import org.signal.glide.common.loader.ResourceStreamLoader;
-
-/**
- * @Description: APNGDrawable
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-public class APNGDrawable extends FrameAnimationDrawable<APNGDecoder> {
-    public APNGDrawable(Loader provider) {
-        super(provider);
-    }
-
-    public APNGDrawable(APNGDecoder decoder) {
-        super(decoder);
-    }
-
-    @Override
-    protected APNGDecoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener) {
-        return new APNGDecoder(streamLoader, listener);
-    }
-
-
-    public static APNGDrawable fromAsset(Context context, String assetPath) {
-        AssetStreamLoader assetStreamLoader = new AssetStreamLoader(context, assetPath);
-        return new APNGDrawable(assetStreamLoader);
-    }
-
-    public static APNGDrawable fromFile(String filePath) {
-        FileLoader fileLoader = new FileLoader(filePath);
-        return new APNGDrawable(fileLoader);
-    }
-
-    public static APNGDrawable fromResource(Context context, int resId) {
-        ResourceStreamLoader resourceStreamLoader = new ResourceStreamLoader(context, resId);
-        return new APNGDrawable(resourceStreamLoader);
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/ACTLChunk.java

@@ -1,27 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27acTL.27:_The_Animation_Control_Chunk
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class ACTLChunk extends Chunk {
-    static final int ID = fourCCToInt("acTL");
-    int num_frames;
-    int num_plays;
-
-    @Override
-    void innerParse(APNGReader apngReader) throws IOException {
-        num_frames = apngReader.readInt();
-        num_plays = apngReader.readInt();
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java

@@ -1,211 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-
-import org.signal.glide.Log;
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-import org.signal.glide.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.loader.Loader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGDecoder extends FrameSeqDecoder<APNGReader, APNGWriter> {
-
-    private static final String TAG = APNGDecoder.class.getSimpleName();
-
-    private APNGWriter apngWriter;
-    private int mLoopCount;
-    private final Paint paint = new Paint();
-
-
-    private class SnapShot {
-        byte dispose_op;
-        Rect dstRect = new Rect();
-        ByteBuffer byteBuffer;
-    }
-
-    private SnapShot snapShot = new SnapShot();
-
-    /**
-     * @param loader         webp的reader
-     * @param renderListener 渲染的回调
-     */
-    public APNGDecoder(Loader loader, FrameSeqDecoder.RenderListener renderListener) {
-        super(loader, renderListener);
-        paint.setAntiAlias(true);
-    }
-
-    @Override
-    protected APNGWriter getWriter() {
-        if (apngWriter == null) {
-            apngWriter = new APNGWriter();
-        }
-        return apngWriter;
-    }
-
-    @Override
-    protected APNGReader getReader(Reader reader) {
-        return new APNGReader(reader);
-    }
-
-    @Override
-    protected int getLoopCount() {
-        return mLoopCount;
-    }
-
-    @Override
-    protected void release() {
-        snapShot.byteBuffer = null;
-        apngWriter = null;
-    }
-
-
-    @Override
-    protected Rect read(APNGReader reader) throws IOException {
-        List<Chunk> chunks = APNGParser.parse(reader);
-        List<Chunk> otherChunks = new ArrayList<>();
-
-        boolean actl = false;
-        APNGFrame lastFrame = null;
-        byte[] ihdrData = new byte[0];
-        int canvasWidth = 0, canvasHeight = 0;
-        for (Chunk chunk : chunks) {
-            if (chunk instanceof ACTLChunk) {
-                mLoopCount = ((ACTLChunk) chunk).num_plays;
-                actl = true;
-            } else if (chunk instanceof FCTLChunk) {
-                APNGFrame frame = new APNGFrame(reader, (FCTLChunk) chunk);
-                frame.prefixChunks = otherChunks;
-                frame.ihdrData = ihdrData;
-                frames.add(frame);
-                lastFrame = frame;
-            } else if (chunk instanceof FDATChunk) {
-                if (lastFrame != null) {
-                    lastFrame.imageChunks.add(chunk);
-                }
-            } else if (chunk instanceof IDATChunk) {
-                if (!actl) {
-                    //如果为非APNG图片，则只解码PNG
-                    Frame frame = new StillFrame(reader);
-                    frame.frameWidth = canvasWidth;
-                    frame.frameHeight = canvasHeight;
-                    frames.add(frame);
-                    mLoopCount = 1;
-                    break;
-                }
-                if (lastFrame != null) {
-                    lastFrame.imageChunks.add(chunk);
-                }
-
-            } else if (chunk instanceof IHDRChunk) {
-                canvasWidth = ((IHDRChunk) chunk).width;
-                canvasHeight = ((IHDRChunk) chunk).height;
-                ihdrData = ((IHDRChunk) chunk).data;
-            } else if (!(chunk instanceof IENDChunk)) {
-                otherChunks.add(chunk);
-            }
-        }
-        frameBuffer = ByteBuffer.allocate((canvasWidth * canvasHeight / (sampleSize * sampleSize) + 1) * 4);
-        snapShot.byteBuffer = ByteBuffer.allocate((canvasWidth * canvasHeight / (sampleSize * sampleSize) + 1) * 4);
-        return new Rect(0, 0, canvasWidth, canvasHeight);
-    }
-
-    @Override
-    protected void renderFrame(Frame frame) {
-        if (frame == null || fullRect == null) {
-            return;
-        }
-        try {
-            Bitmap bitmap = obtainBitmap(fullRect.width() / sampleSize, fullRect.height() / sampleSize);
-            Canvas canvas = cachedCanvas.get(bitmap);
-            if (canvas == null) {
-                canvas = new Canvas(bitmap);
-                cachedCanvas.put(bitmap, canvas);
-            }
-            if (frame instanceof APNGFrame) {
-                // 从缓存中恢复当前帧
-                frameBuffer.rewind();
-                bitmap.copyPixelsFromBuffer(frameBuffer);
-                // 开始绘制前，处理快照中的设定
-                if (this.frameIndex == 0) {
-                    canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                } else {
-                    canvas.save();
-                    canvas.clipRect(snapShot.dstRect);
-                    switch (snapShot.dispose_op) {
-                        // 从快照中恢复上一帧之前的显示内容
-                        case FCTLChunk.APNG_DISPOSE_OP_PREVIOUS:
-                            snapShot.byteBuffer.rewind();
-                            bitmap.copyPixelsFromBuffer(snapShot.byteBuffer);
-                            break;
-                        // 清空上一帧所画区域
-                        case FCTLChunk.APNG_DISPOSE_OP_BACKGROUND:
-                            canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                            break;
-                        // 什么都不做
-                        case FCTLChunk.APNG_DISPOSE_OP_NON:
-                        default:
-                            break;
-                    }
-                    canvas.restore();
-                }
-
-                // 然后根据dispose设定传递到快照信息中
-                if (((APNGFrame) frame).dispose_op == FCTLChunk.APNG_DISPOSE_OP_PREVIOUS) {
-                    if (snapShot.dispose_op != FCTLChunk.APNG_DISPOSE_OP_PREVIOUS) {
-                        snapShot.byteBuffer.rewind();
-                        bitmap.copyPixelsToBuffer(snapShot.byteBuffer);
-                    }
-                }
-
-                snapShot.dispose_op = ((APNGFrame) frame).dispose_op;
-                canvas.save();
-                if (((APNGFrame) frame).blend_op == FCTLChunk.APNG_BLEND_OP_SOURCE) {
-                    canvas.clipRect(
-                            frame.frameX / sampleSize,
-                            frame.frameY / sampleSize,
-                            (frame.frameX + frame.frameWidth) / sampleSize,
-                            (frame.frameY + frame.frameHeight) / sampleSize);
-                    canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                }
-
-
-                snapShot.dstRect.set(frame.frameX / sampleSize,
-                        frame.frameY / sampleSize,
-                        (frame.frameX + frame.frameWidth) / sampleSize,
-                        (frame.frameY + frame.frameHeight) / sampleSize);
-                canvas.restore();
-            }
-            //开始真正绘制当前帧的内容
-            Bitmap inBitmap = obtainBitmap(frame.frameWidth, frame.frameHeight);
-            recycleBitmap(frame.draw(canvas, paint, sampleSize, inBitmap, getWriter()));
-            recycleBitmap(inBitmap);
-            frameBuffer.rewind();
-            bitmap.copyPixelsToBuffer(frameBuffer);
-            recycleBitmap(bitmap);
-        } catch (Throwable t) {
-            Log.e(TAG, "Failed to render!", t);
-        }
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/APNGFrame.java

@@ -1,147 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.CRC32;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGFrame extends Frame<APNGReader, APNGWriter> {
-    public final byte blend_op;
-    public final byte dispose_op;
-    byte[] ihdrData;
-    List<Chunk> imageChunks = new ArrayList<>();
-    List<Chunk> prefixChunks = new ArrayList<>();
-    private static final byte[] sPNGSignatures = {(byte) 137, 80, 78, 71, 13, 10, 26, 10};
-    private static final byte[] sPNGEndChunk = {0, 0, 0, 0, 0x49, 0x45, 0x4E, 0x44, (byte) 0xAE, 0x42, 0x60, (byte) 0x82};
-
-    private static ThreadLocal<CRC32> sCRC32 = new ThreadLocal<>();
-
-    private CRC32 getCRC32() {
-        CRC32 crc32 = sCRC32.get();
-        if (crc32 == null) {
-            crc32 = new CRC32();
-            sCRC32.set(crc32);
-        }
-        return crc32;
-    }
-
-    public APNGFrame(APNGReader reader, FCTLChunk fctlChunk) {
-        super(reader);
-        blend_op = fctlChunk.blend_op;
-        dispose_op = fctlChunk.dispose_op;
-        frameDuration = fctlChunk.delay_num * 1000 / (fctlChunk.delay_den == 0 ? 100 : fctlChunk.delay_den);
-        frameWidth = fctlChunk.width;
-        frameHeight = fctlChunk.height;
-        frameX = fctlChunk.x_offset;
-        frameY = fctlChunk.y_offset;
-    }
-
-    private int encode(APNGWriter apngWriter) throws IOException {
-        int fileSize = 8 + 13 + 12;
-
-        //prefixChunks
-        for (Chunk chunk : prefixChunks) {
-            fileSize += chunk.length + 12;
-        }
-
-        //imageChunks
-        for (Chunk chunk : imageChunks) {
-            if (chunk instanceof IDATChunk) {
-                fileSize += chunk.length + 12;
-            } else if (chunk instanceof FDATChunk) {
-                fileSize += chunk.length + 8;
-            }
-        }
-        fileSize += sPNGEndChunk.length;
-        apngWriter.reset(fileSize);
-        apngWriter.putBytes(sPNGSignatures);
-        //IHDR Chunk
-        apngWriter.writeInt(13);
-        int start = apngWriter.position();
-        apngWriter.writeFourCC(IHDRChunk.ID);
-        apngWriter.writeInt(frameWidth);
-        apngWriter.writeInt(frameHeight);
-        apngWriter.putBytes(ihdrData);
-        CRC32 crc32 = getCRC32();
-        crc32.reset();
-        crc32.update(apngWriter.toByteArray(), start, 17);
-        apngWriter.writeInt((int) crc32.getValue());
-
-        //prefixChunks
-        for (Chunk chunk : prefixChunks) {
-            if (chunk instanceof IENDChunk) {
-                continue;
-            }
-            reader.reset();
-            reader.skip(chunk.offset);
-            reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length + 12);
-            apngWriter.skip(chunk.length + 12);
-        }
-        //imageChunks
-        for (Chunk chunk : imageChunks) {
-            if (chunk instanceof IDATChunk) {
-                reader.reset();
-                reader.skip(chunk.offset);
-                reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length + 12);
-                apngWriter.skip(chunk.length + 12);
-            } else if (chunk instanceof FDATChunk) {
-                apngWriter.writeInt(chunk.length - 4);
-                start = apngWriter.position();
-                apngWriter.writeFourCC(IDATChunk.ID);
-
-                reader.reset();
-                // skip to fdat data position
-                reader.skip(chunk.offset + 4 + 4 + 4);
-                reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length - 4);
-
-                apngWriter.skip(chunk.length - 4);
-                crc32.reset();
-                crc32.update(apngWriter.toByteArray(), start, chunk.length);
-                apngWriter.writeInt((int) crc32.getValue());
-            }
-        }
-        //endChunk
-        apngWriter.putBytes(sPNGEndChunk);
-        return fileSize;
-    }
-
-
-    @Override
-    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, APNGWriter writer) {
-        try {
-            int length = encode(writer);
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inJustDecodeBounds = false;
-            options.inSampleSize = sampleSize;
-            options.inMutable = true;
-            options.inBitmap = reusedBitmap;
-            byte[] bytes = writer.toByteArray();
-            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, length, options);
-            assert bitmap != null;
-            canvas.drawBitmap(bitmap, (float) frameX / sampleSize, (float) frameY / sampleSize, paint);
-            return bitmap;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/APNGParser.java

@@ -1,143 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.content.Context;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.StreamReader;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @link {https://www.w3.org/TR/PNG/#5PNG-file-signature}
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGParser {
-    static class FormatException extends IOException {
-        FormatException() {
-            super("APNG Format error");
-        }
-    }
-
-    public static boolean isAPNG(String filePath) {
-        InputStream inputStream = null;
-        try {
-            inputStream = new FileInputStream(filePath);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Context context, String assetPath) {
-        InputStream inputStream = null;
-        try {
-            inputStream = context.getAssets().open(assetPath);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Context context, int resId) {
-        InputStream inputStream = null;
-        try {
-            inputStream = context.getResources().openRawResource(resId);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Reader in) {
-        APNGReader reader = (in instanceof APNGReader) ? (APNGReader) in : new APNGReader(in);
-        try {
-            if (!reader.matchFourCC("\u0089PNG") || !reader.matchFourCC("\r\n\u001a\n")) {
-                throw new FormatException();
-            }
-            while (reader.available() > 0) {
-                Chunk chunk = parseChunk(reader);
-                if (chunk instanceof ACTLChunk) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            return false;
-        }
-        return false;
-    }
-
-    public static List<Chunk> parse(APNGReader reader) throws IOException {
-        if (!reader.matchFourCC("\u0089PNG") || !reader.matchFourCC("\r\n\u001a\n")) {
-            throw new FormatException();
-        }
-
-        List<Chunk> chunks = new ArrayList<>();
-        while (reader.available() > 0) {
-            chunks.add(parseChunk(reader));
-        }
-        return chunks;
-    }
-
-    private static Chunk parseChunk(APNGReader reader) throws IOException {
-        int offset = reader.position();
-        int size = reader.readInt();
-        int fourCC = reader.readFourCC();
-        Chunk chunk;
-        if (fourCC == ACTLChunk.ID) {
-            chunk = new ACTLChunk();
-        } else if (fourCC == FCTLChunk.ID) {
-            chunk = new FCTLChunk();
-        } else if (fourCC == FDATChunk.ID) {
-            chunk = new FDATChunk();
-        } else if (fourCC == IDATChunk.ID) {
-            chunk = new IDATChunk();
-        } else if (fourCC == IENDChunk.ID) {
-            chunk = new IENDChunk();
-        } else if (fourCC == IHDRChunk.ID) {
-            chunk = new IHDRChunk();
-        } else {
-            chunk = new Chunk();
-        }
-        chunk.offset = offset;
-        chunk.fourcc = fourCC;
-        chunk.length = size;
-        chunk.parse(reader);
-        chunk.crc = reader.readInt();
-        return chunk;
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/Chunk.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.text.TextUtils;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: Length (长度)	4字节	指定数据块中数据域的长度，其长度不超过(231－1)字节
- * Chunk Type Code (数据块类型码)	4字节	数据块类型码由ASCII字母(A-Z和a-z)组成
- * Chunk Data (数据块数据)	可变长度	存储按照Chunk Type Code指定的数据
- * CRC (循环冗余检测)	4字节	存储用来检测是否有错误的循环冗余码
- * @Link https://www.w3.org/TR/PNG
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class Chunk {
-    int length;
-    int fourcc;
-    int crc;
-    int offset;
-
-    static int fourCCToInt(String fourCC) {
-        if (TextUtils.isEmpty(fourCC) || fourCC.length() != 4) {
-            return 0xbadeffff;
-        }
-        return (fourCC.charAt(0) & 0xff)
-                | (fourCC.charAt(1) & 0xff) << 8
-                | (fourCC.charAt(2) & 0xff) << 16
-                | (fourCC.charAt(3) & 0xff) << 24
-                ;
-    }
-
-    void parse(APNGReader reader) throws IOException {
-        int available = reader.available();
-        innerParse(reader);
-        int offset = available - reader.available();
-        if (offset > length) {
-            throw new IOException("Out of chunk area");
-        } else if (offset < length) {
-            reader.skip(length - offset);
-        }
-    }
-
-    void innerParse(APNGReader reader) throws IOException {
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/FCTLChunk.java

@@ -1,121 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- * @see {link=https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27fcTL.27:_The_Frame_Control_Chunk}
- */
-class FCTLChunk extends Chunk {
-    static final int ID = fourCCToInt("fcTL");
-    int sequence_number;
-    /**
-     * x_offset >= 0
-     * y_offset >= 0
-     * width > 0
-     * height > 0
-     * x_offset + width <= 'IHDR' width
-     * y_offset + height <= 'IHDR' height
-     */
-    /**
-     * Width of the following frame.
-     */
-    int width;
-    /**
-     * Height of the following frame.
-     */
-    int height;
-    /**
-     * X position at which to render the following frame.
-     */
-    int x_offset;
-    /**
-     * Y position at which to render the following frame.
-     */
-    int y_offset;
-
-    /**
-     * The delay_num and delay_den parameters together specify a fraction indicating the time to
-     * display the current frame, in seconds. If the denominator is 0, it is to be treated as if it
-     * were 100 (that is, delay_num then specifies 1/100ths of a second).
-     * If the the value of the numerator is 0 the decoder should render the next frame as quickly as
-     * possible, though viewers may impose a reasonable lower bound.
-     * <p>
-     * Frame timings should be independent of the time required for decoding and display of each frame,
-     * so that animations will run at the same rate regardless of the performance of the decoder implementation.
-     */
-
-    /**
-     * Frame delay fraction numerator.
-     */
-    short delay_num;
-
-    /**
-     * Frame delay fraction denominator.
-     */
-    short delay_den;
-
-    /**
-     * Type of frame area disposal to be done after rendering this frame.
-     * dispose_op specifies how the output buffer should be changed at the end of the delay (before rendering the next frame).
-     * If the first 'fcTL' chunk uses a dispose_op of APNG_DISPOSE_OP_PREVIOUS it should be treated as APNG_DISPOSE_OP_BACKGROUND.
-     */
-    byte dispose_op;
-
-    /**
-     * Type of frame area rendering for this frame.
-     */
-    byte blend_op;
-
-    /**
-     * No disposal is done on this frame before rendering the next; the contents of the output buffer are left as is.
-     */
-    static final int APNG_DISPOSE_OP_NON = 0;
-
-    /**
-     * The frame's region of the output buffer is to be cleared to fully transparent black before rendering the next frame.
-     */
-    static final int APNG_DISPOSE_OP_BACKGROUND = 1;
-
-    /**
-     * The frame's region of the output buffer is to be reverted to the previous contents before rendering the next frame.
-     */
-    static final int APNG_DISPOSE_OP_PREVIOUS = 2;
-
-    /**
-     * blend_op<code> specifies whether the frame is to be alpha blended into the current output buffer content,
-     * or whether it should completely replace its region in the output buffer.
-     */
-    /**
-     * All color components of the frame, including alpha, overwrite the current contents of the frame's output buffer region.
-     */
-    static final int APNG_BLEND_OP_SOURCE = 0;
-
-    /**
-     * The frame should be composited onto the output buffer based on its alpha,
-     * using a simple OVER operation as described in the Alpha Channel Processing section of the Extensions
-     * to the PNG Specification, Version 1.2.0. Note that the second variation of the sample code is applicable.
-     */
-    static final int APNG_BLEND_OP_OVER = 1;
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        sequence_number = reader.readInt();
-        width = reader.readInt();
-        height = reader.readInt();
-        x_offset = reader.readInt();
-        y_offset = reader.readInt();
-        delay_num = reader.readShort();
-        delay_den = reader.readShort();
-        dispose_op = reader.peek();
-        blend_op = reader.peek();
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/FDATChunk.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27fdAT.27:_The_Frame_Data_Chunk
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class FDATChunk extends Chunk {
-    static final int ID = fourCCToInt("fdAT");
-    int sequence_number;
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        sequence_number = reader.readInt();
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/IDATChunk.java

@@ -1,15 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-/**
- * @Description: 作用描述
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IDATChunk extends Chunk {
-    static final int ID = fourCCToInt("IDAT");
-}

app/src/main/java/org/signal/glide/apng/decode/IENDChunk.java

@@ -1,15 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-/**
- * @Description: 作用描述
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IENDChunk extends Chunk {
-    static final int ID = Chunk.fourCCToInt("IEND");
-}

app/src/main/java/org/signal/glide/apng/decode/IHDRChunk.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * The IHDR chunk shall be the first chunk in the PNG datastream. It contains:
- * <p>
- * Width	4 bytes
- * Height	4 bytes
- * Bit depth	1 byte
- * Colour type	1 byte
- * Compression method	1 byte
- * Filter method	1 byte
- * Interlace method	1 byte
- *
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IHDRChunk extends Chunk {
-    static final int ID = fourCCToInt("IHDR");
-    /**
-     * 图像宽度，以像素为单位
-     */
-    int width;
-    /**
-     * 图像高度，以像素为单位
-     */
-    int height;
-
-    byte[] data = new byte[5];
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        width = reader.readInt();
-        height = reader.readInt();
-        reader.read(data, 0, data.length);
-    }
-}

app/src/main/java/org/signal/glide/apng/decode/StillFrame.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-
-import java.io.IOException;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class StillFrame extends Frame<APNGReader, APNGWriter> {
-
-    public StillFrame(APNGReader reader) {
-        super(reader);
-    }
-
-    @Override
-    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, APNGWriter writer) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = false;
-        options.inSampleSize = sampleSize;
-        options.inMutable = true;
-        options.inBitmap = reusedBitmap;
-        Bitmap bitmap = null;
-        try {
-            reader.reset();
-            bitmap = BitmapFactory.decodeStream(reader.toInputStream(), null, options);
-            assert bitmap != null;
-            paint.setXfermode(null);
-            canvas.drawBitmap(bitmap, 0, 0, paint);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return bitmap;
-    }
-}

app/src/main/java/org/signal/glide/apng/io/APNGReader.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.io;
-
-import android.text.TextUtils;
-
-import org.signal.glide.common.io.FilterReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-
-/**
- * @Description: APNGReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGReader extends FilterReader {
-    private static ThreadLocal<byte[]> __intBytes = new ThreadLocal<>();
-
-
-    protected static byte[] ensureBytes() {
-        byte[] bytes = __intBytes.get();
-        if (bytes == null) {
-            bytes = new byte[4];
-            __intBytes.set(bytes);
-        }
-        return bytes;
-    }
-
-    public APNGReader(Reader in) {
-        super(in);
-    }
-
-    public int readInt() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 4);
-        return buf[3] & 0xFF |
-                (buf[2] & 0xFF) << 8 |
-                (buf[1] & 0xFF) << 16 |
-                (buf[0] & 0xFF) << 24;
-    }
-
-    public short readShort() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 2);
-        return (short) (buf[1] & 0xFF |
-                (buf[0] & 0xFF) << 8);
-    }
-
-    /**
-     * @return read FourCC and match chars
-     */
-    public boolean matchFourCC(String chars) throws IOException {
-        if (TextUtils.isEmpty(chars) || chars.length() != 4) {
-            return false;
-        }
-        int fourCC = readFourCC();
-        for (int i = 0; i < 4; i++) {
-            if (((fourCC >> (i * 8)) & 0xff) != chars.charAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public int readFourCC() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 4);
-        return buf[0] & 0xff | (buf[1] & 0xff) << 8 | (buf[2] & 0xff) << 16 | (buf[3] & 0xff) << 24;
-    }
-}

app/src/main/java/org/signal/glide/apng/io/APNGWriter.java

@@ -1,41 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.io;
-
-import org.signal.glide.common.io.ByteBufferWriter;
-
-import java.nio.ByteOrder;
-
-/**
- * @Description: APNGWriter
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGWriter extends ByteBufferWriter {
-    public APNGWriter() {
-        super();
-    }
-
-    public void writeFourCC(int val) {
-        putByte((byte) (val & 0xff));
-        putByte((byte) ((val >> 8) & 0xff));
-        putByte((byte) ((val >> 16) & 0xff));
-        putByte((byte) ((val >> 24) & 0xff));
-    }
-
-    public void writeInt(int val) {
-        putByte((byte) ((val >> 24) & 0xff));
-        putByte((byte) ((val >> 16) & 0xff));
-        putByte((byte) ((val >> 8) & 0xff));
-        putByte((byte) (val & 0xff));
-    }
-
-    @Override
-    public void reset(int size) {
-        super.reset(size);
-        this.byteBuffer.order(ByteOrder.BIG_ENDIAN);
-    }
-}

app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java

@@ -1,253 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.DrawFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-import androidx.annotation.NonNull;
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
-
-import org.signal.glide.Log;
-import org.signal.glide.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.loader.Loader;
-
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @Description: Frame animation drawable
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-public abstract class FrameAnimationDrawable<Decoder extends FrameSeqDecoder> extends Drawable implements Animatable2Compat, FrameSeqDecoder.RenderListener {
-    private static final String TAG = FrameAnimationDrawable.class.getSimpleName();
-    private final Paint paint = new Paint();
-    private final Decoder frameSeqDecoder;
-    private DrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-    private Matrix matrix = new Matrix();
-    private Set<AnimationCallback> animationCallbacks = new HashSet<>();
-    private Bitmap bitmap;
-    private static final int MSG_ANIMATION_START = 1;
-    private static final int MSG_ANIMATION_END = 2;
-    private Handler uiHandler = new Handler(Looper.getMainLooper()) {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_ANIMATION_START:
-                    for (AnimationCallback animationCallback : animationCallbacks) {
-                        animationCallback.onAnimationStart(FrameAnimationDrawable.this);
-                    }
-                    break;
-                case MSG_ANIMATION_END:
-                    for (AnimationCallback animationCallback : animationCallbacks) {
-                        animationCallback.onAnimationEnd(FrameAnimationDrawable.this);
-                    }
-                    break;
-            }
-        }
-    };
-    private Runnable invalidateRunnable = new Runnable() {
-        @Override
-        public void run() {
-            invalidateSelf();
-        }
-    };
-    private boolean autoPlay = true;
-
-    public FrameAnimationDrawable(Decoder frameSeqDecoder) {
-        paint.setAntiAlias(true);
-        this.frameSeqDecoder = frameSeqDecoder;
-    }
-
-    public FrameAnimationDrawable(Loader provider) {
-        paint.setAntiAlias(true);
-        this.frameSeqDecoder = createFrameSeqDecoder(provider, this);
-    }
-
-    public void setAutoPlay(boolean autoPlay) {
-        this.autoPlay = autoPlay;
-    }
-
-    protected abstract Decoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener);
-
-    /**
-     * @param loopLimit <=0为无限播放,>0为实际播放次数
-     */
-    public void setLoopLimit(int loopLimit) {
-        frameSeqDecoder.setLoopLimit(loopLimit);
-    }
-
-    public void reset() {
-        frameSeqDecoder.reset();
-    }
-
-    public void pause() {
-        frameSeqDecoder.pause();
-    }
-
-    public void resume() {
-        frameSeqDecoder.resume();
-    }
-
-    public boolean isPaused() {
-        return frameSeqDecoder.isPaused();
-    }
-
-    @Override
-    public void start() {
-        if (autoPlay) {
-            frameSeqDecoder.start();
-        } else {
-            this.frameSeqDecoder.addRenderListener(this);
-            if (!this.frameSeqDecoder.isRunning()) {
-                this.frameSeqDecoder.start();
-            }
-        }
-    }
-
-    @Override
-    public void stop() {
-        if (autoPlay) {
-            frameSeqDecoder.stop();
-        } else {
-            this.frameSeqDecoder.removeRenderListener(this);
-            this.frameSeqDecoder.stopIfNeeded();
-        }
-    }
-
-    @Override
-    public boolean isRunning() {
-        return frameSeqDecoder.isRunning();
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (bitmap == null || bitmap.isRecycled()) {
-            return;
-        }
-        canvas.setDrawFilter(drawFilter);
-        canvas.drawBitmap(bitmap, matrix, paint);
-    }
-
-    @Override
-    public void setBounds(int left, int top, int right, int bottom) {
-        super.setBounds(left, top, right, bottom);
-        boolean sampleSizeChanged = frameSeqDecoder.setDesiredSize(getBounds().width(), getBounds().height());
-        matrix.setScale(
-                1.0f * getBounds().width() * frameSeqDecoder.getSampleSize() / frameSeqDecoder.getBounds().width(),
-                1.0f * getBounds().height() * frameSeqDecoder.getSampleSize() / frameSeqDecoder.getBounds().height());
-
-        if (sampleSizeChanged)
-            this.bitmap = Bitmap.createBitmap(
-                    frameSeqDecoder.getBounds().width() / frameSeqDecoder.getSampleSize(),
-                    frameSeqDecoder.getBounds().height() / frameSeqDecoder.getSampleSize(),
-                    Bitmap.Config.ARGB_8888);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        paint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        paint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void onStart() {
-        Message.obtain(uiHandler, MSG_ANIMATION_START).sendToTarget();
-    }
-
-    @Override
-    public void onRender(ByteBuffer byteBuffer) {
-        if (!isRunning()) {
-            return;
-        }
-        if (this.bitmap == null || this.bitmap.isRecycled()) {
-            this.bitmap = Bitmap.createBitmap(
-                    frameSeqDecoder.getBounds().width() / frameSeqDecoder.getSampleSize(),
-                    frameSeqDecoder.getBounds().height() / frameSeqDecoder.getSampleSize(),
-                    Bitmap.Config.ARGB_8888);
-        }
-        byteBuffer.rewind();
-        if (byteBuffer.remaining() < this.bitmap.getByteCount()) {
-            Log.e(TAG, "onRender:Buffer not large enough for pixels");
-            return;
-        }
-        this.bitmap.copyPixelsFromBuffer(byteBuffer);
-        uiHandler.post(invalidateRunnable);
-    }
-
-    @Override
-    public void onEnd() {
-        Message.obtain(uiHandler, MSG_ANIMATION_END).sendToTarget();
-    }
-
-    @Override
-    public boolean setVisible(boolean visible, boolean restart) {
-        if (this.autoPlay) {
-            if (visible) {
-                if (!isRunning()) {
-                    start();
-                }
-            } else if (isRunning()) {
-                stop();
-            }
-        }
-        return super.setVisible(visible, restart);
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        try {
-            return frameSeqDecoder.getBounds().width();
-        } catch (Exception exception) {
-            return 0;
-        }
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        try {
-            return frameSeqDecoder.getBounds().height();
-        } catch (Exception exception) {
-            return 0;
-        }
-    }
-
-    @Override
-    public void registerAnimationCallback(@NonNull AnimationCallback animationCallback) {
-        this.animationCallbacks.add(animationCallback);
-    }
-
-    @Override
-    public boolean unregisterAnimationCallback(@NonNull AnimationCallback animationCallback) {
-        return this.animationCallbacks.remove(animationCallback);
-    }
-
-    @Override
-    public void clearAnimationCallbacks() {
-        this.animationCallbacks.clear();
-    }
-}

app/src/main/java/org/signal/glide/common/decode/Frame.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.Writer;
-
-/**
- * @Description: One frame in an animation
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public abstract class Frame<R extends Reader, W extends Writer> {
-    protected final R reader;
-    public int frameWidth;
-    public int frameHeight;
-    public int frameX;
-    public int frameY;
-    public int frameDuration;
-
-    public Frame(R reader) {
-        this.reader = reader;
-    }
-
-    public abstract Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, W writer);
-}

app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java

@@ -1,539 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-
-import org.signal.glide.Log;
-import org.signal.glide.common.executor.FrameDecoderExecutor;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.Writer;
-import org.signal.glide.common.loader.Loader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.LockSupport;
-
-/**
- * @Description: Abstract Frame Animation Decoder
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-public abstract class FrameSeqDecoder<R extends Reader, W extends Writer> {
-    private static final String TAG = FrameSeqDecoder.class.getSimpleName();
-    private final int taskId;
-
-    private final Loader mLoader;
-    private final Handler workerHandler;
-    protected List<Frame> frames = new ArrayList<>();
-    protected int frameIndex = -1;
-    private int playCount;
-    private Integer loopLimit = null;
-    private Set<RenderListener> renderListeners = new HashSet<>();
-    private AtomicBoolean paused = new AtomicBoolean(true);
-    private static final Rect RECT_EMPTY = new Rect();
-    private Runnable renderTask = new Runnable() {
-        @Override
-        public void run() {
-            if (paused.get()) {
-                return;
-            }
-            if (canStep()) {
-                long start = System.currentTimeMillis();
-                long delay = step();
-                long cost = System.currentTimeMillis() - start;
-                workerHandler.postDelayed(this, Math.max(0, delay - cost));
-                for (RenderListener renderListener : renderListeners) {
-                    renderListener.onRender(frameBuffer);
-                }
-            } else {
-                stop();
-            }
-        }
-    };
-    protected int sampleSize = 1;
-
-    private Set<Bitmap> cacheBitmaps = new HashSet<>();
-    protected Map<Bitmap, Canvas> cachedCanvas = new WeakHashMap<>();
-    protected ByteBuffer frameBuffer;
-    protected volatile Rect fullRect;
-    private W mWriter = getWriter();
-    private R mReader = null;
-
-    /**
-     * If played all the needed
-     */
-    private boolean finished = false;
-
-    private enum State {
-        IDLE,
-        RUNNING,
-        INITIALIZING,
-        FINISHING,
-    }
-
-    private volatile State mState = State.IDLE;
-
-    public Loader getLoader() {
-        return mLoader;
-    }
-
-    protected abstract W getWriter();
-
-    protected abstract R getReader(Reader reader);
-
-    protected Bitmap obtainBitmap(int width, int height) {
-        Bitmap ret = null;
-        Iterator<Bitmap> iterator = cacheBitmaps.iterator();
-        while (iterator.hasNext()) {
-            int reuseSize = width * height * 4;
-            ret = iterator.next();
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                if (ret != null && ret.getAllocationByteCount() >= reuseSize) {
-                    iterator.remove();
-                    if (ret.getWidth() != width || ret.getHeight() != height) {
-                        ret.reconfigure(width, height, Bitmap.Config.ARGB_8888);
-                    }
-                    ret.eraseColor(0);
-                    return ret;
-                }
-            } else {
-                if (ret != null && ret.getByteCount() >= reuseSize) {
-                    if (ret.getWidth() == width && ret.getHeight() == height) {
-                        iterator.remove();
-                        ret.eraseColor(0);
-                    }
-                    return ret;
-                }
-            }
-        }
-
-        try {
-            Bitmap.Config config = Bitmap.Config.ARGB_8888;
-            ret = Bitmap.createBitmap(width, height, config);
-        } catch (OutOfMemoryError e) {
-            e.printStackTrace();
-        }
-        return ret;
-    }
-
-    protected void recycleBitmap(Bitmap bitmap) {
-        if (bitmap != null && !cacheBitmaps.contains(bitmap)) {
-            cacheBitmaps.add(bitmap);
-        }
-    }
-
-    /**
-     * 解码器的渲染回调
-     */
-    public interface RenderListener {
-        /**
-         * 播放开始
-         */
-        void onStart();
-
-        /**
-         * 帧播放
-         */
-        void onRender(ByteBuffer byteBuffer);
-
-        /**
-         * 播放结束
-         */
-        void onEnd();
-    }
-
-
-    /**
-     * @param loader         webp的reader
-     * @param renderListener 渲染的回调
-     */
-    public FrameSeqDecoder(Loader loader, @Nullable RenderListener renderListener) {
-        this.mLoader = loader;
-        if (renderListener != null) {
-            this.renderListeners.add(renderListener);
-        }
-        this.taskId = FrameDecoderExecutor.getInstance().generateTaskId();
-        this.workerHandler = new Handler(FrameDecoderExecutor.getInstance().getLooper(taskId));
-    }
-
-
-    public void addRenderListener(final RenderListener renderListener) {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                renderListeners.add(renderListener);
-            }
-        });
-    }
-
-    public void removeRenderListener(final RenderListener renderListener) {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                renderListeners.remove(renderListener);
-            }
-        });
-    }
-
-    public void stopIfNeeded() {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (renderListeners.size() == 0) {
-                    stop();
-                }
-            }
-        });
-    }
-
-    public Rect getBounds() {
-        if (fullRect == null) {
-            if (mState == State.FINISHING) {
-                Log.e(TAG, "In finishing,do not interrupt");
-            }
-            final Thread thread = Thread.currentThread();
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (fullRect == null) {
-                            if (mReader == null) {
-                                mReader = getReader(mLoader.obtain());
-                            } else {
-                                mReader.reset();
-                            }
-                            initCanvasBounds(read(mReader));
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        fullRect = RECT_EMPTY;
-                    } finally {
-                        LockSupport.unpark(thread);
-                    }
-                }
-            });
-            LockSupport.park(thread);
-        }
-        return fullRect;
-    }
-
-    private void initCanvasBounds(Rect rect) {
-        fullRect = rect;
-        frameBuffer = ByteBuffer.allocate((rect.width() * rect.height() / (sampleSize * sampleSize) + 1) * 4);
-        if (mWriter == null) {
-            mWriter = getWriter();
-        }
-    }
-
-
-    private int getFrameCount() {
-        return this.frames.size();
-    }
-
-    /**
-     * @return Loop Count defined in file
-     */
-    protected abstract int getLoopCount();
-
-    public void start() {
-        if (fullRect == RECT_EMPTY) {
-            return;
-        }
-        if (mState == State.RUNNING || mState == State.INITIALIZING) {
-            Log.i(TAG, debugInfo() + " Already started");
-            return;
-        }
-        if (mState == State.FINISHING) {
-            Log.e(TAG, debugInfo() + " Processing,wait for finish at " + mState);
-        }
-        mState = State.INITIALIZING;
-        if (Looper.myLooper() == workerHandler.getLooper()) {
-            innerStart();
-        } else {
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStart();
-                }
-            });
-        }
-    }
-
-    @WorkerThread
-    private void innerStart() {
-        paused.compareAndSet(true, false);
-
-        final long start = System.currentTimeMillis();
-        try {
-            if (frames.size() == 0) {
-                try {
-                    if (mReader == null) {
-                        mReader = getReader(mLoader.obtain());
-                    } else {
-                        mReader.reset();
-                    }
-                    initCanvasBounds(read(mReader));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                }
-            }
-        } finally {
-            Log.i(TAG, debugInfo() + " Set state to RUNNING,cost " + (System.currentTimeMillis() - start));
-            mState = State.RUNNING;
-        }
-        if (getNumPlays() == 0 || !finished) {
-            this.frameIndex = -1;
-            renderTask.run();
-            for (RenderListener renderListener : renderListeners) {
-                renderListener.onStart();
-            }
-        } else {
-            Log.i(TAG, debugInfo() + " No need to started");
-        }
-    }
-
-    @WorkerThread
-    private void innerStop() {
-        workerHandler.removeCallbacks(renderTask);
-        frames.clear();
-        for (Bitmap bitmap : cacheBitmaps) {
-            if (bitmap != null && !bitmap.isRecycled()) {
-                bitmap.recycle();
-            }
-        }
-        cacheBitmaps.clear();
-        if (frameBuffer != null) {
-            frameBuffer = null;
-        }
-        cachedCanvas.clear();
-        try {
-            if (mReader != null) {
-                mReader.close();
-                mReader = null;
-            }
-            if (mWriter != null) {
-                mWriter.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        release();
-        mState = State.IDLE;
-        for (RenderListener renderListener : renderListeners) {
-            renderListener.onEnd();
-        }
-    }
-
-    public void stop() {
-        if (fullRect == RECT_EMPTY) {
-            return;
-        }
-        if (mState == State.FINISHING || mState == State.IDLE) {
-            Log.i(TAG, debugInfo() + "No need to stop");
-            return;
-        }
-        if (mState == State.INITIALIZING) {
-            Log.e(TAG, debugInfo() + "Processing,wait for finish at " + mState);
-        }
-        mState = State.FINISHING;
-        if (Looper.myLooper() == workerHandler.getLooper()) {
-            innerStop();
-        } else {
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStop();
-                }
-            });
-        }
-    }
-
-    private String debugInfo() {
-        return "";
-    }
-
-    protected abstract void release();
-
-    public boolean isRunning() {
-        return mState == State.RUNNING || mState == State.INITIALIZING;
-    }
-
-    public boolean isPaused() {
-        return paused.get();
-    }
-
-    public void setLoopLimit(int limit) {
-        this.loopLimit = limit;
-    }
-
-    public void reset() {
-        this.playCount = 0;
-        this.frameIndex = -1;
-        this.finished = false;
-    }
-
-    public void pause() {
-        workerHandler.removeCallbacks(renderTask);
-        paused.compareAndSet(false, true);
-    }
-
-    public void resume() {
-        paused.compareAndSet(true, false);
-        workerHandler.removeCallbacks(renderTask);
-        workerHandler.post(renderTask);
-    }
-
-
-    public int getSampleSize() {
-        return sampleSize;
-    }
-
-    public boolean setDesiredSize(int width, int height) {
-        boolean sampleSizeChanged = false;
-        int sample = getDesiredSample(width, height);
-        if (sample != this.sampleSize) {
-            this.sampleSize = sample;
-            sampleSizeChanged = true;
-            final boolean tempRunning = isRunning();
-            workerHandler.removeCallbacks(renderTask);
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStop();
-                    try {
-                        initCanvasBounds(read(getReader(mLoader.obtain())));
-                        if (tempRunning) {
-                            innerStart();
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-        return sampleSizeChanged;
-    }
-
-    protected int getDesiredSample(int desiredWidth, int desiredHeight) {
-        if (desiredWidth == 0 || desiredHeight == 0) {
-            return 1;
-        }
-        int radio = Math.min(getBounds().width() / desiredWidth, getBounds().height() / desiredHeight);
-        int sample = 1;
-        while ((sample * 2) <= radio) {
-            sample *= 2;
-        }
-        return sample;
-    }
-
-    protected abstract Rect read(R reader) throws IOException;
-
-    private int getNumPlays() {
-        return this.loopLimit != null ? this.loopLimit : this.getLoopCount();
-    }
-
-    private boolean canStep() {
-        if (!isRunning()) {
-            return false;
-        }
-        if (frames.size() == 0) {
-            return false;
-        }
-        if (getNumPlays() <= 0) {
-            return true;
-        }
-        if (this.playCount < getNumPlays() - 1) {
-            return true;
-        } else if (this.playCount == getNumPlays() - 1 && this.frameIndex < this.getFrameCount() - 1) {
-            return true;
-        }
-        finished = true;
-        return false;
-    }
-
-    @WorkerThread
-    private long step() {
-        this.frameIndex++;
-        if (this.frameIndex >= this.getFrameCount()) {
-            this.frameIndex = 0;
-            this.playCount++;
-        }
-        Frame frame = getFrame(this.frameIndex);
-        if (frame == null) {
-            return 0;
-        }
-        renderFrame(frame);
-        return frame.frameDuration;
-    }
-
-    protected abstract void renderFrame(Frame frame);
-
-    private Frame getFrame(int index) {
-        if (index < 0 || index >= frames.size()) {
-            return null;
-        }
-        return frames.get(index);
-    }
-
-    /**
-     * Get Indexed frame
-     *
-     * @param index <0 means reverse from last index
-     */
-    public Bitmap getFrameBitmap(int index) throws IOException {
-        if (mState != State.IDLE) {
-            Log.e(TAG, debugInfo() + ",stop first");
-            return null;
-        }
-        mState = State.RUNNING;
-        paused.compareAndSet(true, false);
-        if (frames.size() == 0) {
-            if (mReader == null) {
-                mReader = getReader(mLoader.obtain());
-            } else {
-                mReader.reset();
-            }
-            initCanvasBounds(read(mReader));
-        }
-        if (index < 0) {
-            index += this.frames.size();
-        }
-        if (index < 0) {
-            index = 0;
-        }
-        frameIndex = -1;
-        while (frameIndex < index) {
-            if (canStep()) {
-                step();
-            } else {
-                break;
-            }
-        }
-        frameBuffer.rewind();
-        Bitmap bitmap = Bitmap.createBitmap(getBounds().width() / getSampleSize(), getBounds().height() / getSampleSize(), Bitmap.Config.ARGB_8888);
-        bitmap.copyPixelsFromBuffer(frameBuffer);
-        innerStop();
-        return bitmap;
-    }
-}

app/src/main/java/org/signal/glide/common/executor/FrameDecoderExecutor.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.executor;
-
-import android.os.HandlerThread;
-import android.os.Looper;
-
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @Description: com.github.penfeizhou.animation.executor
- * @Author: pengfei.zhou
- * @CreateDate: 2019-11-21
- */
-public class FrameDecoderExecutor {
-    private static int sPoolNumber = 4;
-    private ArrayList<HandlerThread> mHandlerThreadGroup = new ArrayList<>();
-    private AtomicInteger counter = new AtomicInteger(0);
-
-    private FrameDecoderExecutor() {
-    }
-
-    static class Inner {
-        static final FrameDecoderExecutor sInstance = new FrameDecoderExecutor();
-    }
-
-    public void setPoolSize(int size) {
-        sPoolNumber = size;
-    }
-
-    public static FrameDecoderExecutor getInstance() {
-        return Inner.sInstance;
-    }
-
-    public Looper getLooper(int taskId) {
-        int idx = taskId % sPoolNumber;
-        if (idx >= mHandlerThreadGroup.size()) {
-            HandlerThread handlerThread = new HandlerThread("FrameDecoderExecutor-" + idx);
-            handlerThread.start();
-
-            mHandlerThreadGroup.add(handlerThread);
-            Looper looper = handlerThread.getLooper();
-            if (looper != null) {
-                return looper;
-            } else {
-                return Looper.getMainLooper();
-            }
-        } else {
-            if (mHandlerThreadGroup.get(idx) != null) {
-                Looper looper = mHandlerThreadGroup.get(idx).getLooper();
-                if (looper != null) {
-                    return looper;
-                } else {
-                    return Looper.getMainLooper();
-                }
-            } else {
-                return Looper.getMainLooper();
-            }
-        }
-    }
-
-    public int generateTaskId() {
-        return counter.getAndIncrement();
-    }
-}
-

app/src/main/java/org/signal/glide/common/io/ByteBufferReader.java

@@ -1,67 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-14
- */
-public class ByteBufferReader implements Reader {
-
-    private final ByteBuffer byteBuffer;
-
-    public ByteBufferReader(ByteBuffer byteBuffer) {
-        this.byteBuffer = byteBuffer;
-        byteBuffer.position(0);
-    }
-
-    @Override
-    public long skip(long total) throws IOException {
-        byteBuffer.position((int) (byteBuffer.position() + total));
-        return total;
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        return byteBuffer.get();
-    }
-
-    @Override
-    public void reset() throws IOException {
-        byteBuffer.position(0);
-    }
-
-    @Override
-    public int position() {
-        return byteBuffer.position();
-    }
-
-    @Override
-    public int read(byte[] buffer, int start, int byteCount) throws IOException {
-        byteBuffer.get(buffer, start, byteCount);
-        return byteCount;
-    }
-
-    @Override
-    public int available() throws IOException {
-        return byteBuffer.limit() - byteBuffer.position();
-    }
-
-    @Override
-    public void close() throws IOException {
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        return new ByteArrayInputStream(byteBuffer.array());
-    }
-}

app/src/main/java/org/signal/glide/common/io/ByteBufferWriter.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * @Description: ByteBufferWriter
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-12
- */
-public class ByteBufferWriter implements Writer {
-
-    protected ByteBuffer byteBuffer;
-
-    public ByteBufferWriter() {
-        reset(10 * 1024);
-    }
-
-    @Override
-    public void putByte(byte b) {
-        byteBuffer.put(b);
-    }
-
-    @Override
-    public void putBytes(byte[] b) {
-        byteBuffer.put(b);
-    }
-
-    @Override
-    public int position() {
-        return byteBuffer.position();
-    }
-
-    @Override
-    public void skip(int length) {
-        byteBuffer.position(length + position());
-    }
-
-    @Override
-    public byte[] toByteArray() {
-        return byteBuffer.array();
-    }
-
-    @Override
-    public void close() {
-    }
-
-    @Override
-    public void reset(int size) {
-        if (byteBuffer == null || size > byteBuffer.capacity()) {
-            byteBuffer = ByteBuffer.allocate(size);
-            this.byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
-        }
-        byteBuffer.clear();
-    }
-}

app/src/main/java/org/signal/glide/common/io/FileReader.java

@@ -1,30 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-/**
- * @Description: FileReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-23
- */
-public class FileReader extends FilterReader {
-    private final File mFile;
-
-    public FileReader(File file) throws IOException {
-        super(new StreamReader(new FileInputStream(file)));
-        mFile = file;
-    }
-
-    @Override
-    public void reset() throws IOException {
-        reader.close();
-        reader = new StreamReader(new FileInputStream(mFile));
-    }
-}

app/src/main/java/org/signal/glide/common/io/FilterReader.java

@@ -1,63 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: FilterReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-23
- */
-public class FilterReader implements Reader {
-    protected Reader reader;
-
-    public FilterReader(Reader in) {
-        this.reader = in;
-    }
-
-    @Override
-    public long skip(long total) throws IOException {
-        return reader.skip(total);
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        return reader.peek();
-    }
-
-    @Override
-    public void reset() throws IOException {
-        reader.reset();
-    }
-
-    @Override
-    public int position() {
-        return reader.position();
-    }
-
-    @Override
-    public int read(byte[] buffer, int start, int byteCount) throws IOException {
-        return reader.read(buffer, start, byteCount);
-    }
-
-    @Override
-    public int available() throws IOException {
-        return reader.available();
-    }
-
-    @Override
-    public void close() throws IOException {
-        reader.close();
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        reset();
-        return reader.toInputStream();
-    }
-}

app/src/main/java/org/signal/glide/common/io/Reader.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @link {https://developers.google.com/speed/webp/docs/riff_container#terminology_basics}
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-11
- */
-public interface Reader {
-    long skip(long total) throws IOException;
-
-    byte peek() throws IOException;
-
-    void reset() throws IOException;
-
-    int position();
-
-    int read(byte[] buffer, int start, int byteCount) throws IOException;
-
-    int available() throws IOException;
-
-    /**
-     * close io
-     */
-    void close() throws IOException;
-
-    InputStream toInputStream() throws IOException;
-}

app/src/main/java/org/signal/glide/common/io/StreamReader.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-11
- */
-public class StreamReader extends FilterInputStream implements Reader {
-    private int position;
-
-    public StreamReader(InputStream in) {
-        super(in);
-        try {
-            in.reset();
-        } catch (IOException e) {
-            // e.printStackTrace();
-        }
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        byte ret = (byte) read();
-        position++;
-        return ret;
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        int ret = super.read(b, off, len);
-        position += Math.max(0, ret);
-        return ret;
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        super.reset();
-        position = 0;
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        long ret = super.skip(n);
-        position += ret;
-        return ret;
-    }
-
-    @Override
-    public int position() {
-        return position;
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        return this;
-    }
-}

app/src/main/java/org/signal/glide/common/io/Writer.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-12
- */
-public interface Writer {
-    void reset(int size);
-
-    void putByte(byte b);
-
-    void putBytes(byte[] b);
-
-    int position();
-
-    void skip(int length);
-
-    byte[] toByteArray();
-
-    void close() throws IOException;
-}

app/src/main/java/org/signal/glide/common/loader/AssetStreamLoader.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: 从Asset中读取流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class AssetStreamLoader extends StreamLoader {
-
-    private final Context mContext;
-    private final String mAssetName;
-
-    public AssetStreamLoader(Context context, String assetName) {
-        mContext = context.getApplicationContext();
-        mAssetName = assetName;
-    }
-
-    @Override
-    protected InputStream getInputStream() throws IOException {
-        return mContext.getAssets().open(mAssetName);
-    }
-}

app/src/main/java/org/signal/glide/common/loader/ByteBufferLoader.java

@@ -1,26 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.ByteBufferReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * @Description: ByteBufferLoader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-15
- */
-public abstract class ByteBufferLoader implements Loader {
-    public abstract ByteBuffer getByteBuffer();
-
-    @Override
-    public Reader obtain() throws IOException {
-        return new ByteBufferReader(getByteBuffer());
-    }
-}

app/src/main/java/org/signal/glide/common/loader/FileLoader.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.FileReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @Description: 从文件加载流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class FileLoader implements Loader {
-
-    private final File mFile;
-    private Reader mReader;
-
-    public FileLoader(String path) {
-        mFile = new File(path);
-    }
-
-    @Override
-    public synchronized Reader obtain() throws IOException {
-        return new FileReader(mFile);
-    }
-}

app/src/main/java/org/signal/glide/common/loader/Loader.java

@@ -1,19 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-
-/**
- * @Description: Loader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-14
- */
-public interface Loader {
-    Reader obtain() throws IOException;
-}

app/src/main/java/org/signal/glide/common/loader/ResourceStreamLoader.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: 从资源加载流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class ResourceStreamLoader extends StreamLoader {
-    private final Context mContext;
-    private final int mResId;
-
-
-    public ResourceStreamLoader(Context context, int resId) {
-        mContext = context.getApplicationContext();
-        mResId = resId;
-    }
-
-    @Override
-    protected InputStream getInputStream() throws IOException {
-        return mContext.getResources().openRawResource(mResId);
-    }
-}

app/src/main/java/org/signal/glide/common/loader/StreamLoader.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.StreamReader;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public abstract class StreamLoader implements Loader {
-    protected abstract InputStream getInputStream() throws IOException;
-
-
-    public final synchronized Reader obtain() throws IOException {
-        return new StreamReader(getInputStream());
-    }
-}

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

@@ -1,20 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import org.whispersystems.signalservice.api.account.AccountAttributes;
-
-public final class AppCapabilities {
-
-  private AppCapabilities() {
-  }
-
-  private static final boolean UUID_CAPABLE = false;
-  private static final boolean GV2_CAPABLE  = true;
-
-  /**
-   * @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 AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable);
-  }
-}

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

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

@@ -1,430 +0,0 @@
-/*
- * Copyright (C) 2013 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-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.glide.SignalGlideCodecs;
-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.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.RefreshPreKeysJob;
-import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.AndroidLogger;
-import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
-import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-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.KeyCachingService;
-import org.thoughtcrime.securesms.service.LocalBackupListener;
-import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
-import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
-import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
-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;
-import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
-
-import java.security.Security;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Will be called once when the TextSecure process is created.
- *
- * We're using this as an insertion point to patch up the Android PRNG disaster,
- * to initialize the job manager, and to check for GCM registration freshness.
- *
- * @author Moxie Marlinspike
- */
-public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {
-
-  private static final String TAG = ApplicationContext.class.getSimpleName();
-
-  private ExpiringMessageManager   expiringMessageManager;
-  private ViewOnceMessageManager   viewOnceMessageManager;
-  private TypingStatusRepository   typingStatusRepository;
-  private TypingStatusSender       typingStatusSender;
-  private PersistentLogger         persistentLogger;
-
-  private volatile boolean isAppVisible;
-
-  public static ApplicationContext getInstance(Context context) {
-    return (ApplicationContext)context.getApplicationContext();
-  }
-
-  @Override
-  public void onCreate() {
-    long startTime = System.currentTimeMillis();
-    super.onCreate();
-    initializeSecurityProvider();
-    initializeLogging();
-    Log.i(TAG, "onCreate()");
-    initializeCrashHandling();
-    initializeAppDependencies();
-    initializeFirstEverAppLaunch();
-    initializeApplicationMigrations();
-    initializeMessageRetrieval();
-    initializeExpiringMessageManager();
-    initializeRevealableMessageManager();
-    initializeTypingStatusRepository();
-    initializeTypingStatusSender();
-    initializeGcmCheck();
-    initializeSignedPreKeyCheck();
-    initializePeriodicTasks();
-    initializeCircumvention();
-    initializeRingRtc();
-    initializePendingMessages();
-    initializeBlobProvider();
-    initializeCleanup();
-    initializeGlideCodecs();
-
-    FeatureFlags.init();
-    NotificationChannels.create(this);
-    RefreshPreKeysJob.scheduleIfNecessary();
-    StorageSyncHelper.scheduleRoutineSync();
-    RegistrationUtil.maybeMarkRegistrationComplete(this);
-    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
-
-    if (Build.VERSION.SDK_INT < 21) {
-      AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-    }
-
-    ApplicationDependencies.getJobManager().beginJobLoop();
-    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
-  }
-
-  @Override
-  public void onStart(@NonNull LifecycleOwner owner) {
-    isAppVisible = true;
-    Log.i(TAG, "App is now visible.");
-    FeatureFlags.refreshIfNecessary();
-    ApplicationDependencies.getRecipientCache().warmUp();
-    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
-    executePendingContactSync();
-    KeyCachingService.onAppForegrounded(this);
-    ApplicationDependencies.getFrameRateTracker().begin();
-    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    checkBuildExpiration();
-  }
-
-  @Override
-  public void onStop(@NonNull LifecycleOwner owner) {
-    isAppVisible = false;
-    Log.i(TAG, "App is no longer visible.");
-    KeyCachingService.onAppBackgrounded(this);
-    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
-    ApplicationDependencies.getFrameRateTracker().end();
-  }
-
-  public ExpiringMessageManager getExpiringMessageManager() {
-    return expiringMessageManager;
-  }
-
-  public ViewOnceMessageManager getViewOnceMessageManager() {
-    return viewOnceMessageManager;
-  }
-
-  public TypingStatusRepository getTypingStatusRepository() {
-    return typingStatusRepository;
-  }
-
-  public TypingStatusSender getTypingStatusSender() {
-    return typingStatusSender;
-  }
-
-  public boolean isAppVisible() {
-    return isAppVisible;
-  }
-
-  public PersistentLogger getPersistentLogger() {
-    return persistentLogger;
-  }
-
-  public void checkBuildExpiration() {
-    if (Util.getTimeUntilBuildExpiry() <= 0 && !SignalStore.misc().isClientDeprecated()) {
-      Log.w(TAG, "Build expired!");
-      SignalStore.misc().markClientDeprecated();
-    }
-  }
-
-  private void initializeSecurityProvider() {
-    try {
-      Class.forName("org.signal.aesgcmprovider.AesGcmCipher");
-    } catch (ClassNotFoundException e) {
-      Log.e(TAG, "Failed to find AesGcmCipher class");
-      throw new ProviderInitializationException();
-    }
-
-    int aesPosition = Security.insertProviderAt(new AesGcmProvider(), 1);
-    Log.i(TAG, "Installed AesGcmProvider: " + aesPosition);
-
-    if (aesPosition < 0) {
-      Log.e(TAG, "Failed to install AesGcmProvider()");
-      throw new ProviderInitializationException();
-    }
-
-    int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
-    Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);
-
-    if (conscryptPosition < 0) {
-      Log.w(TAG, "Did not install Conscrypt provider. May already be present.");
-    }
-  }
-
-  private void initializeLogging() {
-    persistentLogger = new PersistentLogger(this);
-    org.thoughtcrime.securesms.logging.Log.initialize(new AndroidLogger(), persistentLogger);
-
-    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
-  }
-
-  private void initializeCrashHandling() {
-    final Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
-    Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
-  }
-
-  private void initializeApplicationMigrations() {
-    ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
-  }
-
-  public void initializeMessageRetrieval() {
-    ApplicationDependencies.getIncomingMessageObserver();
-  }
-
-  private void initializeAppDependencies() {
-    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this, new SignalServiceNetworkAccess(this)));
-  }
-
-  private void initializeFirstEverAppLaunch() {
-    if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SQLCipherOpenHelper.databaseFileExists(this)) {
-        Log.i(TAG, "First ever app launch!");
-        AppInitialization.onFirstEverAppLaunch(this);
-      }
-
-      Log.i(TAG, "Setting first install version to " + BuildConfig.CANONICAL_VERSION_CODE);
-      TextSecurePreferences.setFirstInstallVersion(this, BuildConfig.CANONICAL_VERSION_CODE);
-    }
-  }
-
-  private void initializeGcmCheck() {
-    if (TextSecurePreferences.isPushRegistered(this)) {
-      long nextSetTime = TextSecurePreferences.getFcmTokenLastSetTime(this) + TimeUnit.HOURS.toMillis(6);
-
-      if (TextSecurePreferences.getFcmToken(this) == null || nextSetTime <= System.currentTimeMillis()) {
-        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
-      }
-    }
-  }
-
-  private void initializeSignedPreKeyCheck() {
-    if (!TextSecurePreferences.isSignedPreKeyRegistered(this)) {
-      ApplicationDependencies.getJobManager().add(new CreateSignedPreKeyJob(this));
-    }
-  }
-
-  private void initializeExpiringMessageManager() {
-    this.expiringMessageManager = new ExpiringMessageManager(this);
-  }
-
-  private void initializeRevealableMessageManager() {
-    this.viewOnceMessageManager = new ViewOnceMessageManager(this);
-  }
-
-  private void initializeTypingStatusRepository() {
-    this.typingStatusRepository = new TypingStatusRepository();
-  }
-
-  private void initializeTypingStatusSender() {
-    this.typingStatusSender = new TypingStatusSender(this);
-  }
-
-  private void initializePeriodicTasks() {
-    RotateSignedPreKeyListener.schedule(this);
-    DirectoryRefreshListener.schedule(this);
-    LocalBackupListener.schedule(this);
-    RotateSenderCertificateListener.schedule(this);
-
-    if (BuildConfig.PLAY_STORE_DISABLED) {
-      UpdateApkRefreshListener.schedule(this);
-    }
-  }
-
-  private void initializeRingRtc() {
-    try {
-      Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
-        add("Pixel");
-        add("Pixel XL");
-        add("Moto G5");
-        add("Moto G (5S) Plus");
-        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
-        add("MI 5");
-      }};
-
-      Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
-        add("Pixel");
-        add("Pixel XL");
-      }};
-
-      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
-        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
-      }
-
-      if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
-        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
-      }
-
-      CallManager.initialize(this, new RingRtcLogger());
-    } catch (UnsatisfiedLinkError e) {
-      throw new AssertionError("Unable to load ringrtc library", e);
-    }
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void initializeCircumvention() {
-    AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-      @Override
-      protected Void doInBackground(Void... params) {
-        if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
-          try {
-            ProviderInstaller.installIfNeeded(ApplicationContext.this);
-          } catch (Throwable t) {
-            Log.w(TAG, t);
-          }
-        }
-        return null;
-      }
-    };
-
-    task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-  }
-
-  private void executePendingContactSync() {
-    if (TextSecurePreferences.needsFullContactSync(this)) {
-      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
-    }
-  }
-
-  private void initializePendingMessages() {
-    if (TextSecurePreferences.getNeedsMessagePull(this)) {
-      Log.i(TAG, "Scheduling a message fetch.");
-      if (Build.VERSION.SDK_INT >= 26) {
-        FcmJobService.schedule(this);
-      } else {
-        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
-      }
-      TextSecurePreferences.setNeedsMessagePull(this, false);
-    }
-  }
-
-  private void initializeBlobProvider() {
-    SignalExecutors.BOUNDED.execute(() -> {
-      BlobProvider.getInstance().onSessionStart(this);
-    });
-  }
-
-  private void initializeCleanup() {
-    SignalExecutors.BOUNDED.execute(() -> {
-      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
-      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
-    });
-  }
-
-  private void initializeGlideCodecs() {
-    SignalGlideCodecs.setLogProvider(new org.signal.glide.Log.Provider() {
-      @Override
-      public void v(@NonNull String tag, @NonNull String message) {
-        Log.v(tag, message);
-      }
-
-      @Override
-      public void d(@NonNull String tag, @NonNull String message) {
-        Log.d(tag, message);
-      }
-
-      @Override
-      public void i(@NonNull String tag, @NonNull String message) {
-        Log.i(tag, message);
-      }
-
-      @Override
-      public void w(@NonNull String tag, @NonNull String message) {
-        Log.w(tag, message);
-      }
-
-      @Override
-      public void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable) {
-        Log.e(tag, message, throwable);
-      }
-    });
-  }
-
-  @Override
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
-  }
-
-  private static class ProviderInitializationException extends RuntimeException {
-  }
-}

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

@@ -1,334 +0,0 @@
-/*
- * Copyright (C) 2011 Whisper Systems
- * Copyright (C) 2013-2017 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.PorterDuff;
-import android.os.Build;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.Preference;
-
-import org.thoughtcrime.securesms.help.HelpFragment;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
-import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
-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.preferences.widgets.UsernamePreference;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-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;
-
-/**
- * The Activity for application preference display and management.
- *
- * @author Moxie Marlinspike
- *
- */
-
-public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
-    implements SharedPreferences.OnSharedPreferenceChangeListener
-{
-  @SuppressWarnings("unused")
-  private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
-
-  private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
-  private static final String PREFERENCE_CATEGORY_USERNAME       = "preference_category_username";
-  private static final String PREFERENCE_CATEGORY_SMS_MMS        = "preference_category_sms_mms";
-  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS  = "preference_category_notifications";
-  private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
-  private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
-  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 static final String PREFERENCE_CATEGORY_DONATE         = "preference_category_donate";
-
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle icicle, boolean ready) {
-    //noinspection ConstantConditions
-    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    if (getIntent() != null && getIntent().getCategories() != null && getIntent().getCategories().contains("android.intent.category.NOTIFICATION_PREFERENCES")) {
-      initFragment(android.R.id.content, new NotificationsPreferenceFragment());
-    } else if (icicle == null) {
-      initFragment(android.R.id.content, new ApplicationPreferenceFragment());
-    }
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-  }
-
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-    Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.content);
-    fragment.onActivityResult(requestCode, resultCode, data);
-  }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    FragmentManager fragmentManager = getSupportFragmentManager();
-    if (fragmentManager.getBackStackEntryCount() > 0) {
-      fragmentManager.popBackStack();
-    } else {
-      // TODO [greyson] Navigation
-      Intent intent = new Intent(this, MainActivity.class);
-      intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-      startActivity(intent);
-      finish();
-    }
-    return true;
-  }
-
-  @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-    if (key.equals(TextSecurePreferences.THEME_PREF)) {
-      recreate();
-    } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
-      recreate();
-
-      Intent intent = new Intent(this, KeyCachingService.class);
-      intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT);
-      startService(intent);
-    }
-  }
-
-  public void pushFragment(@NonNull Fragment fragment) {
-    getSupportFragmentManager().beginTransaction()
-                               .setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end)
-                               .replace(android.R.id.content, fragment)
-                               .addToBackStack(null)
-                               .commit();
-  }
-
-  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
-
-    @Override
-    public void onCreate(Bundle icicle) {
-      super.onCreate(icicle);
-
-      this.findPreference(PREFERENCE_CATEGORY_PROFILE)
-          .setOnPreferenceClickListener(new ProfileClickListener());
-      this.findPreference(PREFERENCE_CATEGORY_USERNAME)
-          .setOnPreferenceClickListener(new UsernameClickListener());
-      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS));
-      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
-      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION));
-      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
-      this.findPreference(PREFERENCE_CATEGORY_CHATS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
-      this.findPreference(PREFERENCE_CATEGORY_STORAGE)
-        .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));
-      this.findPreference(PREFERENCE_CATEGORY_DONATE)
-          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
-
-      tintIcons();
-    }
-
-    private void tintIcons() {
-      if (Build.VERSION.SDK_INT >= 21) return;
-
-      Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS);
-      preference.getIcon().setColorFilter(ThemeUtil.getThemedColor(requireContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN);
-    }
-
-    @Override
-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
-      addPreferencesFromResource(R.xml.preferences);
-
-      if (FeatureFlags.usernames()) {
-        UsernamePreference pref = (UsernamePreference) findPreference(PREFERENCE_CATEGORY_USERNAME);
-        pref.setVisible(shouldDisplayUsernameReminder());
-        pref.setOnLongClickListener(v -> {
-          new AlertDialog.Builder(requireContext())
-                         .setMessage(R.string.ApplicationPreferencesActivity_hide_reminder)
-                         .setPositiveButton(R.string.ApplicationPreferencesActivity_hide, (dialog, which) -> {
-                           dialog.dismiss();
-                           SignalStore.misc().hideUsernameReminder();
-                             findPreference(PREFERENCE_CATEGORY_USERNAME).setVisible(false);
-                         })
-                         .setNegativeButton(android.R.string.cancel, ((dialog, which) -> dialog.dismiss()))
-                         .setCancelable(true)
-                         .show();
-          return true;
-        });
-      }
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-      //noinspection ConstantConditions
-      ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.text_secure_normal__menu_settings);
-      setCategorySummaries();
-      setCategoryVisibility();
-    }
-
-    private void setCategorySummaries() {
-      ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();
-
-      if (FeatureFlags.usernames()) {
-        this.findPreference(PREFERENCE_CATEGORY_USERNAME)
-            .setVisible(shouldDisplayUsernameReminder());
-      }
-
-      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
-          .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
-          .setSummary(NotificationsPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
-          .setSummary(AppProtectionPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
-          .setSummary(AppearancePreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_CHATS)
-          .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
-    }
-
-    private void setCategoryVisibility() {
-      Preference devicePreference = this.findPreference(PREFERENCE_CATEGORY_DEVICES);
-      if (devicePreference != null && !TextSecurePreferences.isPushRegistered(getActivity())) {
-        getPreferenceScreen().removePreference(devicePreference);
-      }
-    }
-
-    private static boolean shouldDisplayUsernameReminder() {
-      return FeatureFlags.usernames() && !Recipient.self().getUsername().isPresent() && SignalStore.misc().shouldShowUsernameReminder();
-    }
-
-    private class CategoryClickListener implements Preference.OnPreferenceClickListener {
-      private String category;
-
-      CategoryClickListener(String category) {
-        this.category = category;
-      }
-
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        Fragment fragment = null;
-
-        switch (category) {
-        case PREFERENCE_CATEGORY_SMS_MMS:
-          fragment = new SmsMmsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_NOTIFICATIONS:
-          fragment = new NotificationsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_APP_PROTECTION:
-          fragment = new AppProtectionPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_APPEARANCE:
-          fragment = new AppearancePreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_CHATS:
-          fragment = new ChatsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_STORAGE:
-          fragment = new StoragePreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_DEVICES:
-          Intent intent = new Intent(getActivity(), DeviceActivity.class);
-          startActivity(intent);
-          break;
-        case PREFERENCE_CATEGORY_ADVANCED:
-          fragment = new AdvancedPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_HELP:
-          fragment = new HelpFragment();
-          break;
-        case PREFERENCE_CATEGORY_DONATE:
-          CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url));
-          break;
-        default:
-          throw new AssertionError();
-        }
-
-        if (fragment != null) {
-          Bundle args = new Bundle();
-          fragment.setArguments(args);
-
-          ((ApplicationPreferencesActivity) requireActivity()).pushFragment(fragment);
-        }
-
-        return true;
-      }
-    }
-
-    private class ProfileClickListener implements Preference.OnPreferenceClickListener {
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        requireActivity().startActivity(EditProfileActivity.getIntentForUserProfileEdit(preference.getContext()));
-        return true;
-      }
-    }
-
-    private class UsernameClickListener implements Preference.OnPreferenceClickListener {
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        requireActivity().startActivity(EditProfileActivity.getIntentForUsernameEdit(preference.getContext()));
-        return true;
-      }
-    }
-  }
-
-}

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

@@ -1,142 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.transition.TransitionInflater;
-import android.view.View;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.CustomTarget;
-import com.bumptech.glide.request.target.Target;
-import com.bumptech.glide.request.transition.Transition;
-
-import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FullscreenHelper;
-
-/**
- * Activity for displaying avatars full screen.
- */
-public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
-
-  private static final String TAG = Log.tag(AvatarPreviewActivity.class);
-
-  private static final String RECIPIENT_ID_EXTRA = "recipient_id";
-
-  public static @NonNull Intent intentFromRecipientId(@NonNull Context context,
-                                                      @NonNull RecipientId recipientId)
-  {
-    Intent intent = new Intent(context, AvatarPreviewActivity.class);
-    intent.putExtra(RECIPIENT_ID_EXTRA, recipientId.serialize());
-    return intent;
-  }
-
-  public static Bundle createTransitionBundle(@NonNull Activity activity, @NonNull View from) {
-    return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, from, "avatar").toBundle();
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    super.onCreate(savedInstanceState, ready);
-
-    setTheme(R.style.TextSecure_MediaPreview);
-    setContentView(R.layout.contact_photo_preview_activity);
-
-    if (Build.VERSION.SDK_INT >= 21) {
-      postponeEnterTransition();
-      TransitionInflater inflater = TransitionInflater.from(this);
-      getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
-      getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
-    }
-
-    Toolbar   toolbar = findViewById(R.id.toolbar);
-    ImageView avatar  = findViewById(R.id.avatar);
-
-    setSupportActionBar(toolbar);
-
-    requireSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    Context     context     = getApplicationContext();
-    RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA));
-
-    Recipient.live(recipientId).observe(this, recipient -> {
-      ContactPhoto contactPhoto  = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar())
-                                                                   : recipient.getContactPhoto();
-      FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
-                                                                     : recipient.getFallbackContactPhoto();
-
-      Resources resources = this.getResources();
-
-      GlideApp.with(this)
-              .asBitmap()
-              .load(contactPhoto)
-              .fallback(fallbackPhoto.asCallCard(this))
-              .error(fallbackPhoto.asCallCard(this))
-              .diskCacheStrategy(DiskCacheStrategy.ALL)
-              .addListener(new RequestListener<Bitmap>() {
-                @Override
-                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
-                  Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
-                  finish();
-                  return false;
-                }
-
-                @Override
-                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
-                  return false;
-                }
-              })
-              .into(new CustomTarget<Bitmap>() {
-                @Override
-                public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
-                  avatar.setImageDrawable(RoundedBitmapDrawableFactory.create(resources, resource));
-                  if (Build.VERSION.SDK_INT >= 21) {
-                    startPostponedEnterTransition();
-                  }
-                }
-
-                @Override
-                public void onLoadCleared(@Nullable Drawable placeholder) {
-                }
-              });
-
-      toolbar.setTitle(recipient.getDisplayName(context));
-    });
-
-    FullscreenHelper fullscreenHelper = new FullscreenHelper(this);
-
-    findViewById(android.R.id.content).setOnClickListener(v -> fullscreenHelper.toggleUiVisibility());
-
-    fullscreenHelper.configureToolbarSpacer(findViewById(R.id.toolbar_cutout_spacer));
-
-    fullscreenHelper.showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout));
-  }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    onBackPressed();
-    return true;
-  }
-}

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

@@ -1,97 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import android.view.View;
-import android.view.WindowManager;
-
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
-import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
-
-import java.util.Objects;
-
-/**
- * Base class for all activities. The vast majority of activities shouldn't extend this directly.
- * Instead, they should extend {@link PassphraseRequiredActivity} so they're protected by
- * screen lock.
- */
-public abstract class BaseActivity extends AppCompatActivity {
-  private static final String TAG = Log.tag(BaseActivity.class);
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    logEvent("onCreate()");
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    initializeScreenshotSecurity();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
-  }
-
-  @Override
-  protected void onStart() {
-    logEvent("onStart()");
-    super.onStart();
-  }
-
-  @Override
-  protected void onStop() {
-    logEvent("onStop()");
-    super.onStop();
-  }
-
-  @Override
-  protected void onDestroy() {
-    logEvent("onDestroy()");
-    super.onDestroy();
-  }
-
-  private void initializeScreenshotSecurity() {
-    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
-      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    } else {
-      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    }
-  }
-
-  protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
-    Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
-                                         .toBundle();
-    ActivityCompat.startActivity(this, intent, bundle);
-  }
-
-  @TargetApi(21)
-  protected void setStatusBarColor(int color) {
-    if (Build.VERSION.SDK_INT >= 21) {
-      getWindow().setStatusBarColor(color);
-    }
-  }
-
-  @Override
-  protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
-  }
-
-  private void logEvent(@NonNull String event) {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
-  }
-
-  public final @NonNull ActionBar requireSupportActionBar() {
-    return Objects.requireNonNull(getSupportActionBar());
-  }
-}

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

@@ -1,58 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LifecycleOwner;
-
-import org.thoughtcrime.securesms.contactshare.Contact;
-import org.thoughtcrime.securesms.conversation.ConversationMessage;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.groups.GroupId;
-import org.thoughtcrime.securesms.linkpreview.LinkPreview;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.stickers.StickerLocator;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-public interface BindableConversationItem extends Unbindable {
-  void bind(@NonNull LifecycleOwner lifecycleOwner,
-            @NonNull ConversationMessage messageRecord,
-            @NonNull Optional<MessageRecord> previousMessageRecord,
-            @NonNull Optional<MessageRecord> nextMessageRecord,
-            @NonNull GlideRequests glideRequests,
-            @NonNull Locale locale,
-            @NonNull Set<ConversationMessage> batchSelected,
-            @NonNull Recipient recipients,
-            @Nullable String searchQuery,
-            boolean pulseMention);
-
-  ConversationMessage getConversationMessage();
-
-  void setEventListener(@Nullable EventListener listener);
-
-  interface EventListener {
-    void onQuoteClicked(MmsMessageRecord messageRecord);
-    void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
-    void onMoreTextClicked(@NonNull RecipientId conversationRecipientId, long messageId, boolean isMms);
-    void onStickerClicked(@NonNull StickerLocator stickerLocator);
-    void onViewOnceMessageClicked(@NonNull MmsMessageRecord messageRecord);
-    void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView);
-    void onAddToContactsClicked(@NonNull Contact contact);
-    void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
-    void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
-    void onReactionClicked(@NonNull View reactionTarget, long messageId, boolean isMms);
-    void onGroupMemberClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
-    void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
-
-    /** @return true if handled, false if you want to let the normal url handling continue */
-    boolean onUrlClicked(@NonNull String url);
-  }
-}

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

@@ -1,20 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-
-import java.util.Locale;
-import java.util.Set;
-
-public interface BindableConversationListItem extends Unbindable {
-
-  void bind(@NonNull ThreadRecord thread,
-            @NonNull GlideRequests glideRequests, @NonNull Locale locale,
-            @NonNull Set<Long> typingThreads,
-            @NonNull Set<Long> selectedThreads, boolean batchMode);
-
-  void setBatchMode(boolean batchMode);
-  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
-}

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

@@ -1,128 +0,0 @@
-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,139 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.cursoradapter.widget.CursorAdapter;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.loaders.BlockedContactsLoader;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-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.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public class BlockedContactsActivity extends PassphraseRequiredActivity {
-
-  private final DynamicTheme dynamicTheme = new DynamicTheme();
-
-  @Override
-  public void onPreCreate() {
-    dynamicTheme.onCreate(this);
-  }
-
-  @Override
-  public void onCreate(Bundle bundle, boolean ready) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.BlockedContactsActivity_blocked_contacts);
-    initFragment(android.R.id.content, new BlockedContactsFragment());
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-  }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    onBackPressed();
-    return true;
-  }
-
-  public static class BlockedContactsFragment
-      extends ListFragment
-      implements LoaderManager.LoaderCallbacks<Cursor>, ListView.OnItemClickListener
-  {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-      return inflater.inflate(R.layout.blocked_contacts_fragment, container, false);
-    }
-
-    @Override
-    public void onCreate(Bundle bundle) {
-      super.onCreate(bundle);
-      setListAdapter(new BlockedContactAdapter(requireActivity(), GlideApp.with(this), null));
-      LoaderManager.getInstance(this).initLoader(0, null, this);
-    }
-
-    @Override
-    public void onStart() {
-      super.onStart();
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle bundle) {
-      super.onActivityCreated(bundle);
-      getListView().setOnItemClickListener(this);
-    }
-
-    @Override
-    public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-      return new BlockedContactsLoader(getActivity());
-    }
-
-    @Override
-    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(data);
-      }
-    }
-
-    @Override
-    public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(null);
-      }
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-      Recipient recipient = ((BlockedContactListItem)view).getRecipient();
-      BlockUnblockDialog.showUnblockFor(requireContext(), getLifecycle(), recipient, () -> {
-        RecipientUtil.unblock(requireContext(), recipient);
-        LoaderManager.getInstance(this).restartLoader(0, null, this);
-      });
-    }
-
-    private static class BlockedContactAdapter extends CursorAdapter {
-
-      private final GlideRequests glideRequests;
-
-      BlockedContactAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, @Nullable Cursor c) {
-        super(context, c);
-        this.glideRequests = glideRequests;
-      }
-
-      @Override
-      public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return LayoutInflater.from(context)
-                             .inflate(R.layout.blocked_contact_list_item, parent, false);
-      }
-
-      @Override
-      public void bindView(View view, Context context, Cursor cursor) {
-        RecipientId   recipientId = RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(RecipientDatabase.ID)));
-        LiveRecipient recipient   = Recipient.live(recipientId);
-
-        ((BlockedContactListItem) view).set(glideRequests, recipient);
-      }
-    }
-  }
-}

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

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

@@ -1,181 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.AsyncTask;
-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.MessageDatabase;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.PushDatabase;
-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.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.VerifySpan;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
-
-import java.io.IOException;
-
-import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
-
-public class ConfirmIdentityDialog extends AlertDialog {
-
-  @SuppressWarnings("unused")
-  private static final String TAG = ConfirmIdentityDialog.class.getSimpleName();
-
-  private OnClickListener callback;
-
-  public ConfirmIdentityDialog(Context context,
-                               MessageRecord messageRecord,
-                               IdentityKeyMismatch mismatch)
-  {
-    super(context);
-
-      Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.getDisplayName(context);
-      String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
-      SpannableString spannableString = new SpannableString(introduction + " " +
-                                                            context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
-
-      spannableString.setSpan(new VerifySpan(context, mismatch),
-                              introduction.length()+1, spannableString.length(),
-                              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-      setTitle(name);
-      setMessage(spannableString);
-
-      setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.ConfirmIdentityDialog_accept), new AcceptListener(messageRecord, mismatch, recipient.getId()));
-      setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(android.R.string.cancel),               new CancelListener());
-  }
-
-  @Override
-  public void show() {
-    super.show();
-    ((TextView)this.findViewById(android.R.id.message))
-                   .setMovementMethod(LinkMovementMethod.getInstance());
-  }
-
-  public void setCallback(OnClickListener callback) {
-    this.callback = callback;
-  }
-
-  private class AcceptListener implements OnClickListener {
-
-    private final MessageRecord       messageRecord;
-    private final IdentityKeyMismatch mismatch;
-    private final RecipientId         recipientId;
-
-    private AcceptListener(MessageRecord messageRecord, IdentityKeyMismatch mismatch, RecipientId recipientId) {
-      this.messageRecord = messageRecord;
-      this.mismatch      = mismatch;
-      this.recipientId   = recipientId;
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-      new AsyncTask<Void, Void, Void>()
-      {
-        @Override
-        protected Void doInBackground(Void... params) {
-          synchronized (SESSION_LOCK) {
-            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
-            TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
-
-            identityKeyStore.saveIdentity(mismatchAddress, mismatch.getIdentityKey(), true);
-          }
-
-          processMessageRecord(messageRecord);
-
-          return null;
-        }
-
-        private void processMessageRecord(MessageRecord messageRecord) {
-          if (messageRecord.isOutgoing()) processOutgoingMessageRecord(messageRecord);
-          else                            processIncomingMessageRecord(messageRecord);
-        }
-
-        private void processOutgoingMessageRecord(MessageRecord messageRecord) {
-          MessageDatabase smsDatabase = DatabaseFactory.getSmsDatabase(getContext());
-          MessageDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(getContext());
-
-          if (messageRecord.isMms()) {
-            mmsDatabase.removeMismatchedIdentity(messageRecord.getId(),
-                                                 mismatch.getRecipientId(getContext()),
-                                                 mismatch.getIdentityKey());
-
-            if (messageRecord.getRecipient().isPushGroup()) {
-              MessageSender.resendGroupMessage(getContext(), messageRecord, Recipient.resolved(mismatch.getRecipientId(getContext())).getId());
-            } else {
-              MessageSender.resend(getContext(), messageRecord);
-            }
-          } else {
-            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
-                                                 mismatch.getRecipientId(getContext()),
-                                                 mismatch.getIdentityKey());
-
-            MessageSender.resend(getContext(), messageRecord);
-          }
-        }
-
-        private void processIncomingMessageRecord(MessageRecord messageRecord) {
-          try {
-            PushDatabase    pushDatabase = DatabaseFactory.getPushDatabase(getContext());
-            MessageDatabase smsDatabase  = DatabaseFactory.getSmsDatabase(getContext());
-
-            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
-                                                 mismatch.getRecipientId(getContext()),
-                                                 mismatch.getIdentityKey());
-
-            boolean legacy = !messageRecord.isContentBundleKeyExchange();
-
-            SignalServiceEnvelope envelope = new SignalServiceEnvelope(SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE,
-                                                                       Optional.of(RecipientUtil.toSignalServiceAddress(getContext(), messageRecord.getIndividualRecipient())),
-                                                                       messageRecord.getRecipientDeviceId(),
-                                                                       messageRecord.getDateSent(),
-                                                                       legacy ? Base64.decode(messageRecord.getBody()) : null,
-                                                                       !legacy ? Base64.decode(messageRecord.getBody()) : null,
-                                                                       0,
-                                                                       0,
-                                                                       null);
-
-            long pushId = pushDatabase.insert(envelope);
-
-            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
-          } catch (IOException e) {
-            throw new AssertionError(e);
-          }
-        }
-
-      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-
-      if (callback != null) callback.onClick(null, 0);
-    }
-  }
-
-  private class CancelListener implements OnClickListener {
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-      if (callback != null) callback.onClick(null, 0);
-    }
-  }
-
-}

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

@@ -1,646 +0,0 @@
-/*
- * Copyright (C) 2015 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-
-import android.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.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.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 LoggingFragment
-                                                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 SELECTION_LIMIT   = "selection_limit";
-  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(SELECTION_LIMIT, 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) {
-      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 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() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
-        Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
-        return;
-      }
-
-      if (!isMulti() || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
-        if (selectionLimitReached()) {
-          Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_the_group_is_full, Toast.LENGTH_SHORT).show();
-          groupLimit.animate().scaleX(1.3f).scaleY(1.3f).setInterpolator(new CycleInterpolator(0.5f)).start();
-          return;
-        }
-
-        if (contact.isUsernameType()) {
-          AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
-
-          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());
-
-              if (onContactSelectedListener != null) {
-                if (onContactSelectedListener.onBeforeContactSelected(Optional.of(recipient.getId()), null)) {
-                  markContactSelected(selected);
-                  cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-                }
-              } else {
-                markContactSelected(selected);
-                cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-              }
-            } else {
-              new AlertDialog.Builder(requireContext())
-                             .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 {
-          if (onContactSelectedListener != null) {
-            if (onContactSelectedListener.onBeforeContactSelected(contact.getRecipientId(), contact.getNumber())) {
-              markContactSelected(selectedContact);
-              cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-            }
-          } else {
-            markContactSelected(selectedContact);
-            cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-          }
-        }
-      } else {
-        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() + currentSelection.size() >= selectionLimit;
-  }
-
-  private void markContactSelected(@NonNull SelectedContact selectedContact) {
-    cursorRecyclerViewAdapter.addSelectedContact(selectedContact);
-    if (isMulti()) {
-      addChipForSelectedContact(selectedContact);
-    }
-  }
-
-  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
-    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
-    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-    removeChipForContact(selectedContact);
-  }
-
-  private void removeChipForContact(@NonNull SelectedContact contact) {
-    for (int i = chipGroup.getChildCount() - 1; i >= 0; i--) {
-      View v = chipGroup.getChildAt(i);
-      if (v instanceof ContactChip && contact.matches(((ContactChip) v).getContact())) {
-        chipGroup.removeView(v);
-      }
-    }
-
-    updateGroupLimit(getChipCount());
-
-    if (getChipCount() == 0) {
-      setChipGroupVisibility(ConstraintSet.GONE);
-    }
-  }
-
-  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
-    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
-                   ()       -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
-                   resolved -> addChipForRecipient(resolved, selectedContact));
-  }
-
-  private void addChipForRecipient(@NonNull Recipient recipient, @NonNull SelectedContact selectedContact) {
-    final ContactChip chip = new ContactChip(requireContext());
-
-    if (getChipCount() == 0) {
-      setChipGroupVisibility(ConstraintSet.VISIBLE);
-    }
-
-    chip.setText(recipient.getShortDisplayName(requireContext()));
-    chip.setContact(selectedContact);
-    chip.setCloseIconVisible(true);
-    chip.setOnCloseIconClickListener(view -> {
-      markContactUnselected(selectedContact);
-
-      if (onContactSelectedListener != null) {
-        onContactSelectedListener.onContactDeselected(Optional.of(recipient.getId()), recipient.getE164().orNull());
-      }
-    });
-
-    chipGroup.getLayoutTransition().addTransitionListener(new LayoutTransition.TransitionListener() {
-      @Override
-      public void startTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
-      }
-
-      @Override
-      public void endTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
-        if (view == chip && transitionType == LayoutTransition.APPEARING) {
-          chipGroup.getLayoutTransition().removeTransitionListener(this);
-          registerChipRecipientObserver(chip, recipient.live());
-          chipGroup.post(ContactSelectionListFragment.this::smoothScrollChipsToEnd);
-        }
-      }
-    });
-
-    chip.setAvatar(glideRequests, recipient, () -> addChip(chip));
-  }
-
-  private void addChip(@NonNull ContactChip chip) {
-    chipGroup.addView(chip);
-    updateGroupLimit(getChipCount());
-  }
-
-  private int getChipCount() {
-    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
-    if (count < 0) throw new AssertionError();
-    return count;
-  }
-
-  private void registerChipRecipientObserver(@NonNull ContactChip chip, @Nullable LiveRecipient recipient) {
-    if (recipient != null) {
-      recipient.observe(getViewLifecycleOwner(), resolved -> {
-        if (chip.isAttachedToWindow()) {
-          chip.setAvatar(glideRequests, resolved, null);
-          chip.setText(resolved.getShortDisplayName(chip.getContext()));
-        }
-      });
-    }
-  }
-
-  private void setChipGroupVisibility(int visibility) {
-    TransitionManager.beginDelayedTransition(constraintLayout, new AutoTransition().setDuration(CHIP_GROUP_REVEAL_DURATION_MS));
-
-    ConstraintSet constraintSet = new ConstraintSet();
-    constraintSet.clone(constraintLayout);
-    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
-    constraintSet.applyTo(constraintLayout);
-  }
-
-  public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
-    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 {
-    /** @return True if the contact is allowed to be selected, otherwise false. */
-    boolean onBeforeContactSelected(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

@@ -1,221 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.devicelist.Device;
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import com.melnykov.fab.FloatingActionButton;
-
-import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-public class DeviceListFragment extends ListFragment
-    implements LoaderManager.LoaderCallbacks<List<Device>>,
-               ListView.OnItemClickListener, Button.OnClickListener
-{
-
-  private static final String TAG = DeviceListFragment.class.getSimpleName();
-
-  private SignalServiceAccountManager accountManager;
-  private Locale                      locale;
-  private View                        empty;
-  private View                        progressContainer;
-  private FloatingActionButton        addDeviceButton;
-  private Button.OnClickListener      addDeviceButtonListener;
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
-  }
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-    this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-    View view = inflater.inflate(R.layout.device_list_fragment, container, false);
-
-    this.empty             = view.findViewById(R.id.empty);
-    this.progressContainer = view.findViewById(R.id.progress_container);
-    this.addDeviceButton   = ViewUtil.findById(view, R.id.add_device);
-    this.addDeviceButton.setOnClickListener(this);
-
-    return view;
-  }
-
-  @Override
-  public void onActivityCreated(Bundle bundle) {
-    super.onActivityCreated(bundle);
-    getLoaderManager().initLoader(0, null, this);
-    getListView().setOnItemClickListener(this);
-  }
-
-  public void setAddDeviceButtonListener(Button.OnClickListener listener) {
-    this.addDeviceButtonListener = listener;
-  }
-
-  @Override
-  public @NonNull Loader<List<Device>> onCreateLoader(int id, Bundle args) {
-    empty.setVisibility(View.GONE);
-    progressContainer.setVisibility(View.VISIBLE);
-
-    return new DeviceListLoader(getActivity(), accountManager);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<List<Device>> loader, List<Device> data) {
-    progressContainer.setVisibility(View.GONE);
-
-    if (data == null) {
-      handleLoaderFailed();
-      return;
-    }
-
-    setListAdapter(new DeviceListAdapter(getActivity(), R.layout.device_list_item_view, data, locale));
-
-    if (data.isEmpty()) {
-      empty.setVisibility(View.VISIBLE);
-      TextSecurePreferences.setMultiDevice(getActivity(), false);
-    } else {
-      empty.setVisibility(View.GONE);
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<List<Device>> loader) {
-    setListAdapter(null);
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-    final String deviceName = ((DeviceListItem)view).getDeviceName();
-    final long   deviceId   = ((DeviceListItem)view).getDeviceId();
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
-    builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        handleDisconnectDevice(deviceId);
-      }
-    });
-    builder.show();
-  }
-
-  private void handleLoaderFailed() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setMessage(R.string.DeviceListActivity_network_connection_failed);
-    builder.setPositiveButton(R.string.DeviceListActivity_try_again,
-                              new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
-      }
-    });
-
-    builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        DeviceListFragment.this.getActivity().onBackPressed();
-      }
-    });
-    builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        DeviceListFragment.this.getActivity().onBackPressed();
-      }
-    });
-
-    builder.show();
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void handleDisconnectDevice(final long deviceId) {
-    new ProgressDialogAsyncTask<Void, Void, Boolean>(getActivity(),
-                                                     R.string.DeviceListActivity_unlinking_device_no_ellipsis,
-                                                     R.string.DeviceListActivity_unlinking_device)
-    {
-      @Override
-      protected Boolean doInBackground(Void... params) {
-        try {
-          accountManager.removeDevice(deviceId);
-          return true;
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          return false;
-        }
-      }
-
-      @Override
-      protected void onPostExecute(Boolean result) {
-        super.onPostExecute(result);
-        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);
-  }
-
-  @Override
-  public void onClick(View v) {
-    if (addDeviceButtonListener != null) addDeviceButtonListener.onClick(v);
-  }
-
-  private static class DeviceListAdapter extends ArrayAdapter<Device> {
-
-    private final int    resource;
-    private final Locale locale;
-
-    public DeviceListAdapter(Context context, int resource, List<Device> objects, Locale locale) {
-      super(context, resource, objects);
-      this.resource = resource;
-      this.locale = locale;
-    }
-
-    @Override
-    public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent) {
-      if (convertView == null) {
-        convertView = ((Activity)getContext()).getLayoutInflater().inflate(resource, parent, false);
-      }
-
-      ((DeviceListItem)convertView).set(getItem(position), locale);
-
-      return convertView;
-    }
-  }
-}

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

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

@@ -1,290 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.annotation.AnimRes;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
-
-import org.thoughtcrime.securesms.components.ContactFilterToolbar;
-import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
-import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.WindowUtil;
-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.concurrent.ExecutionException;
-
-public class InviteActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener {
-
-  private ContactSelectionListFragment contactsFragment;
-  private EditText                     inviteText;
-  private ViewGroup                    smsSendFrame;
-  private Button                       smsSendButton;
-  private Animation                    slideInAnimation;
-  private Animation                    slideOutAnimation;
-  private DynamicTheme                 dynamicTheme = new DynamicNoActionBarInviteTheme();
-  private Toolbar                      primaryToolbar;
-
-  @Override
-  protected void onPreCreate() {
-    super.onPreCreate();
-    dynamicTheme.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_SMS);
-    getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
-    getIntent().putExtra(ContactSelectionListFragment.REFRESHABLE, false);
-
-    setContentView(R.layout.invite_activity);
-
-    initializeAppBar();
-    initializeResources();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-  }
-
-  private void initializeAppBar() {
-    primaryToolbar = findViewById(R.id.toolbar);
-    setSupportActionBar(primaryToolbar);
-
-    assert getSupportActionBar() != null;
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__invite_friends);
-  }
-
-  private void initializeResources() {
-    slideInAnimation  = loadAnimation(R.anim.slide_from_bottom);
-    slideOutAnimation = loadAnimation(R.anim.slide_to_bottom);
-
-    View                 shareButton     = ViewUtil.findById(this, R.id.share_button);
-    View                 smsButton       = ViewUtil.findById(this, R.id.sms_button);
-    Button               smsCancelButton = ViewUtil.findById(this, R.id.cancel_sms_button);
-    ContactFilterToolbar contactFilter   = ViewUtil.findById(this, R.id.contact_filter);
-
-    inviteText        = ViewUtil.findById(this, R.id.invite_text);
-    smsSendFrame      = ViewUtil.findById(this, R.id.sms_send_frame);
-    smsSendButton     = ViewUtil.findById(this, R.id.send_sms_button);
-    contactsFragment  = (ContactSelectionListFragment)getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
-
-    inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
-    updateSmsButtonText(contactsFragment.getSelectedContacts().size());
-
-    contactsFragment.setOnContactSelectedListener(this);
-    shareButton.setOnClickListener(new ShareClickListener());
-    smsButton.setOnClickListener(new SmsClickListener());
-    smsCancelButton.setOnClickListener(new SmsCancelClickListener());
-    smsSendButton.setOnClickListener(new SmsSendClickListener());
-    contactFilter.setOnFilterChangedListener(new ContactFilterChangedListener());
-    contactFilter.setNavigationIcon(R.drawable.ic_search_conversation_24);
-  }
-
-  private Animation loadAnimation(@AnimRes int animResId) {
-    final Animation animation = AnimationUtils.loadAnimation(this, animResId);
-    animation.setInterpolator(new FastOutSlowInInterpolator());
-    return animation;
-  }
-
-  @Override
-  public boolean onBeforeContactSelected(Optional<RecipientId> recipientId, String number) {
-    updateSmsButtonText(contactsFragment.getSelectedContacts().size() + 1);
-    return true;
-  }
-
-  @Override
-  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
-    updateSmsButtonText(contactsFragment.getSelectedContacts().size());
-  }
-
-  private void sendSmsInvites() {
-    new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
-        .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
-                           contactsFragment.getSelectedContacts()
-                                           .toArray(new SelectedContact[0]));
-  }
-
-  private void updateSmsButtonText(int count) {
-    smsSendButton.setText(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_to_friends,
-                                                           count,
-                                                           count));
-    smsSendButton.setEnabled(count > 0);
-  }
-
-  @Override public void onBackPressed() {
-    if (smsSendFrame.getVisibility() == View.VISIBLE) {
-      cancelSmsSelection();
-    } else {
-      super.onBackPressed();
-    }
-  }
-
-  private void cancelSmsSelection() {
-    setPrimaryColorsToolbarNormal();
-    contactsFragment.reset();
-    updateSmsButtonText(contactsFragment.getSelectedContacts().size());
-    ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE);
-  }
-
-  private void setPrimaryColorsToolbarNormal() {
-    primaryToolbar.setBackgroundColor(0);
-    primaryToolbar.getNavigationIcon().setColorFilter(null);
-    primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.title_text_color_primary));
-
-    if (Build.VERSION.SDK_INT >= 23) {
-      getWindow().setStatusBarColor(ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor));
-      getWindow().setNavigationBarColor(ThemeUtil.getThemedColor(this, android.R.attr.navigationBarColor));
-      WindowUtil.setLightStatusBarFromTheme(this);
-    }
-
-    WindowUtil.setLightNavigationBarFromTheme(this);
-  }
-
-  private void setPrimaryColorsToolbarForSms() {
-    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.core_ultramarine));
-      WindowUtil.clearLightStatusBar(getWindow());
-    }
-
-    if (Build.VERSION.SDK_INT >= 27) {
-      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
-      WindowUtil.clearLightNavigationBar(getWindow());
-    }
-  }
-
-  private class ShareClickListener implements OnClickListener {
-    @Override
-    public void onClick(View v) {
-      Intent sendIntent = new Intent();
-      sendIntent.setAction(Intent.ACTION_SEND);
-      sendIntent.putExtra(Intent.EXTRA_TEXT, inviteText.getText().toString());
-      sendIntent.setType("text/plain");
-      if (sendIntent.resolveActivity(getPackageManager()) != null) {
-        startActivity(Intent.createChooser(sendIntent, getString(R.string.InviteActivity_invite_to_signal)));
-      } else {
-        Toast.makeText(InviteActivity.this, R.string.InviteActivity_no_app_to_share_to, Toast.LENGTH_LONG).show();
-      }
-    }
-  }
-
-  private class SmsClickListener implements OnClickListener {
-    @Override
-    public void onClick(View v) {
-      setPrimaryColorsToolbarForSms();
-      ViewUtil.animateIn(smsSendFrame, slideInAnimation);
-    }
-  }
-
-  private class SmsCancelClickListener implements OnClickListener {
-    @Override
-    public void onClick(View v) {
-      cancelSmsSelection();
-    }
-  }
-
-  private class SmsSendClickListener implements OnClickListener {
-    @Override
-    public void onClick(View v) {
-      new AlertDialog.Builder(InviteActivity.this)
-          .setTitle(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_invites,
-                                                     contactsFragment.getSelectedContacts().size(),
-                                                     contactsFragment.getSelectedContacts().size()))
-          .setMessage(inviteText.getText().toString())
-          .setPositiveButton(R.string.yes, (dialog, which) -> sendSmsInvites())
-          .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
-          .show();
-    }
-  }
-
-  private class ContactFilterChangedListener implements OnFilterChangedListener {
-    @Override
-    public void onFilterChanged(String filter) {
-      contactsFragment.setQueryFilter(filter);
-    }
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<SelectedContact,Void,Void> {
-    private final String message;
-
-    SendSmsInvitesAsyncTask(Context context, String message) {
-      super(context, R.string.InviteActivity_sending, R.string.InviteActivity_sending);
-      this.message = message;
-    }
-
-    @Override
-    protected Void doInBackground(SelectedContact... contacts) {
-      final Context context = getContext();
-      if (context == null) return null;
-
-      for (SelectedContact contact : contacts) {
-        RecipientId recipientId    = contact.getOrCreateRecipientId(context);
-        Recipient   recipient      = Recipient.resolved(recipientId);
-        int         subscriptionId = recipient.getDefaultSubscriptionId().or(-1);
-
-        MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null);
-
-        if (recipient.getContactUri() != null) {
-          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
-        }
-      }
-
-      return null;
-    }
-
-    @Override
-    protected void onPostExecute(Void aVoid) {
-      super.onPostExecute(aVoid);
-      final Context context = getContext();
-      if (context == null) return;
-
-      ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE).addListener(new Listener<Boolean>() {
-        @Override
-        public void onSuccess(Boolean result) {
-          contactsFragment.reset();
-        }
-
-        @Override
-        public void onFailure(ExecutionException e) {}
-      });
-      Toast.makeText(context, R.string.InviteActivity_invitations_sent, Toast.LENGTH_LONG).show();
-    }
-  }
-}

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

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

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

@@ -1,63 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public class MainActivity extends PassphraseRequiredActivity {
-
-  private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
-  private final MainNavigator navigator    = new MainNavigator(this);
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    super.onCreate(savedInstanceState, ready);
-    setContentView(R.layout.main_activity);
-
-    navigator.onCreate(savedInstanceState);
-
-    handleGroupLinkInIntent(getIntent());
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    handleGroupLinkInIntent(intent);
-  }
-
-  @Override
-  protected void onPreCreate() {
-    super.onPreCreate();
-    dynamicTheme.onCreate(this);
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-  }
-
-  @Override
-  public void onBackPressed() {
-    if (!navigator.onBackPressed()) {
-      super.onBackPressed();
-    }
-  }
-
-  public @NonNull MainNavigator getNavigator() {
-    return navigator;
-  }
-
-  private void handleGroupLinkInIntent(Intent intent) {
-    Uri data = intent.getData();
-    if (data != null) {
-      CommunicationActions.handlePotentialGroupLinkUrl(this, data.toString());
-    }
-  }
-}

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

@@ -1,21 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-public class MainFragment extends LoggingFragment {
-
-  @Override
-  public void onAttach(@NonNull Context context) {
-    super.onAttach(context);
-
-    if (!(requireActivity() instanceof MainActivity)) {
-      throw new IllegalStateException("Can only be used inside of MainActivity!");
-    }
-  }
-
-  protected @NonNull MainNavigator getNavigator() {
-    return MainNavigator.get(requireActivity());
-  }
-}

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

@@ -1,104 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-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;
-
-public class MainNavigator {
-
-  private final MainActivity activity;
-
-  public MainNavigator(@NonNull MainActivity activity) {
-    this.activity = activity;
-  }
-
-  public static MainNavigator get(@NonNull Activity activity) {
-    if (!(activity instanceof MainActivity)) {
-      throw new IllegalArgumentException("Activity must be an instance of MainActivity!");
-    }
-
-    return ((MainActivity) activity).getNavigator();
-  }
-
-  public void onCreate(@Nullable Bundle savedInstanceState) {
-    if (savedInstanceState != null) {
-      return;
-    }
-
-    getFragmentManager().beginTransaction()
-                        .add(R.id.fragment_container, ConversationListFragment.newInstance())
-                        .commit();
-  }
-
-  /**
-   * @return True if the back pressed was handled in our own custom way, false if it should be given
-   *         to the system to do the default behavior.
-   */
-  public boolean onBackPressed() {
-    Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_container);
-
-    if (fragment instanceof BackHandler) {
-      return ((BackHandler) fragment).onBackPressed();
-    }
-
-    return false;
-  }
-
-  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);
-  }
-
-  public void goToAppSettings() {
-    Intent intent = new Intent(activity, ApplicationPreferencesActivity.class);
-    activity.startActivity(intent);
-  }
-
-
-  public void goToArchiveList() {
-    getFragmentManager().beginTransaction()
-                        .setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end)
-                        .replace(R.id.fragment_container, ConversationListArchiveFragment.newInstance())
-                        .addToBackStack(null)
-                        .commit();
-  }
-
-  public void goToGroupCreation() {
-    activity.startActivity(CreateGroupActivity.newIntent(activity));
-  }
-
-  public void goToInvite() {
-    Intent intent = new Intent(activity, InviteActivity.class);
-    activity.startActivity(intent);
-  }
-
-  public void goToInsights() {
-    InsightsLauncher.showInsightsDashboard(activity.getSupportFragmentManager());
-  }
-
-  private @NonNull FragmentManager getFragmentManager() {
-    return activity.getSupportFragmentManager();
-  }
-
-  public interface BackHandler {
-    /**
-     * @return True if the back pressed was handled in our own custom way, false if it should be given
-     *         to the system to do the default behavior.
-     */
-    boolean onBackPressed();
-  }
-}

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

@@ -1,821 +0,0 @@
-/*
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.core.util.Pair;
-import androidx.core.view.ViewCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
-
-import org.thoughtcrime.securesms.animation.DepthPageTransformer;
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener;
-import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
-import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewViewModel;
-import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
-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.FullscreenHelper;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Activity for displaying media attachments in-app
- */
-public final class MediaPreviewActivity extends PassphraseRequiredActivity
-  implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
-             MediaRailAdapter.RailItemListener,
-             MediaPreviewFragment.Events
-{
-
-  private final static String TAG = MediaPreviewActivity.class.getSimpleName();
-
-  private static final int NOT_IN_A_THREAD = -2;
-
-  public static final String THREAD_ID_EXTRA      = "thread_id";
-  public static final String DATE_EXTRA           = "date";
-  public static final String SIZE_EXTRA           = "size";
-  public static final String CAPTION_EXTRA        = "caption";
-  public static final String LEFT_IS_RECENT_EXTRA = "left_is_recent";
-  public static final String HIDE_ALL_MEDIA_EXTRA = "came_from_all_media";
-  public static final String SHOW_THREAD_EXTRA    = "show_thread";
-  public static final String SORTING_EXTRA        = "sorting";
-
-  private ViewPager             mediaPager;
-  private View                  detailsContainer;
-  private TextView              caption;
-  private View                  captionContainer;
-  private RecyclerView          albumRail;
-  private MediaRailAdapter      albumRailAdapter;
-  private ViewGroup             playbackControlsContainer;
-  private Uri                   initialMediaUri;
-  private String                initialMediaType;
-  private long                  initialMediaSize;
-  private String                initialCaption;
-  private boolean               leftIsRecent;
-  private MediaPreviewViewModel viewModel;
-  private ViewPagerListener     viewPagerListener;
-
-  private int                   restartItem      = -1;
-  private long                  threadId         = NOT_IN_A_THREAD;
-  private boolean               cameFromAllMedia;
-  private boolean               showThread;
-  private MediaDatabase.Sorting sorting;
-  private FullscreenHelper      fullscreenHelper;
-
-  private @Nullable Cursor cursor = null;
-
-  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
-                                                      @NonNull MediaRecord mediaRecord,
-                                                      boolean leftIsRecent)
-  {
-    DatabaseAttachment attachment = Objects.requireNonNull(mediaRecord.getAttachment());
-    Intent intent = new Intent(context, MediaPreviewActivity.class);
-    intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
-    intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
-    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
-    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
-    intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
-    return intent;
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  @Override
-  protected void onCreate(Bundle bundle, boolean ready) {
-    this.setTheme(R.style.TextSecure_MediaPreview);
-    setContentView(R.layout.media_preview_activity);
-
-    setSupportActionBar(findViewById(R.id.toolbar));
-
-    viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
-
-    fullscreenHelper = new FullscreenHelper(this);
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    initializeViews();
-    initializeResources();
-    initializeObservers();
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  @Override
-  public void onRailItemClicked(int distanceFromActive) {
-    mediaPager.setCurrentItem(mediaPager.getCurrentItem() + distanceFromActive);
-  }
-
-  @Override
-  public void onRailItemDeleteClicked(int distanceFromActive) {
-    throw new UnsupportedOperationException("Callback unsupported.");
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  private void initializeActionBar() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      getSupportActionBar().setTitle(getTitleText(mediaItem));
-      getSupportActionBar().setSubtitle(getSubTitleText(mediaItem));
-    }
-  }
-
-  private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
-    String from;
-    if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
-    else if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
-    else                                  from = "";
-
-    if (showThread) {
-      String    to              = null;
-      Recipient threadRecipient = mediaItem.threadRecipient;
-
-      if (threadRecipient != null) {
-        if (mediaItem.outgoing || threadRecipient.isGroup()) {
-          if (threadRecipient.isLocalNumber()) {
-            from = getString(R.string.note_to_self);
-          } else {
-            to = threadRecipient.getDisplayName(this);
-          }
-        } else {
-          to = getString(R.string.MediaPreviewActivity_you);
-        }
-      }
-
-      return to != null ? getString(R.string.MediaPreviewActivity_s_to_s, from, to)
-                        : from;
-    } else {
-      return from;
-    }
-  }
-
-  private @NonNull String getSubTitleText(@NonNull MediaItem mediaItem) {
-    if (mediaItem.date > 0) {
-      return DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
-    } else {
-      return getString(R.string.MediaPreviewActivity_draft);
-    }
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    initializeMedia();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    restartItem = cleanupMedia();
-  }
-
-  @Override
-  protected void onDestroy() {
-    if (cursor != null) {
-      cursor.close();
-      cursor = null;
-    }
-    super.onDestroy();
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    setIntent(intent);
-    initializeResources();
-  }
-
-  private void initializeViews() {
-    mediaPager = findViewById(R.id.media_pager);
-    mediaPager.setOffscreenPageLimit(1);
-    mediaPager.setPageTransformer(true, new DepthPageTransformer());
-
-    viewPagerListener = new ViewPagerListener();
-    mediaPager.addOnPageChangeListener(viewPagerListener);
-
-    albumRail        = findViewById(R.id.media_preview_album_rail);
-    albumRailAdapter = new MediaRailAdapter(GlideApp.with(this), this, false);
-
-    albumRail.setItemAnimator(null); // Or can crash when set to INVISIBLE while animating by FullscreenHelper https://issuetracker.google.com/issues/148720682
-    albumRail.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
-    albumRail.setAdapter(albumRailAdapter);
-
-    detailsContainer          = findViewById(R.id.media_preview_details_container);
-    caption                   = findViewById(R.id.media_preview_caption);
-    captionContainer          = findViewById(R.id.media_preview_caption_container);
-    playbackControlsContainer = findViewById(R.id.media_preview_playback_controls_container);
-
-    View toolbarLayout = findViewById(R.id.toolbar_layout);
-
-    anchorMarginsToBottomInsets(detailsContainer);
-
-    fullscreenHelper.configureToolbarSpacer(findViewById(R.id.toolbar_cutout_spacer));
-
-    fullscreenHelper.showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
-  }
-
-  private void initializeResources() {
-    Intent intent = getIntent();
-
-    threadId         = intent.getLongExtra(THREAD_ID_EXTRA, NOT_IN_A_THREAD);
-    cameFromAllMedia = intent.getBooleanExtra(HIDE_ALL_MEDIA_EXTRA, false);
-    showThread       = intent.getBooleanExtra(SHOW_THREAD_EXTRA, false);
-    sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(SORTING_EXTRA, 0)];
-
-    initialMediaUri  = intent.getData();
-    initialMediaType = intent.getType();
-    initialMediaSize = intent.getLongExtra(SIZE_EXTRA, 0);
-    initialCaption   = intent.getStringExtra(CAPTION_EXTRA);
-    leftIsRecent     = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
-    restartItem      = -1;
-  }
-
-  private void initializeObservers() {
-    viewModel.getPreviewData().observe(this, previewData -> {
-      if (previewData == null || mediaPager == null || mediaPager.getAdapter() == null) {
-        return;
-      }
-
-      if (!((MediaItemAdapter) mediaPager.getAdapter()).hasFragmentFor(mediaPager.getCurrentItem())) {
-        Log.d(TAG, "MediaItemAdapter wasn't ready. Posting again...");
-        viewModel.resubmitPreviewData();
-      }
-
-      View playbackControls = ((MediaItemAdapter) mediaPager.getAdapter()).getPlaybackControls(mediaPager.getCurrentItem());
-
-      if (previewData.getAlbumThumbnails().isEmpty() && previewData.getCaption() == null && playbackControls == null) {
-        detailsContainer.setVisibility(View.GONE);
-      } else {
-        detailsContainer.setVisibility(View.VISIBLE);
-      }
-
-      albumRail.setVisibility(previewData.getAlbumThumbnails().isEmpty() ? View.GONE : View.VISIBLE);
-      albumRailAdapter.setMedia(previewData.getAlbumThumbnails(), previewData.getActivePosition());
-      albumRail.smoothScrollToPosition(previewData.getActivePosition());
-
-      captionContainer.setVisibility(previewData.getCaption() == null ? View.GONE : View.VISIBLE);
-      caption.setText(previewData.getCaption());
-
-      if (playbackControls != null) {
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        playbackControls.setLayoutParams(params);
-
-        playbackControlsContainer.removeAllViews();
-        playbackControlsContainer.addView(playbackControls);
-      } else {
-        playbackControlsContainer.removeAllViews();
-      }
-    });
-  }
-
-  private void initializeMedia() {
-    if (!isContentTypeSupported(initialMediaType)) {
-      Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
-      Toast.makeText(getApplicationContext(), R.string.MediaPreviewActivity_unssuported_media_type, Toast.LENGTH_LONG).show();
-      finish();
-    }
-
-    Log.i(TAG, "Loading Part URI: " + initialMediaUri);
-
-    if (isMediaInDb()) {
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    } else {
-      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize));
-
-      if (initialCaption != null) {
-        detailsContainer.setVisibility(View.VISIBLE);
-        captionContainer.setVisibility(View.VISIBLE);
-        caption.setText(initialCaption);
-      }
-    }
-  }
-
-  private int cleanupMedia() {
-    int restartItem = mediaPager.getCurrentItem();
-
-    mediaPager.removeAllViews();
-    mediaPager.setAdapter(null);
-    viewModel.setCursor(this, null, leftIsRecent);
-
-    return restartItem;
-  }
-
-  private void showOverview() {
-    startActivity(MediaOverviewActivity.forThread(this, threadId));
-  }
-
-  private void forward() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      Intent composeIntent = new Intent(this, ShareActivity.class);
-      composeIntent.putExtra(Intent.EXTRA_STREAM, mediaItem.uri);
-      composeIntent.setType(mediaItem.type);
-      startActivity(composeIntent);
-    }
-  }
-
-  @SuppressWarnings("CodeBlock2Expr")
-  @SuppressLint("InlinedApi")
-  private void saveToDisk() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
-        Permissions.with(this)
-                   .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                   .ifNecessary()
-                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
-                   .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
-                   .onAllGranted(() -> {
-                     SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
-                     long saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
-                     saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
-                   })
-                   .execute();
-      });
-    }
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void deleteMedia() {
-    MediaItem mediaItem = getCurrentMediaItem();
-    if (mediaItem == null || mediaItem.attachment == null) {
-      return;
-    }
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
-    builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
-    builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
-    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
-      new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
-                                          mediaItem.attachment);
-          return null;
-        }
-      }.execute();
-
-      finish();
-    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    menu.clear();
-    MenuInflater inflater = this.getMenuInflater();
-    inflater.inflate(R.menu.media_preview, menu);
-
-    super.onCreateOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    if (!isMediaInDb()) {
-      menu.findItem(R.id.media_preview__overview).setVisible(false);
-      menu.findItem(R.id.delete).setVisible(false);
-    }
-
-    if (cameFromAllMedia) {
-      menu.findItem(R.id.media_preview__overview).setVisible(false);
-    }
-
-    super.onPrepareOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-
-    switch (item.getItemId()) {
-      case R.id.media_preview__overview: showOverview(); return true;
-      case R.id.media_preview__forward:  forward();      return true;
-      case R.id.save:                    saveToDisk();   return true;
-      case R.id.delete:                  deleteMedia();  return true;
-      case android.R.id.home:            finish();       return true;
-    }
-
-    return false;
-  }
-
-  private boolean isMediaInDb() {
-    return threadId != NOT_IN_A_THREAD;
-  }
-
-  private @Nullable MediaItem getCurrentMediaItem() {
-    MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-    if (adapter != null) {
-      return adapter.getMediaItemFor(mediaPager.getCurrentItem());
-    } else {
-      return null;
-    }
-  }
-
-  public static boolean isContentTypeSupported(final String contentType) {
-    return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("video/"));
-  }
-
-  @Override
-  public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
-    return new PagingMediaLoader(this, threadId, initialMediaUri, leftIsRecent, sorting);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
-    if (data != null) {
-      if (data.first == cursor) {
-        return;
-      }
-
-      if (cursor != null) {
-        cursor.close();
-      }
-      cursor = Objects.requireNonNull(data.first);
-
-      int mediaPosition = Objects.requireNonNull(data.second);
-
-      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, cursor, mediaPosition, leftIsRecent);
-      mediaPager.setAdapter(adapter);
-      adapter.setActive(true);
-
-      viewModel.setCursor(this, cursor, leftIsRecent);
-
-      int item = restartItem >= 0 ? restartItem : mediaPosition;
-      mediaPager.setCurrentItem(item);
-
-      if (item == 0) {
-        viewPagerListener.onPageSelected(0);
-      }
-
-      cursor.registerContentObserver(new ContentObserver(new Handler(getMainLooper())) {
-        @Override
-        public void onChange(boolean selfChange) {
-          onMediaChange();
-        }
-      });
-    } else {
-      mediaNotAvailable();
-    }
-  }
-
-  private void onMediaChange() {
-    MediaItemAdapter adapter = (MediaItemAdapter) mediaPager.getAdapter();
-
-    if (adapter != null) {
-      adapter.checkMedia(mediaPager.getCurrentItem());
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
-
-  }
-
-  @Override
-  public boolean singleTapOnMedia() {
-    fullscreenHelper.toggleUiVisibility();
-    return true;
-  }
-
-  @Override
-  public void mediaNotAvailable() {
-    Toast.makeText(this, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show();
-    finish();
-  }
-
-  private class ViewPagerListener extends ExtendedOnPageChangedListener {
-
-    @Override
-    public void onPageSelected(int position) {
-      super.onPageSelected(position);
-
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
-        viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
-        initializeActionBar();
-      }
-    }
-
-
-    @Override
-    public void onPageUnselected(int position) {
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.live().removeObservers(MediaPreviewActivity.this);
-
-        adapter.pause(position);
-      }
-    }
-  }
-
-  private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    private final Uri    uri;
-    private final String mediaType;
-    private final long   size;
-
-    private MediaPreviewFragment mediaPreviewFragment;
-
-    SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
-                           @NonNull Uri uri,
-                           @NonNull String mediaType,
-                           long size)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.uri       = uri;
-      this.mediaType = mediaType;
-      this.size      = size;
-    }
-
-    @Override
-    public int getCount() {
-      return 1;
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true);
-      return mediaPreviewFragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.cleanUp();
-        mediaPreviewFragment = null;
-      }
-    }
-
-    @Override
-    public MediaItem getMediaItemFor(int position) {
-      return new MediaItem(null, null, null, uri, mediaType, -1, true);
-    }
-
-    @Override
-    public void pause(int position) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.pause();
-      }
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      if (mediaPreviewFragment != null) {
-        return mediaPreviewFragment.getPlaybackControls();
-      }
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaPreviewFragment != null;
-    }
-
-    @Override
-    public void checkMedia(int currentItem) {
-
-    }
-  }
-
-  private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
-    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
-      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-
-      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
-                              layoutParams.topMargin,
-                              insets.getSystemWindowInsetRight(),
-                              insets.getSystemWindowInsetBottom());
-
-      view.setLayoutParams(layoutParams);
-
-      return insets;
-    });
-  }
-
-  private static class CursorPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    @SuppressLint("UseSparseArrays")
-    private final Map<Integer, MediaPreviewFragment> mediaFragments = new HashMap<>();
-
-    private final Context context;
-    private final Cursor  cursor;
-    private final boolean leftIsRecent;
-
-    private boolean active;
-    private int     autoPlayPosition;
-
-    CursorPagerAdapter(@NonNull FragmentManager fragmentManager,
-                       @NonNull Context context,
-                       @NonNull Cursor cursor,
-                       int autoPlayPosition,
-                       boolean leftIsRecent)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.context          = context.getApplicationContext();
-      this.cursor           = cursor;
-      this.autoPlayPosition = autoPlayPosition;
-      this.leftIsRecent     = leftIsRecent;
-    }
-
-    public void setActive(boolean active) {
-      this.active = active;
-      notifyDataSetChanged();
-    }
-
-    @Override
-    public int getCount() {
-      if (!active) return 0;
-      else         return cursor.getCount();
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      boolean autoPlay = autoPlayPosition == position;
-      int cursorPosition = getCursorPosition(position);
-
-      autoPlayPosition = -1;
-
-      cursor.moveToPosition(cursorPosition);
-
-      MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(context, cursor);
-      DatabaseAttachment        attachment  = Objects.requireNonNull(mediaRecord.getAttachment());
-      MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
-
-      mediaFragments.put(position, fragment);
-
-      return fragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      MediaPreviewFragment removed = mediaFragments.remove(position);
-
-      if (removed != null) {
-        removed.cleanUp();
-      }
-
-      super.destroyItem(container, position, object);
-    }
-
-    public MediaItem getMediaItemFor(int position) {
-      cursor.moveToPosition(getCursorPosition(position));
-
-      MediaRecord        mediaRecord       = MediaRecord.from(context, cursor);
-      DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
-      RecipientId        recipientId       = mediaRecord.getRecipientId();
-      RecipientId        threadRecipientId = mediaRecord.getThreadRecipientId();
-
-      return new MediaItem(Recipient.live(recipientId).get(),
-                           Recipient.live(threadRecipientId).get(),
-                           attachment,
-                           Objects.requireNonNull(attachment.getUri()),
-                           mediaRecord.getContentType(),
-                           mediaRecord.getDate(),
-                           mediaRecord.isOutgoing());
-    }
-
-    @Override
-    public void pause(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) mediaView.pause();
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) return mediaView.getPlaybackControls();
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaFragments.containsKey(position);
-    }
-
-    @Override
-    public void checkMedia(int position) {
-      MediaPreviewFragment fragment = mediaFragments.get(position);
-      if (fragment != null) {
-        fragment.checkMediaStillAvailable();
-      }
-    }
-
-    private int getCursorPosition(int position) {
-      if (leftIsRecent) return position;
-      else              return cursor.getCount() - 1 - position;
-    }
-  }
-
-  private static class MediaItem {
-    private final @Nullable Recipient          recipient;
-    private final @Nullable Recipient          threadRecipient;
-    private final @Nullable DatabaseAttachment attachment;
-    private final @NonNull  Uri                uri;
-    private final @NonNull  String             type;
-    private final           long               date;
-    private final           boolean            outgoing;
-
-    private MediaItem(@Nullable Recipient recipient,
-                      @Nullable Recipient threadRecipient,
-                      @Nullable DatabaseAttachment attachment,
-                      @NonNull Uri uri,
-                      @NonNull String type,
-                      long date,
-                      boolean outgoing)
-    {
-      this.recipient       = recipient;
-      this.threadRecipient = threadRecipient;
-      this.attachment      = attachment;
-      this.uri             = uri;
-      this.type            = type;
-      this.date            = date;
-      this.outgoing        = outgoing;
-    }
-  }
-
-  interface MediaItemAdapter {
-    MediaItem getMediaItemFor(int position);
-    void pause(int position);
-    @Nullable View getPlaybackControls(int position);
-    boolean hasFragmentFor(int position);
-    void checkMedia(int currentItem);
-  }
-}

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

@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2015 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-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;
-
-/**
- * Activity container for starting a new conversation.
- *
- * @author Moxie Marlinspike
- *
- */
-public class NewConversationActivity extends ContactSelectionActivity
-                                    implements ContactSelectionListFragment.ListCallback
-{
-
-  @SuppressWarnings("unused")
-  private static final String TAG = NewConversationActivity.class.getSimpleName();
-
-  @Override
-  public void onCreate(Bundle bundle, boolean ready) {
-    super.onCreate(bundle, ready);
-    assert getSupportActionBar() != null;
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-  }
-
-  @Override
-  public boolean onBeforeContactSelected(Optional<RecipientId> recipientId, String number) {
-    if (recipientId.isPresent()) {
-      launch(Recipient.resolved(recipientId.get()));
-    } else {
-      Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
-
-      if (TextSecurePreferences.isPushRegistered(this) && NetworkConstraint.isMet(this)) {
-        Log.i(TAG, "[onContactSelected] Doing contact refresh.");
-
-        AlertDialog progress = SimpleProgressDialog.show(this);
-
-        SimpleTask.run(getLifecycle(), () -> {
-          Recipient resolved = Recipient.external(this, number);
-
-          if (!resolved.isRegistered() || !resolved.hasUuid()) {
-            Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.");
-            try {
-              DirectoryHelper.refreshDirectoryFor(this, resolved, false);
-              resolved = Recipient.resolved(resolved.getId());
-            } catch (IOException e) {
-              Log.w(TAG, "[onContactSelected] Failed to refresh directory for new contact.");
-            }
-          }
-
-          return resolved;
-        }, resolved -> {
-          progress.dismiss();
-          launch(resolved);
-        });
-      } else {
-        launch(Recipient.external(this, number));
-      }
-    }
-
-    return true;
-  }
-
-  private void launch(Recipient recipient) {
-    Intent intent = new Intent(this, ConversationActivity.class);
-    intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());
-    intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
-    intent.setDataAndType(getIntent().getData(), getIntent().getType());
-
-    long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
-
-    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
-    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
-    startActivity(intent);
-    finish();
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-
-    switch (item.getItemId()) {
-    case android.R.id.home:   super.onBackPressed(); return true;
-    case R.id.menu_refresh:   handleManualRefresh(); return true;
-    case R.id.menu_new_group: handleCreateGroup();   return true;
-    case R.id.menu_invite:    handleInvite();        return true;
-    }
-
-    return false;
-  }
-
-  private void handleManualRefresh() {
-    contactsFragment.setRefreshing(true);
-    onRefresh();
-  }
-
-  private void handleCreateGroup() {
-    startActivity(CreateGroupActivity.newIntent(this));
-  }
-
-  private void handleInvite() {
-    startActivity(new Intent(this, InviteActivity.class));
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    menu.clear();
-    getMenuInflater().inflate(R.menu.new_conversation_activity, menu);
-
-    super.onCreateOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public void onInvite() {
-    handleInvite();
-    finish();
-  }
-
-  @Override
-  public void onNewGroup(boolean forceV1) {
-    handleCreateGroup();
-    finish();
-  }
-}

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

@@ -1,251 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
-import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.pin.PinRestoreActivity;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
-import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
-import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-import java.util.Locale;
-
-public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
-
-  public static final String LOCALE_EXTRA      = "locale_extra";
-  public static final String 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_WELCOME_PUSH_SCREEN = 4;
-  private static final int STATE_ENTER_SIGNAL_PIN    = 5;
-  private static final int STATE_CREATE_PROFILE_NAME = 6;
-  private static final int STATE_CREATE_SIGNAL_PIN   = 7;
-
-  private SignalServiceNetworkAccess networkAccess;
-  private BroadcastReceiver          clearKeyReceiver;
-
-  @Override
-  protected final void onCreate(Bundle savedInstanceState) {
-    this.networkAccess = new SignalServiceNetworkAccess(this);
-    onPreCreate();
-
-    final boolean locked = KeyCachingService.isLocked(this);
-    routeApplicationState(locked);
-
-    super.onCreate(savedInstanceState);
-
-    if (!isFinishing()) {
-      initializeClearKeyReceiver();
-      onCreate(savedInstanceState, true);
-    }
-  }
-
-  protected void onPreCreate() {}
-  protected void onCreate(Bundle savedInstanceState, boolean ready) {}
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-
-    if (networkAccess.isCensored(this)) {
-      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
-    }
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    removeClearKeyReceiver(this);
-  }
-
-  @Override
-  public void onMasterSecretCleared() {
-    Log.d(TAG, "onMasterSecretCleared()");
-    if (ApplicationContext.getInstance(this).isAppVisible()) routeApplicationState(true);
-    else                                                     finish();
-  }
-
-  protected <T extends Fragment> T initFragment(@IdRes int target,
-                                                @NonNull T fragment)
-  {
-    return initFragment(target, fragment, null);
-  }
-
-  protected <T extends Fragment> T initFragment(@IdRes int target,
-                                                @NonNull T fragment,
-                                                @Nullable Locale locale)
-  {
-    return initFragment(target, fragment, locale, null);
-  }
-
-  protected <T extends Fragment> T initFragment(@IdRes int target,
-                                                @NonNull T fragment,
-                                                @Nullable Locale locale,
-                                                @Nullable Bundle extras)
-  {
-    Bundle args = new Bundle();
-    args.putSerializable(LOCALE_EXTRA, locale);
-
-    if (extras != null) {
-      args.putAll(extras);
-    }
-
-    fragment.setArguments(args);
-    getSupportFragmentManager().beginTransaction()
-                               .replace(target, fragment)
-                               .commitAllowingStateLoss();
-    return fragment;
-  }
-
-  private void routeApplicationState(boolean locked) {
-    Intent intent = getIntentForState(getApplicationState(locked));
-    if (intent != null) {
-      startActivity(intent);
-      finish();
-    }
-  }
-
-  private Intent getIntentForState(int state) {
-    Log.d(TAG, "routeApplicationState(), state: " + state);
-
-    switch (state) {
-      case STATE_CREATE_PASSPHRASE:   return getCreatePassphraseIntent();
-      case STATE_PROMPT_PASSPHRASE:   return getPromptPassphraseIntent();
-      case STATE_UI_BLOCKING_UPGRADE: return getUiBlockingUpgradeIntent();
-      case STATE_WELCOME_PUSH_SCREEN: return getPushRegistrationIntent();
-      case STATE_ENTER_SIGNAL_PIN:    return getEnterSignalPinIntent();
-      case STATE_CREATE_SIGNAL_PIN:   return getCreateSignalPinIntent();
-      case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
-      default:                        return null;
-    }
-  }
-
-  private int getApplicationState(boolean locked) {
-    if (!MasterSecretUtil.isPassphraseInitialized(this)) {
-      return STATE_CREATE_PASSPHRASE;
-    } else if (locked) {
-      return STATE_PROMPT_PASSPHRASE;
-    } else if (ApplicationMigrations.isUpdate(this) && ApplicationMigrations.isUiBlockingMigrationRunning()) {
-      return STATE_UI_BLOCKING_UPGRADE;
-    } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
-      return STATE_WELCOME_PUSH_SCREEN;
-    } else if (SignalStore.storageServiceValues().needsAccountRestore()) {
-      return STATE_ENTER_SIGNAL_PIN;
-    } else if (userMustSetProfileName()) {
-      return STATE_CREATE_PROFILE_NAME;
-    } else if (userMustCreateSignalPin()) {
-      return STATE_CREATE_SIGNAL_PIN;
-    } else {
-      return STATE_NORMAL;
-    }
-  }
-
-  private boolean userMustCreateSignalPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed() && !SignalStore.kbsValues().hasOptedOut();
-  }
-
-  private boolean userMustSetProfileName() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
-  }
-
-  private Intent getCreatePassphraseIntent() {
-    return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
-  }
-
-  private Intent getPromptPassphraseIntent() {
-    return getRoutedIntent(PassphrasePromptActivity.class, getIntent());
-  }
-
-  private Intent getUiBlockingUpgradeIntent() {
-    return getRoutedIntent(ApplicationMigrationActivity.class,
-                           TextSecurePreferences.hasPromptedPushRegistration(this)
-                               ? getConversationListIntent()
-                               : getPushRegistrationIntent());
-  }
-
-  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);
-    return intent;
-  }
-
-  private Intent getConversationListIntent() {
-    // TODO [greyson] Navigation
-    return new Intent(this, MainActivity.class);
-  }
-
-  private void initializeClearKeyReceiver() {
-    this.clearKeyReceiver = new BroadcastReceiver() {
-      @Override
-      public void onReceive(Context context, Intent intent) {
-        Log.i(TAG, "onReceive() for clear key event");
-        onMasterSecretCleared();
-      }
-    };
-
-    IntentFilter filter = new IntentFilter(KeyCachingService.CLEAR_KEY_EVENT);
-    registerReceiver(clearKeyReceiver, filter, KeyCachingService.KEY_PERMISSION, null);
-  }
-
-  private void removeClearKeyReceiver(Context context) {
-    if (clearKeyReceiver != null) {
-      context.unregisterReceiver(clearKeyReceiver);
-      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/PlayServicesProblemFragment.java

@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-
-import com.google.android.gms.common.GoogleApiAvailability;
-
-public class PlayServicesProblemFragment extends DialogFragment {
-
-  @Override
-  public @NonNull Dialog onCreateDialog(@Nullable Bundle bundle) {
-    int    code   = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getActivity());
-    Dialog dialog = GoogleApiAvailability.getInstance().getErrorDialog(getActivity(), code, 9111);
-
-    if (dialog == null) {
-      return new AlertDialog.Builder(requireActivity())
-              .setNegativeButton(android.R.string.ok, null)
-              .setMessage(R.string.PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning)
-              .create();
-    } else {
-      return dialog;
-    }
-  }
-
-  @Override
-  public void onCancel(DialogInterface dialog) {
-    super.onCancel(dialog);
-    finish();
-  }
-
-  @Override
-  public void onDismiss(DialogInterface dialog) {
-    super.onDismiss(dialog);
-    finish();
-  }
-
-  private void finish() {
-    Activity activity = getActivity();
-    if (activity != null) activity.finish();
-  }
-  
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.annimon.stream.Stream;
-
-import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Activity container for selecting a list of contacts.
- *
- * @author Moxie Marlinspike
- *
- */
-public class PushContactSelectionActivity extends ContactSelectionActivity {
-
-  public static final String KEY_SELECTED_RECIPIENTS = "recipients";
-
-  @SuppressWarnings("unused")
-  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
-
-  @Override
-  protected void onCreate(Bundle icicle, boolean ready) {
-    getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
-    super.onCreate(icicle, ready);
-
-    initializeToolbar();
-  }
-
-  protected void initializeToolbar() {
-    getToolbar().setNavigationIcon(R.drawable.ic_check_24);
-    getToolbar().setNavigationOnClickListener(v -> {
-      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/ShortcutLauncherActivity.java

@@ -1,50 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.TaskStackBuilder;
-import androidx.appcompat.app.AppCompatActivity;
-import android.widget.Toast;
-
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-
-public class ShortcutLauncherActivity extends AppCompatActivity {
-
-  private static final String KEY_RECIPIENT = "recipient_id";
-
-  public static Intent createIntent(@NonNull Context context, @NonNull RecipientId recipientId) {
-    Intent intent = new Intent(context, ShortcutLauncherActivity.class);
-    intent.setAction(Intent.ACTION_MAIN);
-    intent.putExtra(KEY_RECIPIENT, recipientId.serialize());
-
-    return intent;
-  }
-
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    String rawId = getIntent().getStringExtra(KEY_RECIPIENT);
-
-    if (rawId == null) {
-      Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
-      // TODO [greyson] Navigation
-      startActivity(new Intent(this, MainActivity.class));
-      finish();
-      return;
-    }
-
-    Recipient        recipient = Recipient.live(RecipientId.from(rawId)).get();
-    // TODO [greyson] Navigation
-    TaskStackBuilder backStack = TaskStackBuilder.create(this)
-                                                 .addNextIntent(new Intent(this, MainActivity.class));
-
-    CommunicationActions.startConversation(this, recipient, null, backStack);
-    finish();
-  }
-}