Merge pull request #1060 from session-foundation/release/1.22.0

Release/1.22.0

Author: SessionHero01

.github/workflows/build_and_test.yml

@@ -0,0 +1,63 @@
+name: Build and test
+
+on:
+  push:
+    branches: [ "dev", "master" ]
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false # Continue with other matrix items if one fails
+      matrix:
+        variant: [ 'play', 'website', 'huawei' ]
+        build_type: [ 'debug' ]
+        include:
+          - variant: 'huawei'
+            extra_build_command_options: '-Phuawei=1'
+    steps:
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            .gradle
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Build and test with Gradle
+        id: build
+        run: ./gradlew assemble${{ matrix.variant }}${{ matrix.build_type }} test${{ matrix.variant }}${{ matrix.build_type }}UnitTest  ${{ matrix.extra_build_command_options }}
+
+      - name: Upload build reports regardless
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-reports-${{ matrix.variant }}-${{ matrix.build_type }}
+          path: app/build/reports
+          if-no-files-found: ignore
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: session-${{ matrix.variant }}-${{ matrix.build_type }}
+          path: app/build/outputs/apk/${{ matrix.variant }}/${{ matrix.build_type }}/*-universal*apk
+          if-no-files-found: error
+          compression-level: 0

README.md

@@ -63,6 +63,11 @@ sha256sum session-$SESSION_VERSION-universal.apk
 grep universal.apk signature.asc
 ```
 
+## Testing
+### BrowserStack
+
+This project is tested with BrowserStack.
+
 ## License
 
 Copyright 2011 Whisper Systems

app/build.gradle

@@ -15,8 +15,8 @@ configurations.configureEach {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 401
-def canonicalVersionName = "1.21.3"
+def canonicalVersionCode = 402
+def canonicalVersionName = "1.22.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -37,7 +37,6 @@ def getGitHash = { ->
 }
 
 android {
-    compileSdkVersion androidCompileSdkVersion
     namespace 'network.loki.messenger'
     useLibrary 'org.apache.http.legacy'
 
@@ -79,6 +78,7 @@ android {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
 
+        compileSdk androidCompileSdkVersion
         minSdkVersion androidMinimumSdkVersion
         targetSdkVersion androidTargetSdkVersion
 
@@ -270,7 +270,7 @@ dependencies {
 
     implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "com.google.android.material:material:$materialVersion"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@@ -425,6 +425,9 @@ dependencies {
 
     // Note: ZXing 3.5.3 is the latest stable release as of 2024/08/21
     implementation "com.google.zxing:core:$zxingVersion"
+
+    // Note: 1.1.0 is the latest stable release as of 2024/12/18
+    implementation "androidx.biometric:biometric:1.1.0"
 }
 
 static def getLastCommitTimestamp() {

app/src/main/AndroidManifest.xml

@@ -31,24 +31,19 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" tools:node="remove" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <!-- Google may (potentially) insist we implement `ConnectionService` to request MANAGE_OWN_CALLS - see:
-           - https://developer.android.com/reference/android/Manifest.permission#MANAGE_OWN_CALLS
-           - https://developer.android.com/reference/android/telecom/ConnectionService
-    -->
-    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
-
     <uses-permission android:name="android.app.role.DIALER" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
@@ -77,8 +72,7 @@
         </intent>
     </queries>
 
-    <!-- The allowBackup="false" below is important to guard against potential malicious backups -->
-
+    <!-- Note: The allowBackup="false" below is important to guard against potential malicious backups -->
     <application
         android:name="org.thoughtcrime.securesms.ApplicationContext"
         android:allowBackup="false"
@@ -91,7 +85,6 @@
         tools:replace="android:allowBackup,android:label" >
 
         <!-- Disable all analytics -->
-
         <meta-data
             android:name="firebase_analytics_collection_deactivated"
             android:value="true" />
@@ -268,9 +261,9 @@
             android:launchMode="singleTask"
             android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
+            android:name="org.thoughtcrime.securesms.ScreenLockActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstancePerTask"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.giph.ui.GiphyActivity"
@@ -311,7 +304,7 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:exported="true"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />
-        <activity android:name="org.thoughtcrime.securesms.calls.WebRtcCallActivity"
+        <activity android:name="org.thoughtcrime.securesms.webrtc.WebRtcCallActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:showForAllUsers="true"
@@ -323,11 +316,6 @@
         </activity>
         <activity android:name="org.thoughtcrime.securesms.media.MediaOverviewActivity" />
 
-        <service
-            android:enabled="true"
-            android:name="org.thoughtcrime.securesms.service.WebRtcCallService"
-            android:foregroundServiceType="phoneCall"
-            android:exported="false" />
         <service
             android:name="org.thoughtcrime.securesms.service.KeyCachingService"
             android:enabled="true"
@@ -343,6 +331,11 @@
                 <action android:name="android.service.chooser.ChooserTargetService" />
             </intent-filter>
         </service>
+        <service
+            android:name="org.thoughtcrime.securesms.service.CallForegroundService"
+            android:foregroundServiceType="phoneCall"
+            android:exported="false" />
+
         <receiver
             android:name="org.thoughtcrime.securesms.notifications.MarkReadReceiver"
             android:enabled="true"
@@ -374,6 +367,9 @@
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.service.ExpirationListener" />
+        <receiver android:name="org.thoughtcrime.securesms.webrtc.EndCallReceiver"
+            android:enabled="true"
+            android:exported="false" />
 
         <provider
             android:name="org.thoughtcrime.securesms.providers.PartProvider"