oxen-io
diff --git a/‎app/build.gradle‎
Lines changed: 7 additions & 3 deletions b/‎app/build.gradle‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt‎
Lines changed: 5 additions & 12 deletions b/‎app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt‎
Lines changed: 5 additions & 12 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 8 additions & 16 deletions b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 8 additions & 16 deletions
diff --git a/‎app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt‎
Lines changed: 2 additions & 13 deletions b/‎app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt‎
Lines changed: 2 additions & 13 deletions
diff --git a/‎app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt‎
Lines changed: 3 additions & 3 deletions b/‎app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt‎
Lines changed: 3 additions & 3 deletions
@@ -221,11 +221,13 @@ android {
 }
 
 dependencies {
+    implementation project(':content-descriptions')
 
-    implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
-    ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion")
     ksp("androidx.hilt:hilt-compiler:$jetpackHiltVersion")
+    ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion")
+    ksp("com.github.bumptech.glide:ksp:$glideVersion")
 
+    implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "com.google.android.material:material:$materialVersion"
@@ -249,12 +251,15 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.5.3'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
+
     playImplementation ("com.google.firebase:firebase-messaging:24.0.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'
     }
+
     if (project.hasProperty('huawei')) huaweiImplementation 'com.huawei.hms:push:6.7.0.300'
+
     implementation 'androidx.media3:media3-exoplayer:1.4.0'
     implementation 'androidx.media3:media3-ui:1.4.0'
     implementation 'org.conscrypt:conscrypt-android:2.5.2'
@@ -268,7 +273,6 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
-    ksp "com.github.bumptech.glide:ksp:$glideVersion"
     implementation 'com.makeramen:roundedimageview:2.1.0'
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
 
@@ -2,8 +2,6 @@ package network.loki.messenger
 
 import android.Manifest
 import android.app.Instrumentation
-import android.content.ClipboardManager
-import android.content.Context
 import android.view.View
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
@@ -16,15 +14,14 @@ import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withSubstring
-import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import com.adevinta.android.barista.interaction.PermissionGranter
+import com.bumptech.glide.Glide
 import network.loki.messenger.util.InputBarButtonDrawableMatcher.Companion.inputButtonWithDrawable
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
@@ -36,11 +33,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBar
 import org.thoughtcrime.securesms.home.HomeActivity
-import com.bumptech.glide.Glide
 
 /**
  * Currently not used as part of our CI/Deployment processes !!!!
@@ -62,7 +57,6 @@ class HomeActivityTests {
     @Before
     fun setUp() {
         InstrumentationRegistry.getInstrumentation().addMonitor(activityMonitor)
-
     }
 
     @After
@@ -96,10 +90,10 @@ class HomeActivityTests {
         device.pressKeyCode(67)
 
         // Continue with display name
-        objectFromDesc(R.string.continue_2).click()
+        objectFromDesc(R.string.theContinue).click()
 
         // Continue with default push notification setting
-        objectFromDesc(R.string.continue_2).click()
+        objectFromDesc(R.string.theContinue).click()
 
         // PN select
         if (hasViewedSeed) {
@@ -110,7 +104,6 @@ class HomeActivityTests {
         PermissionGranter.allowPermissionsIfNeeded(Manifest.permission.POST_NOTIFICATIONS)
     }
 
-
 /*    private fun goToMyChat() {
         onView(withId(R.id.newConversationButton)).perform(ViewActions.click())
         onView(withId(R.id.createPrivateChatButton)).perform(ViewActions.click())
@@ -131,7 +124,7 @@ class HomeActivityTests {
     @Test
     fun testLaunches_dismiss_seedView() {
         setupLoggedInState()
-        objectFromDesc(R.string.continue_2).click()
+        objectFromDesc(R.string.theContinue).click()
         objectFromDesc(R.string.copy).click()
         pressBack()
         onView(withId(R.id.seedReminderView)).check(matches(not(isDisplayed())))
@@ -182,6 +175,7 @@ class HomeActivityTests {
         onView(withText(dialogPromptText)).check(matches(isDisplayed()))
     }*/
 
+
     /**
      * Perform action of waiting for a specific time.
      */
@@ -198,5 +192,4 @@ class HomeActivityTests {
             }
         }
     }
-
 }
@@ -37,7 +37,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
     <uses-permission android:name="network.loki.messenger.ACCESS_SESSION_SECRETS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Only used on Android API 29 and lower -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
