Merge branch 'molly-6.40'

mollyim · Nov 16, 2023 · 8ec49f2 · 8ec49f2
2 parents 02fa8ab + f1fba2a
commit 8ec49f2
Show file tree

Hide file tree

Showing 194 changed files with 15,013 additions and 9,939 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,9 +44,9 @@ ext {
     MAPS_API_KEY = getEnv('CI_MAPS_API_KEY') ?: mapsApiKey
 }
 
-def canonicalVersionCode = 1355
-def canonicalVersionName = "6.39.2"
-def mollyRevision = 2
+def canonicalVersionCode = 1361
+def canonicalVersionName = "6.40.4"
+def mollyRevision = 0
 
 def postFixSize = 100
 

diff --git a/...t/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt b/...t/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -902,7 +902,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.edit.EditProfileActivity"
+    <activity android:name=".profiles.edit.CreateProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
@@ -912,7 +912,7 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.manage.ManageProfileActivity"
+    <activity android:name=".profiles.manage.EditProfileActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>