diff --git a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt index 4a56b1885..ab30587be 100644 --- a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt +++ b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt @@ -38,10 +38,8 @@ import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.firstOrNull -import kotlinx.coroutines.withContext import org.greenrobot.eventbus.EventBus @AndroidEntryPoint @@ -70,7 +68,7 @@ open class PackageManagerReceiver : BroadcastReceiver() { downloadWorkerUtil.downloadsList.filter { it.isNotEmpty() }.firstOrNull() ?.find { it.packageName == packageName && it.downloadStatus == DownloadStatus.COMPLETED } ?.let { - withContext(Dispatchers.IO) { notifyInstallation(context, it) } + notifyInstallation(context, it) if (Preferences.getBoolean(context, PREFERENCE_AUTO_DELETE)) { clearDownloads(context, it) } diff --git a/app/src/main/java/com/aurora/store/util/NotificationUtil.kt b/app/src/main/java/com/aurora/store/util/NotificationUtil.kt index 2011be4c5..6ccea8b1f 100644 --- a/app/src/main/java/com/aurora/store/util/NotificationUtil.kt +++ b/app/src/main/java/com/aurora/store/util/NotificationUtil.kt @@ -160,17 +160,9 @@ object NotificationUtil { } fun getInstallNotification(context: Context, download: AuroraDownload): Notification { - val builder = NotificationCompat.Builder(context, Constants.NOTIFICATION_CHANNEL_ALERT) - - // Set scaled big icon for download - try { - val bitmap = BitmapFactory.decodeStream(URL(download.iconURL).openStream()) - builder.setLargeIcon(Bitmap.createScaledBitmap(bitmap, 96, 96, true)) - } catch (exception: Exception) { - Log.i(TAG, "Failed to set big icon", exception) - } - - return builder.setSmallIcon(R.drawable.ic_install) + return NotificationCompat.Builder(context, Constants.NOTIFICATION_CHANNEL_ALERT) + .setSmallIcon(R.drawable.ic_install) + .setLargeIcon(PackageUtil.getIconForPackage(context, download.packageName)) .setColor(context.getStyledAttributeColor(R.color.colorAccent)) .setContentTitle(download.displayName) .setContentText(context.getString(R.string.installer_status_success)) diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt index 1bb4fabe4..9ca60e42c 100644 --- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt +++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt @@ -27,7 +27,10 @@ import android.content.pm.PackageManager import android.content.pm.PackageManager.PackageInfoFlags import android.content.pm.SharedLibraryInfo import android.content.res.Configuration +import android.graphics.Bitmap +import android.os.UserHandle import androidx.core.content.pm.PackageInfoCompat +import androidx.core.graphics.drawable.toBitmap import com.aurora.extensions.getInstallerPackageNameCompat import com.aurora.extensions.isOAndAbove import com.aurora.extensions.isTAndAbove @@ -122,6 +125,21 @@ object PackageUtil { } } + fun getIconForPackage(context: Context, packageName: String): Bitmap? { + return try { + val packageInfo = context.packageManager.getPackageInfo(packageName, 0) + val icon = packageInfo.applicationInfo.loadIcon(context.packageManager) + if (icon.intrinsicWidth > 0 && icon.intrinsicHeight > 0) { + icon.toBitmap(96, 96) + } else { + context.packageManager.defaultActivityIcon.toBitmap(96, 96) + } + } catch (exception: Exception) { + Log.e("Failed to get icon for package!", exception) + null + } + } + private fun getAllSharedLibraries(context: Context, flags: Int = 0): List { return if (isTAndAbove()) { context.packageManager.getSharedLibraries(PackageInfoFlags.of(flags.toLong()))