bump sdk, gradle and deps

.editorconfig

@@ -13,9 +13,5 @@ insert_final_newline = true
 indent_size = 2
 trim_trailing_whitespace = false
 
-[Makefile]
-indent_style = tab
-indent_size = 8
-
 [*.{js,json,css,scss,sass,html,handlebars,tpl}]
 indent_size = 2

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
     name: ${{ matrix.variant }}
     runs-on: ubuntu-latest
     container:
-      image: koreader/koandroid:0.9.1-22.04
+      image: benoitpierre/koandroid:0.10.0-22.04
 
     steps:
 

README.md

@@ -13,7 +13,7 @@ A good number of Android native API headers are readily presented via FFI alread
 
 Have a look at KOReader's [llapp_main.lua](https://github.com/koreader/koreader/blob/master/platform/android/llapp_main.lua) file. You can use it as a starting point for your own app.
 
-The real starting point, called from JNI/C, is the run() function in android.lua. It sets up a few things, namely FFI definitions for the Android native API (since it uses that itself for a few things) and some wrapper functions for logging. Also, it registers the "android" module in package.loaded, so you can access it in your own code via require("android"). It also registers a new package loader which can load Lua code from the activity's asset store, so you can use require() for Lua code stored there.
+The real starting point, called from JNI/C, is the run() function in android.lua. It sets up a few things, namely FFI definitions for the Android native API (since it uses that itself for a few things) and some wrapper functions for logging. Also, it registers the "android" module in `package.loaded`, so you can access it in your own code via require("android"). It also registers a new package loader which can load Lua code from the activity's asset store, so you can use require() for Lua code stored there.
 
 ## Disclaimer
 

app/build.gradle