@@ -79,7 +79,7 @@
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:supportsRtl="true"
         android:theme="@style/Theme.Session.DayNight"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup,android:label" >
 
         <!-- Disable all analytics -->
 
@@ -130,12 +130,12 @@
         <activity
             android:name="org.thoughtcrime.securesms.messagerequests.MessageRequestsActivity"
             android:exported="false"
-            android:label="@string/activity_message_requests_title"
+            android:label="@string/sessionMessageRequests"
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.SettingsActivity"
             android:screenOrientation="portrait"
-            android:label="@string/activity_settings_title" />
+            android:label="@string/sessionSettings" />
         <activity
             android:name="org.thoughtcrime.securesms.debugmenu.DebugActivity"
             android:screenOrientation="portrait"
@@ -151,11 +151,11 @@
             android:name="org.thoughtcrime.securesms.preferences.BlockedContactsActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar"
-            android:label="@string/blocked_contacts_title"
+            android:label="@string/conversationsBlockedContacts"
             />
         <activity
             android:name="org.thoughtcrime.securesms.groups.EditClosedGroupActivity"
-            android:label="@string/activity_edit_closed_group_title"
+            android:label="@string/groupEdit"
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity"
@@ -165,7 +165,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.PrivacySettingsActivity"
-            android:label="@string/activity_privacy_settings_title"
+            android:label="@string/sessionPrivacy"
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.NotificationSettingsActivity"
@@ -175,7 +175,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.HelpSettingsActivity"
-            android:label="@string/activity_help_settings_title"
+            android:label="@string/sessionHelp"
             android:screenOrientation="portrait" />
         <activity android:name="org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity"
             android:screenOrientation="portrait"/>
@@ -268,18 +268,10 @@
         <activity
             android:name="org.thoughtcrime.securesms.MediaPreviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:label="@string/AndroidManifest__media_preview"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="org.thoughtcrime.securesms.MediaOverviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.DummyActivity"
             android:allowTaskReparenting="true"
 
@@ -8,19 +8,8 @@ class DeleteMediaDialog {
         @JvmStatic
         fun show(context: Context, recordCount: Int, doDelete: Runnable) = context.showSessionDialog {
             iconAttribute(R.attr.dialog_alert_icon)
-            title(
-                context.resources.getQuantityString(
-                    R.plurals.MediaOverviewActivity_Media_delete_confirm_title,
-                    recordCount,
-                    recordCount
-                )
-            )
-            text(
-                context.resources.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message,
-                    recordCount,
-                    recordCount
-                )
-            )
+            title(context.resources.getQuantityString(R.plurals.deleteMessage, recordCount, recordCount))
+            text(context.resources.getString(R.string.deleteMessageDescriptionEveryone))
             button(R.string.delete) { doDelete.run() }
             cancelButton()
         }
 
@@ -9,9 +9,9 @@ class DeleteMediaPreviewDialog {
         fun show(context: Context, doDelete: Runnable) {
             context.showSessionDialog {
                 iconAttribute(R.attr.dialog_alert_icon)
-                title(R.string.MediaPreviewActivity_media_delete_confirmation_title)
-                text(R.string.MediaPreviewActivity_media_delete_confirmation_message)
-                button(R.string.delete) { doDelete.run() }
+                title(context.resources.getQuantityString(R.plurals.deleteMessage, 1, 1))
+                text(R.string.deleteMessageDescriptionEveryone)
+                dangerButton(R.string.delete) { doDelete.run() }
                 cancelButton()
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ class DeleteMediaPreviewDialog {`
`9`	`9`	`fun show(context: Context, doDelete: Runnable) {`
`10`	`10`	`context.showSessionDialog {`
`11`	`11`	`iconAttribute(R.attr.dialog_alert_icon)`
`12`		`- title(R.string.MediaPreviewActivity_media_delete_confirmation_title)`
`13`		`- text(R.string.MediaPreviewActivity_media_delete_confirmation_message)`
`14`		`- button(R.string.delete) { doDelete.run() }`
	`12`	`+ title(context.resources.getQuantityString(R.plurals.deleteMessage, 1, 1))`
	`13`	`+ text(R.string.deleteMessageDescriptionEveryone)`
	`14`	`+ dangerButton(R.string.delete) { doDelete.run() }`
`15`	`15`	`cancelButton()`
`16`	`16`	`}`
`17`	`17`	`}`