jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-02-23 06:21:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve default app choice

Browse source 
Parsing it into a HashMap messed up the order. Now it is parsed into a 
Array.
This commit is contained in:
Finn M Glas 2020-05-20 05:31:52 +02:00
parent 08774dcf73
commit f5a78a8e38
No known key found for this signature in database
GPG key ID: 25037A2E81AB459C
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/finnmglas/launcher/Functions.kt
View file

@ -12,20 +12,6 @@ import android.os.Bundle
import android.provider.Settings
import android.widget.Toast
/** Parsing functions */
// Related question: https://stackoverflow.com/q/3013655/12787264
fun parseStringMap(stringArrayResourceId: Int, context: Context): HashMap<String, String>? {
val stringArray: Array<String> =
context.resources.getStringArray(stringArrayResourceId)
val outputArray = HashMap<String, String>(stringArray.size)
for (entry in stringArray) {
val splitResult = entry.split("|").toTypedArray()
outputArray.put(splitResult[0], splitResult[1])
}
return outputArray
}
/** Activity related */
fun isInstalled(uri: String, context: Context): Boolean {
@ -150,7 +136,14 @@ fun pickDefaultApp(action: String, context: Context) : Pair<String, String>{
else -> return Pair(context.getString(R.string.none_found), "") // just prevent crashing on unknown input
}
val defaultAppsMap = parseStringMap(arrayResource, context)
for (item in defaultAppsMap!!) if (isInstalled(item.key, context)) return Pair(item.value, item.key)
// Related question: https://stackoverflow.com/q/3013655/12787264 (Adjusted)
val list = context.resources.getStringArray(arrayResource)
for (entry in list!!){
val splitResult = entry.split("|").toTypedArray()
val pkgname = splitResult[0]
val name = splitResult[1]
if (isInstalled(pkgname, context)) return Pair(name, pkgname)
}
return Pair(context.getString(R.string.none_found), "")
}