From 4778f128f27a638763251817b24f2e200eafabb8 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 24 Dec 2021 15:07:45 +0100 Subject: [PATCH] Fix: Common content calls --- src/main/kotlin/com/looker/droidify/Common.kt | 7 ++----- .../com/looker/droidify/content/Preferences.kt | 4 ++-- .../looker/droidify/installer/InstallerService.kt | 13 +++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt index 5f948509..a0dc8668 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/looker/droidify/Common.kt @@ -35,8 +35,5 @@ const val ROW_LOCK_NAME = "memory_lock" const val JOB_ID_SYNC = 1 - const val PREFS_LANGUAGE = "languages" - const val PREFS_LANGUAGE_DEFAULT = "system" - - const val JOB_ID_SYNC = 1 -} +const val PREFS_LANGUAGE = "languages" +const val PREFS_LANGUAGE_DEFAULT = "system" diff --git a/src/main/kotlin/com/looker/droidify/content/Preferences.kt b/src/main/kotlin/com/looker/droidify/content/Preferences.kt index 664635bf..3ae8dfa9 100644 --- a/src/main/kotlin/com/looker/droidify/content/Preferences.kt +++ b/src/main/kotlin/com/looker/droidify/content/Preferences.kt @@ -3,8 +3,8 @@ package com.looker.droidify.content import android.content.Context import android.content.SharedPreferences import android.content.res.Configuration -import com.looker.droidify.Common.PREFS_LANGUAGE -import com.looker.droidify.Common.PREFS_LANGUAGE_DEFAULT +import com.looker.droidify.PREFS_LANGUAGE +import com.looker.droidify.PREFS_LANGUAGE_DEFAULT import com.looker.droidify.R import com.looker.droidify.entity.ProductItem import com.looker.droidify.utility.extension.android.Android diff --git a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt index 0a6e49ee..fec9dde0 100644 --- a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt +++ b/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt @@ -7,7 +7,8 @@ import android.content.pm.PackageManager import android.os.IBinder import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat -import com.looker.droidify.Common +import com.looker.droidify.NOTIFICATION_CHANNEL_DOWNLOADING +import com.looker.droidify.NOTIFICATION_ID_DOWNLOADING import com.looker.droidify.R import com.looker.droidify.utility.extension.android.notificationManager import com.looker.droidify.utility.extension.resources.getColorFromAttr @@ -70,7 +71,7 @@ class InstallerService : Service() { // start building val builder = NotificationCompat - .Builder(this, Common.NOTIFICATION_CHANNEL_DOWNLOADING) + .Builder(this, NOTIFICATION_CHANNEL_DOWNLOADING) .setAutoCancel(true) .setColor( ContextThemeWrapper(this, R.style.Theme_Main_Light) @@ -81,7 +82,7 @@ class InstallerService : Service() { PackageInstaller.STATUS_SUCCESS -> { if (installerAction == ACTION_UNINSTALL) // remove any notification for this app - notificationManager.cancel(notificationTag, Common.NOTIFICATION_ID_DOWNLOADING) + notificationManager.cancel(notificationTag, NOTIFICATION_ID_DOWNLOADING) else { val notification = builder .setSmallIcon(android.R.drawable.stat_sys_download_done) @@ -90,11 +91,11 @@ class InstallerService : Service() { .build() notificationManager.notify( notificationTag, - Common.NOTIFICATION_ID_DOWNLOADING, + NOTIFICATION_ID_DOWNLOADING, notification ) Thread.sleep(5000) - notificationManager.cancel(notificationTag, Common.NOTIFICATION_ID_DOWNLOADING) + notificationManager.cancel(notificationTag, NOTIFICATION_ID_DOWNLOADING) } } PackageInstaller.STATUS_FAILURE_ABORTED -> { @@ -109,7 +110,7 @@ class InstallerService : Service() { .build() notificationManager.notify( notificationTag, - Common.NOTIFICATION_ID_DOWNLOADING, + NOTIFICATION_ID_DOWNLOADING, notification ) }