Merge pull request #1 from session-foundation/release/1.20.3

Release/1.20.3

Author: ThomasSession

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,9 +6,9 @@ body:
 - type: checkboxes
   attributes:
     label: Code of conduct
-    description: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-android/blob/master/CODE_OF_CONDUCT.md).
+    description: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-android/blob/master/CODE_OF_CONDUCT.md).
     options:
-    - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-android/blob/master/CODE_OF_CONDUCT.md)
+    - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-android/blob/master/CODE_OF_CONDUCT.md)
       required: true
 
 - type: checkboxes

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libsession-util/libsession-util"]
 	path = libsession-util/libsession-util
-	url = https://github.com/oxen-io/libsession-util.git
+	url = https://github.com/session-foundation/libsession-util.git

BUILDING.md

@@ -28,7 +28,7 @@ Setting up a development environment and building from Android Studio
 
 1. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
 2. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-3. Paste the URL for the session-android project when prompted (https://github.com/oxen-io/session-android.git).
+3. Paste the URL for the session-android project when prompted (https://github.com/session-foundation/session-android.git).
 4. Android Studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 5. Default config options should be good enough.
 6. Project initialization and building should proceed.

README.md

@@ -4,7 +4,7 @@
 
 Add the [F-Droid repo](https://fdroid.getsession.org/)
 
-[Download the APK from here](https://github.com/oxen-io/session-android/releases/latest)
+[Download the APK from here](https://github.com/session-foundation/session-android/releases/latest)
 
 ## Summary
 
@@ -14,7 +14,7 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about
 
 ## Want to contribute? Found a bug or have a feature request?
 
-Please search for any [existing issues](https://github.com/oxen-io/session-android/issues) that describe your bugs in order to avoid duplicate submissions. Submissions can be made by making a pull request to our `dev` branch. If you don't know where to start contributing, try reading the Github issues page for ideas.
+Please search for any [existing issues](https://github.com/session-foundation/session-android/issues) that describe your bugs in order to avoid duplicate submissions. Submissions can be made by making a pull request to our `dev` branch. If you don't know where to start contributing, try reading the Github issues page for ideas.
 
 ## Build instructions
 
@@ -29,8 +29,8 @@ Want to help us translate Session into your language? You can do so at https://c
 **Step 1:**
 
 ```
-wget https://raw.githubusercontent.com/oxen-io/oxen-core/master/utils/gpg_keys/KeeJef.asc
-gpg --import KeeJef.asc
+wget https://github.com/jagerman.gpg
+gpg --import jagerman.gpg
 ```
 
 **Step 2:**
@@ -39,7 +39,7 @@ Get the signed hash for this release. `SESSION_VERSION` needs to be updated for
 
 ```
 export SESSION_VERSION=1.10.4
-wget https://github.com/oxen-io/session-android/releases/download/$SESSION_VERSION/signatures.asc
+wget https://github.com/session-foundation/session-android/releases/download/$SESSION_VERSION/signatures.asc
 ```
 
 **Step 3:**

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
     it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 384
-def canonicalVersionName = "1.20.2"
+def canonicalVersionCode = 385
+def canonicalVersionName = "1.20.3"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -105,6 +105,13 @@ android {
         String sharedTestDir = 'src/sharedTest/java'
         test.java.srcDirs += sharedTestDir
         androidTest.java.srcDirs += sharedTestDir
+        main {
+            assets.srcDirs += "$buildDir/generated/binary"
+        }
+        test {
+            resources.srcDirs += "$buildDir/generated/binary"
+            resources.srcDirs += "$projectDir/src/main/assets"
+        }
     }
 
     buildTypes {
@@ -163,7 +170,7 @@ android {
 
         website {
             dimension "distribution"
-            ext.websiteUpdateUrl = "https://github.com/oxen-io/session-android/releases"
+            ext.websiteUpdateUrl = "https://github.com/session-foundation/session-android/releases"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
             buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
@@ -242,6 +249,12 @@ android {
     }
 }
 
+apply {
+    from("ipToCode.gradle.kts")
+}
+
+preBuild.dependsOn ipToCode
+
 dependencies {
     implementation project(':content-descriptions')
 
@@ -268,9 +281,9 @@ dependencies {
     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.activity:activity-ktx:1.9.2'
+    implementation 'androidx.activity:activity-compose:1.9.2'
+    implementation 'androidx.fragment:fragment-ktx:1.8.4'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
 
@@ -319,7 +332,7 @@ dependencies {
     implementation project(":libsession")
     implementation project(":libsession-util")
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion"
-    implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version"
+    implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
     implementation project(":liblazysodium")
     implementation "net.java.dev.jna:jna:5.12.1@aar"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"

app/src/main/assets/csv/geolite2_country_blocks_ipv4.csv renamed to app/geolite2_country_blocks_ipv4.csv

@@ -0,0 +1,41 @@
+import java.io.File
+import java.io.DataOutputStream
+import java.io.FileOutputStream
+
+task("ipToCode") {
+    val inputFile = File("${projectDir}/geolite2_country_blocks_ipv4.csv")
+
+    val outputDir = "${buildDir}/generated/binary"
+    val outputFile = File(outputDir, "geolite2_country_blocks_ipv4.bin").apply { parentFile.mkdirs() }
+
+    outputs.file(outputFile)
+
+    doLast {
+
+        // Ensure the input file exists
+        if (!inputFile.exists()) {
+            throw IllegalArgumentException("Input file does not exist: ${inputFile.absolutePath}")
+        }
+
+        // Create a DataOutputStream to write binary data
+        DataOutputStream(FileOutputStream(outputFile)).use { out ->
+            inputFile.useLines { lines ->
+                var prevCode = -1
+                lines.drop(1).forEach { line ->
+                    runCatching {
+                        val ints = line.split(".", "/", ",")
+                        val code = ints[5].toInt().also { if (it == prevCode) return@forEach }
+                        val ip = ints.take(4).fold(0) { acc, s -> acc shl 8 or s.toInt() }
+
+                        out.writeInt(ip)
+                        out.writeInt(code)
+
+                        prevCode = code
+                    }
+                }
+            }
+        }
+
+        println("Processed data written to: ${outputFile.absolutePath}")
+    }
+}

app/ipToCode.gradle.kts

@@ -54,8 +54,8 @@
 			"channel_id":""
 		},
 		"edukit":{
-			"edu_url":"edukit.edu.cloud.huawei.com.cn",
-			"dh_url":"edukit.edu.cloud.huawei.com.cn"
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
 		},
 		"search":{
 			"url":"https://search-dre.cloud.huawei.com"

app/src/huawei/agconnect-services.json

@@ -20,8 +20,8 @@ class HuaweiPushService: HmsMessageService() {
 
     override fun onMessageReceived(message: RemoteMessage?) {
         Log.d(TAG, "onMessageReceived")
-        message?.dataOfMap?.takeIf { it.isNotEmpty() }?.let(pushReceiver::onPush) ?:
-        pushReceiver.onPush(message?.data?.let(Base64::decode))
+        message?.dataOfMap?.takeIf { it.isNotEmpty() }?.let(pushReceiver::onPushDataReceived) ?:
+        pushReceiver.onPushDataReceived(message?.data?.let(Base64::decode))
     }
 
     override fun onNewToken(token: String?) {

app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushService.kt

@@ -24,6 +24,8 @@ class HuaweiTokenFetcher @Inject constructor(
     override suspend fun fetch(): String? = HmsInstanceId.getInstance(context).run {
         // https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/push-basic-capability#h2-1576218800370
         // getToken may return an empty string, if so HuaweiPushService#onNewToken will be called.
-        withContext(Dispatchers.IO) { getToken(APP_ID, TOKEN_SCOPE) }
+        withContext(Dispatchers.IO) {
+            getToken(APP_ID, TOKEN_SCOPE)
+        }
     }
 }