@@ -1,20 +1,18 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 
 android {
-    namespace 'org.koreader.launcher'
-    ndkVersion '23.2.8568313'
-    ndkPath System.getenv('ANDROID_NDK_HOME')
-    compileSdk rootProject.ext.compileSdk
+    namespace = 'org.koreader.launcher'
+    ndkVersion = '23.2.8568313'
+    ndkPath = System.getenv('ANDROID_NDK_HOME')
+    compileSdk = rootProject.ext.compileSdk
     def baseVersionCode = versCode as Integer
 
-    aaptOptions {
-        noCompress '7z'
-    }
 
     defaultConfig {
-        applicationId "org.koreader.launcher"
-        versionName versName
+        applicationId = "org.koreader.launcher"
+        versionName = versName
         minSdkVersion rootProject.ext.minSdk
         targetSdkVersion rootProject.ext.targetSdk
 
@@ -45,25 +43,27 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
         debug {
-            applicationIdSuffix ".debug"
-            minifyEnabled false
-            debuggable true
+            applicationIdSuffix = ".debug"
+            minifyEnabled = false
+            debuggable = true
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = '17'
+    kotlin {
+	compilerOptions {
+	    jvmTarget = JvmTarget.JVM_17
+	}
     }
 
     flavorDimensions = [ 'ABI', 'CHANNEL'  ]
@@ -102,7 +102,7 @@ android {
 
     packagingOptions {
         jniLibs {
-            useLegacyPackaging true
+            useLegacyPackaging = true
         }
         resources {
             excludes += '/kotlin/**.kotlin_builtins'
@@ -117,14 +117,19 @@ android {
         disable 'GradleDependency'
         disable 'QueryAllPackagesPermission'
         disable 'SameParameterValue'
-        htmlReport false
-        xmlReport false
+        htmlReport = false
+        xmlReport = false
     }
+    androidResources {
+        noCompress '7z'
+    }
+}
 
-    applicationVariants.configureEach { variant ->
-        variant.outputs.configureEach {
-            outputFileName = "NativeActivity.apk"
-        }
+androidComponents {
+    onVariants(selector().all()) {
+	outputs.forEach {
+	    it.outputFileName.set("NativeActivity.apk")
+	}
     }
 }
 

app/src/debug/res/mipmap-anydpi-v26/icon.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="MonochromeLauncherIcon">
     <background android:drawable="@color/icon_debug"/>
     <foreground android:drawable="@mipmap/icon_foreground"/>
 </adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -11,19 +11,23 @@
     <!-- common android permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+
+    <!-- legacy storage permissions -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" android:maxSdkVersion="29" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"
-        tools:ignore="ProtectedPermissions" />
 
     <!-- These are used on API30+ -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+        tools:ignore="AllFilesAccessPolicy,ScopedStorage" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="PackageVisibilityPolicy" />
 
     <application
+        tools:ignore="DataExtractionRules,DiscouragedApi,NonResizeableActivity"
         android:name=".MainApp"
         android:icon="@mipmap/icon"
         android:banner="@mipmap/banner"
@@ -41,8 +45,7 @@
             android:resizeableActivity="false"
             android:screenOrientation="nosensor"
             android:launchMode="singleInstance"
-            android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
-            tools:ignore="NonResizeableActivity">
+            android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode">
             <meta-data android:name="android.app.lib_name" android:value="luajit-launcher" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/org/koreader/launcher/ApkUpdater.kt

@@ -1,5 +1,6 @@
 package org.koreader.launcher
 
+import android.annotation.SuppressLint
 import android.app.DownloadManager
 import android.content.Context
 import android.content.Intent
@@ -8,6 +9,7 @@ import android.os.Build
 import android.util.Log
 import androidx.core.content.FileProvider
 import java.io.File
+import androidx.core.net.toUri
 
 class ApkUpdater {
 
@@ -27,7 +29,7 @@ class ApkUpdater {
                 if (file.exists()) {
                     DOWNLOAD_EXISTS
                 } else {
-                    val request = DownloadManager.Request(Uri.parse(url))
+                    val request = DownloadManager.Request(url.toUri())
                     request.setMimeType("application/vnd.android.package-archive")
                     request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_HIDDEN)
                     request.setDestinationInExternalFilesDir(context, null, name)
@@ -56,6 +58,7 @@ class ApkUpdater {
         }
     }
 
+    @SuppressLint("RequestInstallPackagesPolicy")
     fun install(context: Context) {
         if (MainApp.OTA_UPDATES) {
             downloadPath?.let { apk ->

app/src/main/java/org/koreader/launcher/CrashReportActivity.kt

@@ -15,8 +15,8 @@ class CrashReportActivity : AppCompatActivity() {
         intent?.extras?.let { bundle ->
             binding = CrashReportBinding.inflate(layoutInflater)
             setContentView(binding.root)
-            binding.title.text = bundle.get("title").toString()
-            binding.reason.text = bundle.get("reason").toString()
+            binding.title.text = bundle.getString("title")
+            binding.reason.text = bundle.getString("reason")
             if (binding.reason.text.equals("")) {
                 binding.reason.visibility = View.GONE
             }

app/src/main/java/org/koreader/launcher/LuaInterface.kt

@@ -1,3 +1,5 @@
+@file:Suppress("SameReturnValue")
+
 package org.koreader.launcher
 
 import androidx.annotation.WorkerThread

app/src/main/java/org/koreader/launcher/MainActivity.kt

@@ -2,8 +2,6 @@ package org.koreader.launcher
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
-import android.app.Activity
 import android.app.NativeActivity
 import android.content.ClipboardManager
 import android.content.ClipData
@@ -24,9 +22,9 @@ import androidx.core.content.ContextCompat
 import org.koreader.launcher.device.Device
 import org.koreader.launcher.dialog.LightDialog
 import org.koreader.launcher.extensions.*
-import java.io.File
 import java.util.Locale
 import java.util.concurrent.CountDownLatch
+import androidx.core.net.toUri
 
 class MainActivity : NativeActivity(), LuaInterface,
     ActivityCompat.OnRequestPermissionsResultCallback {
@@ -178,6 +176,7 @@ class MainActivity : NativeActivity(), LuaInterface,
         drawSplashScreen(holder)
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     @RequiresApi(Build.VERSION_CODES.P)
     override fun onAttachedToWindow() {
         Log.d(TAG_SURFACE, "onAttachedToWindow()")
@@ -226,9 +225,9 @@ class MainActivity : NativeActivity(), LuaInterface,
     }
 
     /* Called on activity result, available from KitKat onwards */
-    @TargetApi(19)
+    @RequiresApi(19)
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
-        if (requestCode == ACTION_SAF_FILEPICKER_ID && resultCode == Activity.RESULT_OK) {
+        if (requestCode == ACTION_SAF_FILEPICKER_ID && resultCode == RESULT_OK) {
             val importPath = lastImportedPath ?: return
             resultData?.let {
                 val clipData = it.clipData
@@ -277,7 +276,7 @@ class MainActivity : NativeActivity(), LuaInterface,
     @Suppress("NewApi")
     override fun canIgnoreBatteryOptimizations(): Boolean {
         return if (MainApp.isAtLeastApi(Build.VERSION_CODES.M)) {
-            val pm = applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager
+            val pm = applicationContext.getSystemService(POWER_SERVICE) as PowerManager
             pm.isIgnoringBatteryOptimizations(packageName)
         } else false
     }
@@ -359,7 +358,7 @@ class MainActivity : NativeActivity(), LuaInterface,
         val result = Box<String>()
         runOnUiThread {
             result.value = try {
-                val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
                 val clipData: ClipData? = clipboard.primaryClip
                 clipData?.getItemAt(0)?.text?.toString()?.trim() ?: ""
             } catch (e: Exception) {
@@ -521,7 +520,7 @@ class MainActivity : NativeActivity(), LuaInterface,
     }
 
     override fun hasClipboardText(): Boolean {
-        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
         return clipboard.primaryClip?.let {
             (it.itemCount > 0)
         }?: false
@@ -629,7 +628,7 @@ class MainActivity : NativeActivity(), LuaInterface,
     }
 
     override fun openLink(url: String): Boolean {
-        val webpage = Uri.parse(url)
+        val webpage = url.toUri()
         val intent = Intent(Intent.ACTION_VIEW, webpage)
         return try {
             startActivity(intent)
@@ -692,7 +691,7 @@ class MainActivity : NativeActivity(), LuaInterface,
 
     override fun setClipboardText(text: String) {
         runOnUiThread {
-            val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
             clipboard.setPrimaryClip(ClipData.newPlainText("KOReader_clipboard", text))
         }
     }

app/src/main/java/org/koreader/launcher/MainApp.kt

@@ -1,5 +1,6 @@
 package org.koreader.launcher
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
 import android.content.Intent
@@ -10,6 +11,7 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
 
+@Suppress("HasPlatformType")
 class MainApp : Application() {
     companion object {
         const val NAME = BuildConfig.APP_NAME
@@ -89,6 +91,7 @@ class MainApp : Application() {
         }
     }
 
+    @SuppressLint("DefaultUncaughtExceptionDelegation")
     @Suppress("DEPRECATION")
     override fun onCreate() {
         super.onCreate()

app/src/main/java/org/koreader/launcher/TestActivity.kt

@@ -1,5 +1,6 @@
 package org.koreader.launcher
 
+import android.annotation.SuppressLint
 import android.graphics.Point
 import android.text.method.LinkMovementMethod
 import android.util.Log
@@ -151,6 +152,7 @@ class TestActivity: AppCompatActivity() {
         Log.i(tag, MARKER_END)
     }
 
+    @SuppressLint("DefaultLocale")
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         val msg = String.format("Pressed: %d", keyCode)
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()

app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt

@@ -10,7 +10,7 @@ import android.os.Build
 import android.util.Log
 import java.util.Locale
 
-@Suppress("detekt:all")
+@Suppress("detekt:all", "LocalVariableName")
 object DeviceInfo {
     private const val TAG = "DeviceInfo"
 
@@ -509,7 +509,7 @@ object DeviceInfo {
             // Onyx Note Air 4C
             BRAND == "onyx" && MODEL == "noteair4c"
             -> Id.ONYX_NOTE_AIR_4C
-            
+
             // Onyx Note Air 5C
             BRAND == "onyx" && MODEL == "noteair5c"
             -> Id.ONYX_NOTE_AIR_5C

app/src/main/java/org/koreader/launcher/device/EPDFactory.kt

@@ -1,6 +1,8 @@
 /* generic EPD Controller for Android devices,
  * based on https://github.com/unwmun/refreshU */
 
+@file:Suppress("EmptyMethod")
+
 package org.koreader.launcher.device
 
 import android.util.Log

app/src/main/java/org/koreader/launcher/device/EPDInterface.kt

@@ -1,6 +1,8 @@
 /* generic EPD Controller for Android devices,
  * based on https://github.com/unwmun/refreshU */
 
+@file:Suppress("EmptyMethod")
+
 package org.koreader.launcher.device
 
 interface EPDInterface {

app/src/main/java/org/koreader/launcher/device/epd/rockchip/RK30xxEPDController.kt

@@ -46,7 +46,7 @@ abstract class RK30xxEPDController {
         init {
             try {
                 @Suppress("UNCHECKED_CAST")
-                eInkEnum = Class.forName("android.view.View\$EINK_MODE") as Class<Enum<*>>
+                eInkEnum = Class.forName($$"android.view.View$EINK_MODE") as Class<Enum<*>>
                 updateEpdMethod = View::class.java.getMethod("requestEpdMode",
                     eInkEnum, Boolean::class.javaPrimitiveType)
             } catch (e: ClassNotFoundException) {