Merge branch 'develop' into feat/2911-joining-user-qss-optin-ui

Author: adrastaea

.github/workflows/mobile-build-apk.yml

@@ -39,10 +39,10 @@ jobs:
           java-version: 17
 
       - name: "Set up NDK"
-        uses: nttld/setup-ndk@8c3b609ff4d54576ea420551943fd34b4d03b0dc # v1.2.0
+        uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
         id: setup-ndk
         with:
-          ndk-version: r25b
+          ndk-version: r28c
           add-to-path: false
 
       - name: "Setup environment"
@@ -81,6 +81,16 @@ jobs:
           name: app-standard-release.apk
           path: ./packages/mobile/android/app/build/outputs/apk/standard/release/app-standard-release.apk
 
+      - name: "Build debug .apk"
+        run: cd ./packages/mobile/android && ENVFILE=../.env.production ./gradlew assembleStandardDebug
+
+      - name: "Upload debug .apk to artifacts"
+        continue-on-error: true
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        with:
+          name: app-standard-debug.apk
+          path: ./packages/mobile/android/app/build/outputs/apk/standard/debug/app-standard-debug.apk
+
       - name: "Get release"
         id: get_release
         uses: bruceadams/[email protected]
@@ -96,6 +106,16 @@ jobs:
           asset_path: ./packages/mobile/android/app/build/outputs/apk/standard/release/app-standard-release.apk
           asset_name: app-standard-release.apk
           asset_content_type: application/.apk
+      
+      - name: "Upload debug release assets"
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./packages/mobile/android/app/build/outputs/apk/standard/debug/app-standard-debug.apk
+          asset_name: app-standard-debug.apk
+          asset_content_type: application/.apk
 
       - name: Send Release Notificaton
         uses: ./.github/actions/release-notifier
@@ -123,10 +143,10 @@ jobs:
           java-version: 17
 
       - name: "Set up NDK"
+        uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
         id: setup-ndk
-        uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r25b
+          ndk-version: r28c
           add-to-path: false
 
       - name: "Setup environment"

.github/workflows/mobile-deploy-android.yml

@@ -37,10 +37,10 @@ jobs:
           java-version: 17
 
       - name: "Set up NDK"
-        uses: nttld/setup-ndk@v1
+        uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
         id: setup-ndk
         with:
-          ndk-version: r25b
+          ndk-version: r28c
           add-to-path: false
 
       - name: "Install Bundletool"

CHANGELOG.md

