Merge pull request #868 from session-foundation/release/1.21.0

Prepare for release 1.21.0

Author: SessionHero01

.drone.jsonnet

@@ -38,7 +38,7 @@ 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 update',
+          'apt-get update --allow-releaseinfo-change',
           'apt-get install -y ninja-build openjdk-17-jdk',
           'update-java-alternatives -s java-1.17.0-openjdk-amd64',
           './gradlew testPlayDebugUnitTestCoverageReport'
@@ -80,7 +80,7 @@ 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 update',
+          'apt-get update --allow-releaseinfo-change',
           'apt-get install -y ninja-build openjdk-17-jdk',
           'update-java-alternatives -s java-1.17.0-openjdk-amd64',
           './gradlew assemblePlayDebug',

.drone.yml

@@ -0,0 +1,10 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: test
+  image: mingc/android-build-box:1.24.0
+  commands:
+  - bash ./gradlew test

.gitignore

@@ -2,6 +2,7 @@
 project.properties
 .project
 .settings
+.kotlin
 bin/
 gen/
 .idea/

README.md

@@ -22,43 +22,45 @@ Build instructions can be found in [BUILDING.md](BUILDING.md).
 
 ## Translations
 
-Want to help us translate Session into your language? You can do so at https://crowdin.com/project/session-android!
+Want to help us translate Session into your language? You can do so at https://getsession.org/translate
 
 ## Verifying signatures
 
 **Step 1:**
 
+Add Jason's GPG key. Jason Rhinelander, a member of the [Session Technology Foundation](https://session.foundation/) and is the current signer for all Session Android releases. His GPG key can be found on his GitHub and other sources.
+
 ```
 wget https://github.com/jagerman.gpg
 gpg --import jagerman.gpg
 ```
 
 **Step 2:**
 
-Get the signed hash for this release. `SESSION_VERSION` needs to be updated for the release you want to verify.
+Get the signed hashes for this release. `SESSION_VERSION` needs to be updated for the release you want to verify.
 
 ```
-export SESSION_VERSION=1.10.4
-wget https://github.com/session-foundation/session-android/releases/download/$SESSION_VERSION/signatures.asc
+export SESSION_VERSION=1.20.8
+wget https://github.com/session-foundation/session-android/releases/download/$SESSION_VERSION/signature.asc
 ```
 
 **Step 3:**
 
 Verify the signature of the hashes of the files.
 
 ```
-gpg --verify signatures.asc 2>&1 |grep "Good signature from"
+gpg --verify signature.asc 2>&1 |grep "Good signature from"
 ```
 
-The command above should print "`Good signature from "Kee Jefferys...`". If it does, the hashes are valid but we still have to make the sure the signed hashes matches the downloaded files.
+The command above should print "`Good signature from "Jason Rhinelander...`". If it does, the hashes are valid but we still have to make the sure the signed hashes match the downloaded files.
 
 **Step 4:**
 
-Make sure the two commands below returns the same hash. If they do, files are valid.
+Make sure the two commands below return the same hash for the file you are checking. If they do, file is valid.
 
 ```
 sha256sum session-$SESSION_VERSION-universal.apk
-grep universal.apk signatures.asc
+grep universal.apk signature.asc
 ```
 
 ## License
@@ -67,10 +69,17 @@ Copyright 2011 Whisper Systems
 
 Copyright 2013-2017 Open Whisper Systems
 
-Copyright 2019-2021 The Oxen Project
+Copyright 2019-2024 The Oxen Project
+
+Copyright 2024-2025 Session Technology Foundation
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 
+## Attributions
+
+This project uses [Lucide Icon Font](https://lucide.dev/), which is licensed under the
+[ISC License](third_party_licenses/LucideLicense.txt).
+
 ## Socials
 <a href="https://twitter.com/session_app">
   <img align="left" width="26px" src="https://www.vectorlogo.zone/logos/twitter/twitter-official.svg" />

app/build.gradle

@@ -1,20 +1,22 @@
 plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization'
+    id 'org.jetbrains.kotlin.plugin.compose'
     id 'com.google.devtools.ksp'
     id 'com.google.dagger.hilt.android'
+    id 'kotlin-parcelize'
+    id 'kotlinx-serialization'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 apply plugin: 'witness'
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlinx-serialization'
 
-configurations.forEach {
-    it.exclude module: "commons-logging"
+configurations.configureEach {
+    exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 390
-def canonicalVersionName = "1.20.8"
+def canonicalVersionCode = 396
+def canonicalVersionName = "1.21.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -40,12 +42,12 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     packagingOptions {
@@ -54,6 +56,7 @@ android {
         }
     }
 
+
     splits {
         abi {
             enable !project.hasProperty('huawei') // huawei builds do not need the split variants
@@ -64,7 +67,8 @@ android {
     }
 
     buildFeatures {
-        compose true
+        viewBinding true
+        buildConfig true
     }
 
     composeOptions {
@@ -198,11 +202,11 @@ android {
         }
     }
 
-    buildFeatures {
-        viewBinding true
-    }
-
     def huaweiEnabled = project.properties['huawei'] != null
+    lint {
+        abortOnError true
+        baseline file('lint-baseline.xml')
+    }
 
     applicationVariants.configureEach { variant ->
         if (variant.flavorName == 'huawei') {
@@ -261,6 +265,8 @@ dependencies {
     ksp("androidx.hilt:hilt-compiler:$jetpackHiltVersion")
     ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion")
     ksp("com.github.bumptech.glide:ksp:$glideVersion")
+    implementation("androidx.hilt:hilt-navigation-compose:$androidxHiltVersion")
+    implementation("androidx.hilt:hilt-work:$androidxHiltVersion")
 
     implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
@@ -340,7 +346,6 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
     implementation "com.squareup.phrase:phrase:$phraseVersion"
     implementation 'app.cash.copper:copper-flow:1.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
     implementation "nl.komponents.kovenant:kovenant-android:$kovenantVersion"
@@ -363,7 +368,6 @@ dependencies {
     androidTestImplementation('com.adevinta.android:barista:4.2.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
-
     // AndroidJUnitRunner and JUnit Rules
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
@@ -382,6 +386,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1'
     androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.5.1'
     androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.3"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.3"
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
 
     testImplementation 'org.robolectric:robolectric:4.12.2'
@@ -405,6 +411,11 @@ dependencies {
     androidTestImplementation "androidx.compose.ui:ui-test-junit4-android"
     debugImplementation "androidx.compose.ui:ui-test-manifest"
 
+    // Navigation
+    implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
+    implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
+    implementation "androidx.navigation:navigation-compose:$navVersion"
+
     implementation "com.google.accompanist:accompanist-themeadapter-appcompat:0.33.1-alpha"
     implementation "com.google.accompanist:accompanist-permissions:0.36.0"
     implementation "com.google.accompanist:accompanist-drawablepainter:0.33.1-alpha"

app/src/androidTest/AndroidManifest.xml

@@ -3,5 +3,8 @@
     <application>
         <uses-library android:name="android.test.runner"
             android:required="false" />
+
+        <activity android:name="androidx.activity.ComponentActivity"/>
+
     </application>
 </manifest>