Release/1.20.0

.drone.jsonnet

@@ -38,7 +38,9 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
  pull: 'always',
  environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
  commands: [
- 'apt-get install -y ninja-build',
+ 'apt-get update',
+ 'apt-get install -y ninja-build openjdk-17-jdk',
+ 'update-java-alternatives -s java-1.17.0-openjdk-amd64',
  './gradlew testPlayDebugUnitTestCoverageReport'
  ],
  }
@@ -78,7 +80,9 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
  pull: 'always',
  environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
  commands: [
- 'apt-get install -y ninja-build',
+ 'apt-get update',
+ 'apt-get install -y ninja-build openjdk-17-jdk',
+ 'update-java-alternatives -s java-1.17.0-openjdk-amd64',
  './gradlew assemblePlayDebug',
  './scripts/drone-static-upload.sh'
  ],

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
  it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 380
-def canonicalVersionName = "1.19.2"
+def canonicalVersionCode = 382
+def canonicalVersionName = "1.20.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -88,7 +88,6 @@ android {
  buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
  buildConfigField "int", "CONTENT_PROXY_PORT", "443"
  buildConfigField "String", "USER_AGENT", "\"OWA\""
- buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
  buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
  resourceConfigurations += []
 
@@ -221,11 +220,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"
@@ -241,19 +242,23 @@ dependencies {
  implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
  implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
  implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"
  implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
  implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
  implementation 'androidx.activity:activity-ktx:1.5.1'
  implementation 'androidx.activity:activity-compose:1.5.1'
  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'
@@ -267,7 +272,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'
@@ -305,7 +309,6 @@ dependencies {
  implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
  implementation "nl.komponents.kovenant:kovenant-android:$kovenantVersion"
  implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0"
- implementation "com.github.tbruyelle:rxpermissions:0.10.2"
  implementation "com.github.ybq:Android-SpinKit:1.4.0"
  implementation "com.opencsv:opencsv:4.6"
  testImplementation "junit:junit:$junitVersion"
@@ -361,7 +364,7 @@ dependencies {
  debugImplementation "androidx.compose.ui:ui-test-manifest:$composeVersion"
 
  implementation "com.google.accompanist:accompanist-themeadapter-appcompat:0.33.1-alpha"
- implementation "com.google.accompanist:accompanist-permissions:0.33.1-alpha"
+ implementation "com.google.accompanist:accompanist-permissions:0.36.0"
  implementation "com.google.accompanist:accompanist-drawablepainter:0.33.1-alpha"
 
  implementation "androidx.camera:camera-camera2:1.3.2"

app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt

@@ -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 {
  }
  }
  }
-
 }

app/src/main/AndroidManifest.xml

@@ -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,16 @@
  <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"
+ android:theme="@style/Theme.Session.DayNight.NoActionBar" />
  <activity
  android:name="org.thoughtcrime.securesms.home.PathActivity"
  android:screenOrientation="portrait" />
@@ -147,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"
@@ -161,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"
@@ -171,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"/>
@@ -264,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"