Mastodon/nextpush-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move getApplicationName to Utils

Browse Source
This commit is contained in:
sim 2023-08-29 23:15:59 +02:00
parent 49828c9bf1
commit 13153293a4
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/unifiedpush/distributor/nextpush/activities/AppListAdapter.kt
View File

@ -1,9 +1,6 @@
package org.unifiedpush.distributor.nextpush.activities
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
import android.util.SparseBooleanArray
import android.view.LayoutInflater
import android.view.View
@ -14,7 +11,7 @@ import androidx.core.view.isGone
import com.google.android.material.color.MaterialColors
import org.unifiedpush.distributor.nextpush.Database.Companion.getDb
import org.unifiedpush.distributor.nextpush.R
import org.unifiedpush.distributor.nextpush.utils.TAG
import org.unifiedpush.distributor.nextpush.utils.getApplicationName
data class App(
val token: String,
@ -63,21 +60,10 @@ class AppListAdapter(context: Context, private val resource: Int, apps: List<App
}
private fun setViewHolderForUnifiedPushApp(viewHolder: ViewHolder?, app: App) {
try {
val ai = if (Build.VERSION.SDK_INT >= 33) {
context.packageManager.getApplicationInfo(
app.packageId,
PackageManager.ApplicationInfoFlags.of(
PackageManager.GET_META_DATA.toLong()
)
)
} else {
context.packageManager.getApplicationInfo(app.packageId, 0)
}
viewHolder?.name?.text = context.packageManager.getApplicationLabel(ai)
context.getApplicationName(app.packageId)?.let {
viewHolder?.name?.text = it
viewHolder?.description?.text = app.packageId
} catch (e: PackageManager.NameNotFoundException) {
Log.e(TAG, "Could not resolve app name", e)
} ?: run {
viewHolder?.name?.text = app.packageId
viewHolder?.description?.isGone = true
}

27
app/src/main/java/org/unifiedpush/distributor/nextpush/utils/PackageUtils.kt Normal file
View File

@ -0,0 +1,27 @@
package org.unifiedpush.distributor.nextpush.utils
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
private const val U_TAG = "PackageUtils"
fun Context.getApplicationName(packageId: String): String? {
try {
val ai = if (Build.VERSION.SDK_INT >= 33) {
this.packageManager.getApplicationInfo(
packageId,
PackageManager.ApplicationInfoFlags.of(
PackageManager.GET_META_DATA.toLong()
)
)
} else {
this.packageManager.getApplicationInfo(packageId, 0)
}
return this.packageManager.getApplicationLabel(ai).toString()
} catch (e: PackageManager.NameNotFoundException) {
Log.e(U_TAG, "Could not resolve app name", e)
return null
}
}