Merge branch 'molly-7.22'

mollyim · Nov 4, 2024 · 8d84f97 · 8d84f97
2 parents 64e5065 + 64fb5a0
commit 8d84f97
Show file tree

Hide file tree

Showing 220 changed files with 7,001 additions and 3,980 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ apply {
   from("fix-profm.gradle")
 }
 
-val canonicalVersionCode = 1476
-val canonicalVersionName = "7.21.5"
+val canonicalVersionCode = 1479
+val canonicalVersionName = "7.22.2"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100
 val mollyRevision = 2

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJobTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
     <uses-feature android:name="android.hardware.telephony" android:required="false" />
 
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
     <uses-permission android:name="${applicationId}.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -76,7 +75,10 @@
 
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
 
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"
+        tools:ignore="ExactAlarm" />
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
@@ -835,12 +837,6 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
-     <activity android:name=".DeviceActivity"
-               android:screenOrientation="portrait"
-               android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-               android:exported="false"/>
-
     <activity android:name=".logsubmit.SubmitDebugLogActivity"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -893,7 +889,7 @@
         </intent-filter>
     </activity>
 
-    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
+    <activity android:name=".webrtc.VoiceCallShare"
         android:exported="true"
         android:excludeFromRecents="true"
         android:permission="android.permission.CALL_PHONE"
@@ -1240,7 +1236,6 @@
     <receiver android:name=".service.BootReceiver" android:exported="false">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
-            <action android:name="org.thoughtcrime.securesms.RESTART"/>
         </intent-filter>
     </receiver>
 
@@ -1283,11 +1278,7 @@
 
     <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver" android:exported="false" />
 
-    <receiver android:name=".service.PersistentConnectionBootListener" android:exported="false">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </intent-filter>
-    </receiver>
+    <!-- MOLLY: Duplicates functionality of existing BootReceiver -->
 
     <receiver android:name=".notifications.LocaleChangedReceiver" android:exported="false">
         <intent-filter>

diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
@@ -3,7 +3,6 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -273,19 +272,6 @@ public void applyOverrideConfiguration(@NonNull Configuration overrideConfigurat
     super.applyOverrideConfiguration(overrideConfiguration);
   }
 
-  // MOLLY: Workaround for WebView crashes in devices API 21-25 with outdated WebView
-  // https://issuetracker.google.com/issues/141351441
-  // Not reproducible in Signal because RegistrationNavigationActivity does not inherit
-  // this class and thus does not override the configuration.
-  @Override
-  public AssetManager getAssets() {
-    if (Build.VERSION.SDK_INT <= 25) {
-      return getResources().getAssets();  // Ignore overridden configuration
-    } else {
-      return super.getAssets();
-    }
-  }
-
   private void logEvent(@NonNull String event) {
     Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
   }