diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2cc2b53..d08bbc7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("com.android.application") id("kotlin-parcelize") kotlin("android") - kotlin("plugin.serialization") version("1.9.0") + kotlin("plugin.serialization") version "1.9.0" } fun gitVersionCode(): Int { @@ -21,7 +21,10 @@ fun gitVersionCode(): Int { commandLine = arrayListOf("git", "rev-list", "--count", "HEAD") } - return result.standardOutput.asText.get().trimEnd().toInt() + return result.standardOutput.asText + .get() + .trimEnd() + .toInt() } fun gitVersionName(): String { @@ -30,7 +33,10 @@ fun gitVersionName(): String { commandLine = arrayListOf("git", "describe", "--tags", "--always") } - return result.standardOutput.asText.get().trimEnd().replace("-g", "-") + return result.standardOutput.asText + .get() + .trimEnd() + .replace("-g", "-") } java { @@ -118,15 +124,19 @@ abstract class ReadmePermsCheckTask : DefaultTask() { @TaskAction fun execute() { val permNodes = - XmlParser(false, false).parse( - File(manifestDir.singleFile, "AndroidManifest.xml"), - ).get("uses-permission") as NodeList + XmlParser(false, false) + .parse( + File(manifestDir.singleFile, "AndroidManifest.xml"), + ).get("uses-permission") as NodeList val manifestPerms = - permNodes.map { perm -> - (perm as Node).attribute("android:name").toString() - .removePrefix("android.permission.") - }.filter { !it.startsWith(applicationId.get()) } + permNodes + .map { perm -> + (perm as Node) + .attribute("android:name") + .toString() + .removePrefix("android.permission.") + }.filter { !it.startsWith(applicationId.get()) } val permLine = Regex("""^ - `([A-Z_]+)` \\$""") val readmePerms = diff --git a/app/src/androidTest/java/com/nerdoftheherd/tasker/rsync/TestUtils.kt b/app/src/androidTest/java/com/nerdoftheherd/tasker/rsync/TestUtils.kt index 1055673..019e695 100644 --- a/app/src/androidTest/java/com/nerdoftheherd/tasker/rsync/TestUtils.kt +++ b/app/src/androidTest/java/com/nerdoftheherd/tasker/rsync/TestUtils.kt @@ -41,19 +41,20 @@ class TestUtils { Context.APP_OPS_SERVICE, ) as AppOpsManager - val permAllowed = fun(): Boolean { - return appOps.unsafeCheckOpNoThrow( + val permAllowed = fun(): Boolean = + appOps.unsafeCheckOpNoThrow( "android:manage_external_storage", Process.myUid(), context.packageName, ) == AppOpsManager.MODE_ALLOWED - } if (permAllowed() == enabled) { return } - InstrumentationRegistry.getInstrumentation().uiAutomation + InstrumentationRegistry + .getInstrumentation() + .uiAutomation .executeShellCommand( "appops set ${context.packageName} " + "MANAGE_EXTERNAL_STORAGE " + @@ -65,13 +66,17 @@ class TestUtils { } } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (enabled) { - InstrumentationRegistry.getInstrumentation().uiAutomation + InstrumentationRegistry + .getInstrumentation() + .uiAutomation .grantRuntimePermission( context.packageName, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, ) } else { - InstrumentationRegistry.getInstrumentation().uiAutomation + InstrumentationRegistry + .getInstrumentation() + .uiAutomation .revokeRuntimePermission( context.packageName, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/DbclientRunner.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/DbclientRunner.kt index e435adf..fdfc5a2 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/DbclientRunner.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/DbclientRunner.kt @@ -18,8 +18,9 @@ import com.joaomgcd.taskerpluginlibrary.runner.TaskerPluginResultSucess import com.nerdoftheherd.tasker.rsync.config.DbclientConfig import com.nerdoftheherd.tasker.rsync.output.CommandOutput -class DbclientRunner(private val timeoutOverride: Int? = null) : - TaskerPluginRunnerAction() { +class DbclientRunner( + private val timeoutOverride: Int? = null, +) : TaskerPluginRunnerAction() { override val notificationProperties get() = NotificationProperties( iconResId = R.drawable.ic_notification, diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncArgExtractor.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncArgExtractor.kt index 91d8e79..eaf96c5 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncArgExtractor.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncArgExtractor.kt @@ -6,7 +6,9 @@ package com.nerdoftheherd.tasker.rsync -class RsyncArgExtractor(args: List) { +class RsyncArgExtractor( + args: List, +) { val paths = ArrayList() var remoteSrcOrDest: Boolean = false private set diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncRunner.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncRunner.kt index 08da823..426594f 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncRunner.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/RsyncRunner.kt @@ -24,8 +24,9 @@ import com.nerdoftheherd.tasker.rsync.config.RsyncConfig import com.nerdoftheherd.tasker.rsync.output.CommandOutput import java.io.File -class RsyncRunner(private val timeoutOverride: Int? = null) : - TaskerPluginRunnerAction() { +class RsyncRunner( + private val timeoutOverride: Int? = null, +) : TaskerPluginRunnerAction() { override val notificationProperties get() = NotificationProperties( iconResId = R.drawable.ic_notification, @@ -72,7 +73,8 @@ class RsyncRunner(private val timeoutOverride: Int? = null) : } } else { externalPaths += - Environment.getExternalStorageDirectory() + Environment + .getExternalStorageDirectory() .absolutePath } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/UpdateNotifier.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/UpdateNotifier.kt index 9066314..3f8222d 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/UpdateNotifier.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/UpdateNotifier.kt @@ -108,18 +108,15 @@ class UpdateNotifier { } else { @Suppress("DEPRECATION") Notification.Builder(context) - } - .setSmallIcon(R.drawable.ic_notification) + }.setSmallIcon(R.drawable.ic_notification) .setContentTitle( context.getString(R.string.update_available), - ) - .setContentText( + ).setContentText( context.getString( R.string.update_notif_text, info.version, ), - ) - .setContentIntent(updatePI) + ).setContentIntent(updatePI) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { @Suppress("DEPRECATION") diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/Utils.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/Utils.kt index b31f4a5..441ab1d 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/Utils.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/Utils.kt @@ -15,8 +15,7 @@ class Utils { const val ERROR_MISSING_STORAGE_PERMISSION = 101 const val KEY_FILENAME = "id_dropbear" - fun privateKeyFile(context: Context): File { - return File(context.filesDir, KEY_FILENAME) - } + fun privateKeyFile(context: Context): File = + File(context.filesDir, KEY_FILENAME) } } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/Version.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/Version.kt index 4e35713..6d0859e 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/Version.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/Version.kt @@ -12,7 +12,9 @@ import kotlinx.parcelize.Parcelize import java.util.Objects @Parcelize -class Version(private val value: String) : Parcelable { +class Version( + private val value: String, +) : Parcelable { @IgnoredOnParcel private val numParts: List @@ -57,9 +59,7 @@ class Version(private val value: String) : Parcelable { override fun hashCode() = Objects.hash(value) - override fun toString(): String { - return value - } + override fun toString(): String = value companion object { private val verPattern = diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/VersionInfo.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/VersionInfo.kt index b5e9ffd..2ece558 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/VersionInfo.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/VersionInfo.kt @@ -105,7 +105,8 @@ data class VersionInfo( if (info == null) { val data = - httpConn.inputStream.bufferedReader() + httpConn.inputStream + .bufferedReader() .use(BufferedReader::readText) info = ignoreUnknownJson.decodeFromString(data) diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/DbclientConfigActivity.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/DbclientConfigActivity.kt index 84ccf9e..5e6284d 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/DbclientConfigActivity.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/DbclientConfigActivity.kt @@ -83,9 +83,10 @@ class DbclientConfigActivity : this.checkForUpdates ?: if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ) { - context.packageManager.getInstallSourceInfo( - context.packageName, - ).packageSource != PackageInstaller.PACKAGE_SOURCE_STORE + context.packageManager + .getInstallSourceInfo( + context.packageName, + ).packageSource != PackageInstaller.PACKAGE_SOURCE_STORE } else { true } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/RsyncConfigActivity.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/RsyncConfigActivity.kt index 11c15ec..d06a881 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/RsyncConfigActivity.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/RsyncConfigActivity.kt @@ -83,9 +83,10 @@ class RsyncConfigActivity : this.checkForUpdates ?: if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ) { - context.packageManager.getInstallSourceInfo( - context.packageName, - ).packageSource != PackageInstaller.PACKAGE_SOURCE_STORE + context.packageManager + .getInstallSourceInfo( + context.packageName, + ).packageSource != PackageInstaller.PACKAGE_SOURCE_STORE } else { true } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/UpdateActivity.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/UpdateActivity.kt index 8f353c6..a057d52 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/UpdateActivity.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/activities/UpdateActivity.kt @@ -89,8 +89,8 @@ class UpdateActivity : AppCompatActivity() { } } - private suspend fun download(): File { - return withContext(Dispatchers.IO) { + private suspend fun download(): File = + withContext(Dispatchers.IO) { val conn = info.download.openConnection() as HttpURLConnection conn.connect() @@ -104,5 +104,4 @@ class UpdateActivity : AppCompatActivity() { stream.close() file } - } } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/DbclientHelper.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/DbclientHelper.kt index 56810fd..6392dbe 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/DbclientHelper.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/DbclientHelper.kt @@ -12,8 +12,9 @@ import com.nerdoftheherd.tasker.rsync.DbclientRunner import com.nerdoftheherd.tasker.rsync.config.DbclientConfig import com.nerdoftheherd.tasker.rsync.output.CommandOutput -class DbclientHelper(config: TaskerPluginConfig) : - TaskerPluginConfigHelper( +class DbclientHelper( + config: TaskerPluginConfig, +) : TaskerPluginConfigHelper( config, ) { override val runnerClass = DbclientRunner::class.java diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PrivateKeyHelper.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PrivateKeyHelper.kt index 7de43a4..4bacead 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PrivateKeyHelper.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PrivateKeyHelper.kt @@ -11,8 +11,9 @@ import com.joaomgcd.taskerpluginlibrary.config.TaskerPluginConfigHelperNoOutput import com.nerdoftheherd.tasker.rsync.PrivateKeyRunner import com.nerdoftheherd.tasker.rsync.config.PrivateKeyConfig -class PrivateKeyHelper(config: TaskerPluginConfig) : - TaskerPluginConfigHelperNoOutput( +class PrivateKeyHelper( + config: TaskerPluginConfig, +) : TaskerPluginConfigHelperNoOutput( config, ) { override val runnerClass = PrivateKeyRunner::class.java diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PublicKeyHelper.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PublicKeyHelper.kt index 6690231..3a91fcf 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PublicKeyHelper.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/PublicKeyHelper.kt @@ -11,8 +11,9 @@ import com.joaomgcd.taskerpluginlibrary.config.TaskerPluginConfigNoInput import com.nerdoftheherd.tasker.rsync.PublicKeyRunner import com.nerdoftheherd.tasker.rsync.output.PublicKeyOutput -class PublicKeyHelper(config: TaskerPluginConfigNoInput) : - TaskerPluginConfigHelperNoInput(config) { +class PublicKeyHelper( + config: TaskerPluginConfigNoInput, +) : TaskerPluginConfigHelperNoInput(config) { override val runnerClass = PublicKeyRunner::class.java override val outputClass = PublicKeyOutput::class.java } diff --git a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/RsyncHelper.kt b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/RsyncHelper.kt index d6f311a..8f15dcc 100644 --- a/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/RsyncHelper.kt +++ b/app/src/main/java/com/nerdoftheherd/tasker/rsync/helpers/RsyncHelper.kt @@ -12,8 +12,9 @@ import com.nerdoftheherd.tasker.rsync.RsyncRunner import com.nerdoftheherd.tasker.rsync.config.RsyncConfig import com.nerdoftheherd.tasker.rsync.output.CommandOutput -class RsyncHelper(config: TaskerPluginConfig) : - TaskerPluginConfigHelper(config) { +class RsyncHelper( + config: TaskerPluginConfig, +) : TaskerPluginConfigHelper(config) { override val runnerClass = RsyncRunner::class.java override val inputClass = RsyncConfig::class.java override val outputClass = CommandOutput::class.java diff --git a/app/src/test/java/com/nerdoftheherd/tasker/rsync/FakeAtomicFile.kt b/app/src/test/java/com/nerdoftheherd/tasker/rsync/FakeAtomicFile.kt index 8a5072f..e4f2f3f 100644 --- a/app/src/test/java/com/nerdoftheherd/tasker/rsync/FakeAtomicFile.kt +++ b/app/src/test/java/com/nerdoftheherd/tasker/rsync/FakeAtomicFile.kt @@ -10,18 +10,14 @@ import android.util.AtomicFile import java.io.File import java.io.FileOutputStream -class FakeAtomicFile(private val baseFile: File) : AtomicFile(baseFile) { - override fun getBaseFile(): File { - return baseFile - } +class FakeAtomicFile( + private val baseFile: File, +) : AtomicFile(baseFile) { + override fun getBaseFile(): File = baseFile - override fun readFully(): ByteArray { - return baseFile.readBytes() - } + override fun readFully(): ByteArray = baseFile.readBytes() - override fun startWrite(): FileOutputStream { - return baseFile.outputStream() - } + override fun startWrite(): FileOutputStream = baseFile.outputStream() override fun finishWrite(str: FileOutputStream?) { str?.flush() diff --git a/app/src/test/java/com/nerdoftheherd/tasker/rsync/MockHttpURLConnection.kt b/app/src/test/java/com/nerdoftheherd/tasker/rsync/MockHttpURLConnection.kt index de6a9b8..587231d 100644 --- a/app/src/test/java/com/nerdoftheherd/tasker/rsync/MockHttpURLConnection.kt +++ b/app/src/test/java/com/nerdoftheherd/tasker/rsync/MockHttpURLConnection.kt @@ -12,8 +12,9 @@ import java.io.InputStream import java.net.HttpURLConnection import java.net.URL -class MockHttpURLConnection(private val responseData: String?) : - HttpURLConnection(URL("http://example.com/")) { +class MockHttpURLConnection( + private val responseData: String?, +) : HttpURLConnection(URL("http://example.com/")) { var requestWasMade = false private set diff --git a/build.gradle.kts b/build.gradle.kts index ddefcb7..9f782d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { } plugins { - id("org.jlleitschuh.gradle.ktlint") version "12.3.0" + id("org.jlleitschuh.gradle.ktlint") version "13.0.0" } allprojects {