mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 09:58:08 +00:00
Code Issues Releases Wiki Activity

Replace ClassIndex (unmaintained) with KlassIndex

Browse Source
This commit is contained in:
Albert Vaca Cintora 2024-10-13 23:50:19 +02:00
parent 333ad876aa
commit 526c3a9c4d
No known key found for this signature in database
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -267,6 +267,10 @@ androidComponents {
} }
} }
kapt {
useBuildCache = true
}
dependencies { dependencies {
// It has a bug that causes a crash when using PosixFilePermission and minSdk < 26. // It has a bug that causes a crash when using PosixFilePermission and minSdk < 26.
// It has been used in SSHD Core. // It has been used in SSHD Core.
@ -307,8 +311,8 @@ dependencies {
//implementation("com.github.bright:slf4android:0.1.6") { transitive = true } // For org.apache.sshd debugging //implementation("com.github.bright:slf4android:0.1.6") { transitive = true } // For org.apache.sshd debugging
implementation(libs.bcpkix.jdk15on) //For SSL certificate generation implementation(libs.bcpkix.jdk15on) //For SSL certificate generation
implementation(libs.classindex) implementation(libs.klassindex.library)
kapt(libs.classindex) kapt(libs.klassindex.processor)
// The android-smsmms library is the only way I know to handle MMS in Android // The android-smsmms library is the only way I know to handle MMS in Android
// (Shouldn't a phone OS make phone things easy?) // (Shouldn't a phone OS make phone things easy?)

5
gradle/libs.versions.toml
View File

@ -5,7 +5,7 @@ androidGradlePlugin = "8.7.0"
androidSmsmms = "kdeconnect-1-21-0" androidSmsmms = "kdeconnect-1-21-0"
appcompat = "1.7.0" appcompat = "1.7.0"
bcpkixJdk15on = "1.70" bcpkixJdk15on = "1.70"
classindex = "3.13" klassindex = "4.1.0"
commonsCollections4 = "4.4" commonsCollections4 = "4.4"
commonsIo = "2.17.0" commonsIo = "2.17.0"
commonsLang3 = "3.17.0" commonsLang3 = "3.17.0"
@ -58,7 +58,8 @@ androidx-preference-ktx = { module = "androidx.preference:preference-ktx", versi
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkixJdk15on" } bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkixJdk15on" }
classindex = { module = "org.atteo.classindex:classindex", version.ref = "classindex" } klassindex-library = { module = "fyi.fax.klassindex:library", version.ref = "klassindex" }
klassindex-processor = { module = "fyi.fax.klassindex:processor", version.ref = "klassindex" }
commons-collections4 = { module = "org.apache.commons:commons-collections4", version.ref = "commonsCollections4" } commons-collections4 = { module = "org.apache.commons:commons-collections4", version.ref = "commonsCollections4" }
commons-io = { module = "commons-io:commons-io", version.ref = "commonsIo" } commons-io = { module = "commons-io:commons-io", version.ref = "commonsIo" }
commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" } commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" }

15
src/org/kde/kdeconnect/Plugins/PluginFactory.kt
View File

@ -8,17 +8,21 @@ package org.kde.kdeconnect.Plugins
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import org.atteo.classindex.ClassIndex import fyi.fax.klassindex.KlassIndex
import org.atteo.classindex.IndexAnnotated import fyi.fax.klassindex.IndexAnnotated
import org.kde.kdeconnect.Device import org.kde.kdeconnect.Device
object PluginFactory { object PluginFactory {
@IndexAnnotated
annotation class LoadablePlugin //Annotate plugins with this so PluginFactory finds them
private var pluginInfo: Map<String, PluginInfo> = mapOf() private var pluginInfo: Map<String, PluginInfo> = mapOf()
fun initPluginInfo(context: Context) { fun initPluginInfo(context: Context) {
try { try {
val plugins = ClassIndex.getAnnotated(LoadablePlugin::class.java) val plugins = KlassIndex.getAnnotated(LoadablePlugin::class)
.map { it.newInstance() as Plugin } .map { it.java.getDeclaredConstructor().newInstance() as Plugin }
.map { plugin -> plugin.apply { setContext(context, null) } } .map { plugin -> plugin.apply { setContext(context, null) } }
pluginInfo = plugins.associate { plugin -> Pair(plugin.pluginKey, PluginInfo(plugin)) } pluginInfo = plugins.associate { plugin -> Pair(plugin.pluginKey, PluginInfo(plugin)) }
@ -67,9 +71,6 @@ object PluginFactory {
return used.map { it.key }.toSet() return used.map { it.key }.toSet()
} }
@IndexAnnotated
annotation class LoadablePlugin //Annotate plugins with this so PluginFactory finds them
class PluginInfo private constructor( class PluginInfo private constructor(
val displayName: String, val displayName: String,
val description: String, val description: String,