Bring project up to date

.gitignore

@@ -8,6 +8,9 @@
 # Java class files
 *.class
 
+# Kotlin session files
+.kotlin/
+
 # generated files
 bin/
 build/
@@ -33,6 +36,8 @@ eclipse-java-style.xml
 .classpath
 .project
 .settings
+settings.json
+.vscode
 
 # Gradle wrapper
 gradle/wrapper/gradle/

README.md

@@ -29,14 +29,63 @@ The project is translated on [Hosted Weblate](https://hosted.weblate.org/project
 
 ## Dev
 
-Language codes are usually mapped correctly by Weblate itself.  The supported
-set is different between [Google Play][1] and Android apps.  The latter can be
-deduced by what the [Android core framework itself supports][2].  New languages
+Language codes are usually mapped correctly by Weblate itself. The supported
+set is different between [Google Play][1] and Android apps. The latter can be
+deduced by what the [Android core framework itself supports][2]. New languages
 need to be added in the repository first, then appear automatically in Weblate.
 
 [1]: https://support.google.com/googleplay/android-developer/table/4419860
 [2]: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/res/res/
 
+# Dev Setup
+
+To develop using Android Studio, install Android Studio and the Android SDK/NDK, then set persistent environment variables. Use the IDE SDK Manager for GUI installs or the command line for scripted installs.
+
+1. Install Android Studio
+
+   - Download and install from https://developer.android.com/studio.
+   - On first run open Tools → SDK Manager:
+     - Under SDK Platform, install an Android SDK Platform (e.g. Android 36).
+     - Under SDK Tools, install
+       - Android SDK Build-Tools
+       - Android SDK Platform-Tools
+       - Android SDK Command-line Tools.
+       - “NDK (Side by side)” and a specific NDK version required by the project (or use the same version referenced in the Dockerfile).
+   - (Optional) Install CMake if prompted.
+
+2. Install or update SDK/NDK from the command line (optional)
+
+   - Use the SDK command-line tools (sdkmanager). Example:
+     ```
+     sdkmanager "platform-tools" "build-tools;33.0.2" "platforms;android-33" "ndk;25.2.9519653" "cmdline-tools;latest"
+     ```
+   - Replace versions with the ones your build requires.
+
+3. Set persistent environment variables
+
+   - Windows (use System → Advanced system settings → Environment Variables or run as Administrator):
+     - Recommended: open “Edit the system environment variables” UI and add/modify variables.
+     - `ANDROID_HOME=C:\Users\User\AppData\Local\Android\Sdk`
+     - `NDK_VERSION=29.0.14206865`
+
+4. Install Go
+
+   - `winget install GoLang.Go`
+
+5. Verify installation
+   ```
+   $env:ANDROID_HOME
+   go version
+   java -version         # must be Java 21
+   ```
+
+Notes
+
+- Use the exact SDK/NDK versions required by the project (see docker/Dockerfile or project docs).
+- Prefer setting ANDROID_SDK_ROOT (or ANDROID_HOME as a legacy alias) and ANDROID_NDK_HOME so build tools and Gradle can find the SDK/NDK.
+- On Windows prefer the Environment Variables UI to avoid PATH truncation issues with setx.
+- After setting these variables, Android Studio and command-line builds (./gradlew assembleDebug, ./gradlew buildNative) should find the SDK/NDK automatically.
+
 # Building
 
 These dependencies and instructions are necessary for building from the command
@@ -46,30 +95,34 @@ follow them separately.
 ## Dependencies
 
 1. Android SDK and NDK
-    1. Download SDK command line tools from https://developer.android.com/studio#command-line-tools-only.
-    2. Unpack the downloaded archive to an empty folder. This path is going
-       to become your `ANDROID_HOME` folder.
-    3. Inside the unpacked `cmdline-tools` folder, create yet another folder
-       called `latest`, then move everything else inside it, so that the final
-       folder hierarchy looks as follows.
-       ```
-       cmdline-tools/latest/bin
-       cmdline-tools/latest/lib
-       cmdline-tools/latest/source.properties
-       cmdline-tools/latest/NOTICE.txt
-       ```
-    4. Navigate inside `cmdline-tools/latest/bin`, then execute
-       ```
-       ./sdkmanager "platform-tools" "build-tools;<version>" "platforms;android-<version>" "extras;android;m2repository" "ndk;<version>"
-       ```
-       The required tools and NDK will be downloaded automatically.
-
-        **NOTE:** You should check [Dockerfile](docker/Dockerfile) for the
-        specific version numbers to insert in the command above.
+
+   1. Download SDK command line tools from https://developer.android.com/studio#command-line-tools-only.
+   2. Unpack the downloaded archive to an empty folder. This path is going
+      to become your `ANDROID_HOME` folder.
+   3. Inside the unpacked `cmdline-tools` folder, create yet another folder
+      called `latest`, then move everything else inside it, so that the final
+      folder hierarchy looks as follows.
+      ```
+      cmdline-tools/latest/bin
+      cmdline-tools/latest/lib
+      cmdline-tools/latest/source.properties
+      cmdline-tools/latest/NOTICE.txt
+      ```
+   4. Navigate inside `cmdline-tools/latest/bin`, then execute
+
+      ```
+      ./sdkmanager "platform-tools" "build-tools;<version>" "platforms;android-<version>" "extras;android;m2repository" "ndk;<version>"
+      ```
+
+      The required tools and NDK will be downloaded automatically.
+
+      **NOTE:** You should check [Dockerfile](docker/Dockerfile) for the
+      specific version numbers to insert in the command above.
+
 2. Go (see https://docs.syncthing.net/dev/building#prerequisites for the
    required version)
-3. Java version 11 (if not present in ``$PATH``, you might need to set
-   ``$JAVA_HOME`` accordingly)
+3. Java version 11 (if not present in `$PATH`, you might need to set
+   `$JAVA_HOME` accordingly)
 4. Python version 3
 
 ## Build instructions

app/build.gradle.kts

@@ -1,39 +1,43 @@
-import org.gradle.configurationcache.extensions.capitalized
-
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     id("com.android.application")
     id("com.github.ben-manes.versions")
-    id("com.github.triplet.play") version "3.7.0"
+    id("com.github.triplet.play") version "3.12.2"
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.kapt")
 }
 
 dependencies {
     implementation("eu.chainfire:libsuperuser:1.1.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.google.android.material:material:1.13.0")
+    implementation("com.google.code.gson:gson:2.13.2")
     implementation("org.mindrot:jbcrypt:0.4")
-    implementation("com.google.guava:guava:32.1.3-android")
+    implementation("com.google.guava:guava:33.5.0-android")
     implementation("com.annimon:stream:1.2.2")
     implementation("com.android.volley:volley:1.2.1")
-    implementation("commons-io:commons-io:2.11.0")
+    implementation("commons-io:commons-io:2.21.0")
+    implementation("androidx.documentfile:documentfile:1.1.0")
+    implementation("androidx.preference:preference-ktx:1.2.1")
 
     implementation("com.journeyapps:zxing-android-embedded:4.3.0") {
         isTransitive = false
     }
-    implementation("com.google.zxing:core:3.4.1")
+    implementation("com.google.zxing:core:3.5.4")
 
-    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
-    implementation("com.google.dagger:dagger:2.49")
-    annotationProcessor("com.google.dagger:dagger-compiler:2.49")
-    androidTestImplementation("androidx.test:rules:1.4.0")
-    androidTestImplementation("androidx.annotation:annotation:1.2.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
+    implementation("com.google.dagger:dagger:2.57.2")
+    implementation("androidx.core:core-ktx:1.17.0")
+    kapt("com.google.dagger:dagger-compiler:2.57.2")
+    // Align annotation version with other AndroidX constraints to avoid resolution
+    // conflicts during lint and test configuration resolution.
+    androidTestImplementation("androidx.annotation:annotation:1.8.1")
 }
 
 android {
     val ndkVersionShared = rootProject.extra.get("ndkVersionShared")
     // Changes to these values need to be reflected in `../docker/Dockerfile`
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
-    ndkVersion = "${ndkVersionShared}"
+    compileSdk = 36
+    ndkVersion = "$ndkVersionShared"
 
     buildFeatures {
         dataBinding = true
@@ -42,10 +46,10 @@ android {
 
     defaultConfig {
         applicationId = "com.nutomic.syncthingandroid"
-        minSdk = 21
-        targetSdk = 33
-        versionCode = 4395
-        versionName = "1.28.1"
+        minSdk = 35
+        targetSdk = 35
+        versionCode = 4396
+        versionName = "2.0.9"
         testApplicationId = "com.nutomic.syncthingandroid.test"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -64,7 +68,6 @@ android {
             applicationIdSuffix = ".debug"
             isDebuggable = true
             isJniDebuggable = true
-            isRenderscriptDebuggable = true
             isMinifyEnabled = false
         }
         getByName("release") {
@@ -75,17 +78,28 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     // Otherwise libsyncthing.so doesn't appear where it should in installs
     // based on app bundles, and thus nothing works.
-    packagingOptions {
+    packaging {
         jniLibs {
             useLegacyPackaging = true
         }
     }
+    namespace = "com.nutomic.syncthingandroid"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+    }
+}
+
+kapt {
+    correctErrorTypes = true
 }
 
 play {
@@ -113,8 +127,10 @@ tasks.register<Delete>("deleteUnsupportedPlayTranslations") {
 }
 
 project.afterEvaluate {
-    android.buildTypes.forEach {
-        tasks.named("merge${it.name.capitalized()}JniLibFolders") {
+    android.buildTypes.forEach { buildType ->
+        tasks.named("merge${
+            buildType.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+        }JniLibFolders") {
             dependsOn(":syncthing:buildNative")
         }
     }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -20,17 +23,24 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <!-- FOREGROUND_SERVICE is required to create a foreground service on 9 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <!-- ACCESS_FINE_LOCATION is required to get WiFi's SSID on 10 "Q" -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <!-- ACCESS_BACKGROUND_LOCATION is required to get WiFi's SSID on 10 "Q" -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
+        tools:ignore="BackgroundLocationPolicy" />
     <!-- CAMERA is required for the QR Code Scanner -->
     <uses-permission android:name="android.permission.CAMERA" />
     <!-- MANAGE_EXTERNAL_STORAGE is required on Android 11 "R" -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
+    <queries>
+        <package android:name="android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION" />
+    </queries>
+
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
@@ -45,7 +55,6 @@
         android:name=".SyncthingApp">
         <activity
                 android:name=".activities.FirstStartActivity"
-                android:label="@string/app_name"
                 android:launchMode="singleTask"
             android:exported="true">
             <intent-filter>
@@ -59,7 +68,6 @@
         </activity>
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name"
             android:launchMode="singleTask">
         </activity>
         <activity
@@ -126,7 +134,8 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.MainActivity" />
         </activity>
-        <service android:name=".service.SyncthingService" />
+        <service android:name=".service.SyncthingService"
+            android:foregroundServiceType="dataSync"/>
         <receiver android:name=".receiver.BootReceiver"
             android:exported="false">
             <intent-filter>