@@ -19,6 +19,18 @@
 
 * Update QSS flag to QSS_ALLOWED and reconfigure enabled setting/checking [#2912](https://github.com/TryQuiet/quiet/issues/2912)
 
+## [6.2.0]
+
+### Fixes
+
+* Fix newline formatting in messages on mobile
+* Fix issue with keyboard hiding message input on Android
+* Fix issue with message send button not displaying correctly on mobile
+
+### Chores
+
+* Bump Android SDK to 35, NDK to 28.2.13676358, and Gradle plugin to 8.5.1 [see Google Play deadline](https://developer.android.com/google/play/requirements/target-sdk)
+
 ## [6.1.0]
 
 ### Fixes

packages/desktop/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [6.2.0]
+
+### Fixes
+
+* Fix newline formatting in messages on mobile
+* Fix issue with keyboard hiding message input on Android
+* Fix issue with message send button not displaying correctly on mobile
+
+### Chores
+
+* Bump Android SDK to 35, NDK to 28.2.13676358, and Gradle plugin to 8.5.1 [see Google Play deadline](https://developer.android.com/google/play/requirements/target-sdk)
+
 ## [6.1.0]
 
 ### Fixes

packages/desktop/README.md

@@ -11,10 +11,10 @@ Here are the steps:
 
 4. In `quiet/` (project's root) install monorepo's dependencies and bootstrap the project with lerna. It will take care of the package's dependencies/submodules and trigger a prepublish script which builds them.
 
-```
+```bash
 npm i [email protected]
 npm i [email protected]
-npm i -g [email protected] // may be needed depending on configuration
+npm i -g [email protected] # may be needed depending on configuration
 npm install
 npm run pull:submodules
 npm run bootstrap

packages/desktop/package-lock.json

@@ -80,7 +80,7 @@
   },
   "homepage": "https://github.com/TryQuiet",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {

packages/desktop/package.json

@@ -1,5 +1,17 @@
 # Changelog
 
+## [6.2.0]
+
+### Fixes
+
+* Fix newline formatting in messages on mobile
+* Fix issue with keyboard hiding message input on Android
+* Fix issue with message send button not displaying correctly on mobile
+
+### Chores
+
+* Bump Android SDK to 35, NDK to 28.2.13676358, and Gradle plugin to 8.5.1 [see Google Play deadline](https://developer.android.com/google/play/requirements/target-sdk)
+
 ## [6.1.0]
 
 ### Fixes

packages/mobile/CHANGELOG.md

@@ -18,6 +18,17 @@ Quiet Mobile is a React Native app for Android and iOS that shares a Node.js [ba
 1. Set `JAVA_HOME` to the Temurin install location by adding a line to your `.bashrc` or `.zshrc`:  
     - Mac: `export JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home"`
     - Linux: `export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64/`
+
+    Alternatively, the easiest way to install The Temurin 17 JDK on Mac and Linux systems is to use [`SDKMAn`](https://sdkman.io/). This program is similar to `nvm` but for JDKs and allows you to easily install and switch between multiple JDKs on a single system.
+
+    ```bash
+    # downloads and installs SDKMAN
+    curl -s "https://get.sdkman.io" | bash
+
+    # downloads + installs + configures JAVA_HOME for Temurin JDK 17
+    sdk install java 17.0.0-tem
+    ``` 
+
 1. Install [Android Studio](https://developer.android.com/studio), ensuring that all of the following items in the installation wizard are checked
     - Android SDK
     - Android SDK Platform
@@ -36,7 +47,7 @@ Quiet Mobile is a React Native app for Android and iOS that shares a Node.js [ba
     export PATH=$PATH:$ANDROID_HOME/platform-tools
     ```
 
-1. Confirm that the "Android 15 (VanillaIceCream)" SDK required by React Native has been installed (confusingly, it is also called "android-35")
+1. Confirm that the "Android 15 (VanillaIceCream)" SDK required by React Native has been installed (confusingly, it is also called "android-35" or [API level 35](https://apilevels.com/))
 
     ```bash
     ls $ANDROID_HOME/platforms
@@ -79,11 +90,12 @@ It may be convenient to run the app from Android studio, for example if you are
 
 1. Open Android Studio
 
-    If using nvm to manage node versions, you may need to open Android studio from a terminal which has the correct node version set. This is because Android Studio may not be able to find the correct node version if it is not set in the terminal.
-    ```
+    If using `nvm` to manage `node` versions, you may need relink the `node` installed by `nvm` in order to open Quiet in Android Studio.
+    
+    ```bash
     nvm install 18.20.4
     nvm use 18.20.4
-    open -a "Android Studio"
+    sudo ln -s "$(which node)" /usr/local/bin/node
     ```
 1. Open the `android` directory in Android Studio.
 1. If necessary, sync the Gradle files by hitting the "Sync Project with Gradle Files" button in the top right corner.
@@ -109,7 +121,7 @@ _See the `node-common` README for a more detailed description of file logging in
 
 Metro requires additional step for locally linking packages. After running standard `npm link` commands, update `metro.config.js` as follows
 
-```bash
+```js
 const watchFolders = [
   ...
   path.resolve(__dirname, '<path-to-linked-package>')

packages/mobile/README.md

@@ -4,8 +4,6 @@ apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
-import com.android.build.OutputFile
-
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).
@@ -85,19 +83,7 @@ project.ext.react = [
     enableHermes: false,  // clean and rebuild if changing
 ]
 
-/**
- * Set this to true to create two separate APKs instead of one:
- *   - An APK that only works on ARM devices
- *   - An APK that only works on x86 devices
- * The advantage is the size of the APK is reduced by about 4MB.
- * Upload all the APKs to the Play Store and people will download
- * the correct one based on the CPU architecture of their device.
- */
-def enableSeparateBuildPerCPUArchitecture = false
-
-/**
- * Run Proguard to shrink the Java bytecode in release builds.
- */
+// Run Proguard to shrink the Java bytecode in release builds.
 def enableProguardInReleaseBuilds = false
 
 /**
@@ -122,14 +108,6 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-def _nodeTargetSdkVersion = ((rootProject?.ext?.properties?.targetSdkVersion) ?: 22)
-def _nodeMinSdkVersion = ((rootProject?.ext?.properties?.minSdkVersion) ?: 16)
-def _compileNativeModulesSdkVersion = _nodeMinSdkVersion
-if (_compileNativeModulesSdkVersion<21) {
-    // 21 is the minimum sdk version Node is built with.
-    _compileNativeModulesSdkVersion=21
-}
-
 /**
  * Architectures to build native code for.
  */
@@ -167,18 +145,12 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     packagingOptions {
-        pickFirst 'lib/x86/libc++_shared.so'
-        pickFirst 'lib/x86_64/libc++_shared.so'
-        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
         pickFirst 'lib/arm64-v8a/libc++_shared.so'
-        pickFirst 'lib/x86/libfbjni.so'
-        pickFirst 'lib/x86_64/libfbjni.so'
-        pickFirst 'lib/armeabi-v7a/libfbjni.so'
         pickFirst 'lib/arm64-v8a/libfbjni.so'
 
         jniLibs {
@@ -192,30 +164,27 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 519
-        versionName "6.1.0"
+        versionCode 526
+        versionName "6.2.0"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
+            //noinspection ChromeOsAbiSupport
             abiFilters "arm64-v8a"
         }
         externalNativeBuild {
             cmake {
                 cppFlags ""
             }
         }
-        externalNativeBuild {
-            cmake {
-                cppFlags ""
-            }
-        }
     }
     splits {
         abi {
             reset()
-            enable enableSeparateBuildPerCPUArchitecture
+            enable false
             universalApk false  // If true, also generate a universal APK
+            //noinspection ChromeOsAbiSupport
             include (*reactNativeArchitectures())
         }
     }
@@ -282,7 +251,7 @@ android {
             // https://developer.android.com/studio/build/configure-apk-splits.html
             // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["arm64-v8a": 1]
-            def abi = output.getFilter(OutputFile.ABI)
+            def abi = output.getFilter("ABI")
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
                         defaultConfig.versionCode * 1000 + versionCodes.get(abi)
@@ -294,50 +263,43 @@ android {
 
 dependencies {
     androidTestImplementation('com.wix:detox:+')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-
+    androidTestImplementation('androidx.test:core:1.7.0')
+    androidTestImplementation('androidx.test.ext:junit:1.1.1')
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation fileTree(dir: "libs", include: ["*.jar", '*.so'])
-
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
+    implementation("com.facebook.react:react-android") // version set by the React Native Gradle Plugin in npm
     implementation("com.facebook.react:flipper-integration")
-
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
 
     if (enableHermes) {
         //noinspection GradleDynamicVersion
         implementation("com.facebook.react:hermes-engine:+") { // From node_modules
             exclude group:'com.facebook.fbjni'
         }
     } else {
-        implementation jscFlavor
+        implementation(jscFlavor)
     }
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation "androidx.core:core-ktx:1.9.0"
-
-    implementation 'com.google.code.gson:gson:2.9.1'
-
-    implementation project(':react-native-fs')
-
-    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version")
+    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("com.google.code.gson:gson:2.13.1")
+    implementation(project(":react-native-fs"))
+    implementation(group: 'commons-io', name: 'commons-io', version: '2.20.0')
 
     // Websockets connection
-    implementation ('io.socket:socket.io-client:2.0.0') {
+    implementation ('io.socket:socket.io-client:2.1.2') {
         exclude group: 'org.json', module: 'json'
     }
 
     // Work manager
-    implementation("androidx.work:work-runtime:2.7.1")
-    implementation("androidx.work:work-runtime-ktx:2.7.1")
+    implementation("androidx.work:work-runtime:2.10.3")
+    implementation("androidx.work:work-runtime-ktx:2.10.3")
 
     // For animated GIF support
-    implementation 'com.facebook.fresco:fresco:2.6.0'
-    implementation 'com.facebook.fresco:animated-gif:2.6.0'
-    implementation "com.goterl:lazysodium-android:5.1.0@aar"
-    implementation "net.java.dev.jna:jna:5.12.1@aar"
+    implementation("com.facebook.fresco:fresco:3.6.0")
+    implementation("com.facebook.fresco:animated-gif:3.6.0")
+    implementation("com.goterl:lazysodium-android:5.2.0@aar")
+    implementation("net.java.dev.jna:jna:5.17.0@aar")
 }
 
 // Run this once to be able to run the application with BUCK