Merge pull request #2 from muhammadisa/version-1.0.1

Bug fixes
muhammadisa · Aug 2, 2020 · d46a29f · d46a29f
2 parents 52b2876 + 83b7dd0
commit d46a29f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lifemarklibrary/src/main/java/com/xoxoer/lifemarklibrary/Lifemark.kt b/lifemarklibrary/src/main/java/com/xoxoer/lifemarklibrary/Lifemark.kt
@@ -9,6 +9,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.net.*
 import android.os.Build
+import android.util.Log
 import androidx.lifecycle.LiveData
 
 /*
@@ -49,10 +50,14 @@ class Lifemark constructor(private val context: Context) {
 
         override fun onInactive() {
             super.onInactive()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-                connectivityManager.unregisterNetworkCallback(connectivityManagerCallback())
-            else
-                context.unregisterReceiver(networkReceiver)
+            try{
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+                    connectivityManager.unregisterNetworkCallback(connectivityManagerCallback())
+                else
+                    context.unregisterReceiver(networkReceiver)
+            }catch (e: Exception) {
+                Log.e("Lifemark", "NetworkCallback already unregistered")
+            }
         }
 
         @TargetApi(Build.VERSION_CODES.LOLLIPOP)