Merge pull request #98 from itachi1706/dependency-update-fix

Update Preferences Dependency to 1.2.0
itachi1706 · Mar 7, 2022 · 2d3bffc · 2d3bffc
2 parents de48dc6 + 742a496
commit 2d3bffc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,3 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Disable. Remove if its causing issues
+android.disableAutomaticComponentCreation=true
diff --git a/helperlib/build.gradle b/helperlib/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

diff --git a/helperlib/src/main/java/com/itachi1706/helperlib/concurrent/CoroutineAsyncTask.kt b/helperlib/src/main/java/com/itachi1706/helperlib/concurrent/CoroutineAsyncTask.kt
@@ -1,7 +1,8 @@
-@file:Suppress("unused")
+@file:Suppress("unused", "MemberVisibilityCanBePrivate")
 
 package com.itachi1706.helperlib.concurrent
 
+import android.content.Context
 import com.itachi1706.helperlib.concurrent.Constants.Status
 import com.itachi1706.helperlib.helpers.LogHelper
 import kotlinx.coroutines.*
@@ -10,9 +11,9 @@ import java.util.concurrent.Executors
 /**
  * Replacement of AsyncTask in Kotlin Coroutine format
  */
-abstract class CoroutineAsyncTask<Params, Progress, Result>(val taskName: String) {
+abstract class CoroutineAsyncTask<Params, Progress, Result>(val taskName: String, val context: Context) {
 
-    val logTAG by lazy {
+    private val logTAG by lazy {
         CoroutineAsyncTask::class.java.simpleName
     }
 
@@ -63,7 +64,7 @@ abstract class CoroutineAsyncTask<Params, Progress, Result>(val taskName: String
         status = Status.RUNNING
 
         // Needs access to main thread as it can setup UI
-        GlobalScope.launch(Dispatchers.Main) {
+        CoroutineScope(Dispatchers.Main).launch {
             preJob = launch(Dispatchers.Main) {
                 printLog("$taskName onPreExecute started")
                 onPreExecute()
@@ -93,7 +94,7 @@ abstract class CoroutineAsyncTask<Params, Progress, Result>(val taskName: String
             isCancelled = true
             status = Status.FINISHED
             if (bgJob!!.isCompleted) {
-                GlobalScope.launch(Dispatchers.Main) {
+                CoroutineScope(Dispatchers.Main).launch {
                     onCancelled(bgJob!!.await())
                 }
             }
@@ -104,7 +105,7 @@ abstract class CoroutineAsyncTask<Params, Progress, Result>(val taskName: String
     }
 
     fun publishProgress(vararg progress: Progress) {
-        GlobalScope.launch(Dispatchers.Main) {
+        CoroutineScope(Dispatchers.Main).launch {
             if (!isCancelled) {
                 onProgressUpdate(*progress)
             }

diff --git a/helperlib/src/main/java/com/itachi1706/helperlib/helpers/PrefHelper.kt b/helperlib/src/main/java/com/itachi1706/helperlib/helpers/PrefHelper.kt
@@ -20,7 +20,7 @@ object PrefHelper {
      * @return SharedPreference singleton object
      */
     @JvmStatic
-    fun getDefaultSharedPreferences(context: Context?): SharedPreferences {
+    fun getDefaultSharedPreferences(context: Context): SharedPreferences {
         val old = StrictMode.getThreadPolicy()
         StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder(old).permitDiskReads().build())
         val sp = PreferenceManager.getDefaultSharedPreferences(context)