Merge branch 'molly-7.12'

mollyim · Aug 1, 2024 · f553552 · f553552
2 parents 9a49ca9 + 39cae68
commit f553552
Show file tree

Hide file tree

Showing 137 changed files with 6,270 additions and 3,680 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ apply {
   from("fix-profm.gradle")
 }
 
-val canonicalVersionCode = 1436
-val canonicalVersionName = "7.11.4"
+val canonicalVersionCode = 1439
+val canonicalVersionName = "7.12.4"
 val mollyRevision = 1
 val currentHotfixVersion = 1
 val maxHotfixVersions = 100
@@ -33,7 +33,6 @@ val selectableVariants = listOf(
   "prodFossStoreRelease",
   "prodGmsWebsiteDebug",
   "prodGmsWebsiteRelease",
-  "prodGmsWebsiteCanary",
   "prodGmsWebsiteInstrumentation",
   "prodGmsWebsiteSpinner",
   "stagingFossWebsiteDebug",
@@ -130,7 +129,7 @@ android {
 
   packagingOptions {
     resources {
-      excludes += setOf("LICENSE.txt", "LICENSE", "NOTICE", "asm-license.txt", "META-INF/LICENSE", "META-INF/LICENSE.md", "META-INF/NOTICE", "META-INF/LICENSE-notice.md", "META-INF/proguard/androidx-annotations.pro", "libsignal_jni.dylib", "signal_jni.dll")
+      excludes += setOf("LICENSE.txt", "LICENSE", "NOTICE", "asm-license.txt", "META-INF/LICENSE", "META-INF/LICENSE.md", "META-INF/NOTICE", "META-INF/LICENSE-notice.md", "META-INF/proguard/androidx-annotations.pro", "libsignal_jni.dylib", "signal_jni.dll", "libsignal_jni_testing.dylib", "signal_jni_testing.dll")
     }
     jniLibs {
       // MOLLY: Compress native libs by default as APK is not split on ABIs
@@ -270,13 +269,6 @@ android {
       isMinifyEnabled = false
       matchingFallbacks += "debug"
     }
-
-    create("canary") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-    }
   }
 
   productFlavors {
@@ -379,6 +371,12 @@ android {
         variant.enable = false
       }
     }
+    onVariants { variant ->
+      // Include the test-only library on debug builds.
+      if (variant.buildType != "debug") {
+        variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
+      }
+    }
   }
 
   val releaseDir = "$projectDir/src/release/java"
@@ -513,8 +511,6 @@ dependencies {
 
   "spinnerImplementation"(project(":spinner"))
 
-  "canaryImplementation"(libs.square.leakcanary)
-
   "instrumentationImplementation"(libs.androidx.fragment.testing) {
     exclude(group = "androidx.test", module = "core")
   }

diff --git a/app/src/canary/AndroidManifest.xml b/app/src/canary/AndroidManifest.xml
diff --git a/app/src/canary/java/org/thoughtcrime/securesms/CanaryApplicationContext.kt b/app/src/canary/java/org/thoughtcrime/securesms/CanaryApplicationContext.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -585,7 +585,7 @@
     <activity android:name=".conversation.v2.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:parentActivityName=".MainActivity"
               android:resizeableActivity="true"
               android:exported="false">