From e1c32eb7f8403871227ea9435d68bf7c599ce19a Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 13 Dec 2018 13:10:19 -0600
Subject: [PATCH] Add methods to automatically change the theme to night mode
 when the user selects it and also avoid a crash in the TransfersLoader.

---
 .../bitsybitshareswallet/activities/MainActivity.kt        | 7 +++++++
 .../bitsybitshareswallet/fragments/SettingsFragment.kt     | 3 +--
 .../bitsybitshareswallet/processors/TransfersLoader.kt     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
index 52160f9..d968721 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
@@ -2,6 +2,7 @@ package cy.agorise.bitsybitshareswallet.activities
 
 import android.content.res.Resources
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.view.MenuItem
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
@@ -10,6 +11,7 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.onNavDestinationSelected
 import androidx.navigation.ui.setupActionBarWithNavController
 import cy.agorise.bitsybitshareswallet.R
+import cy.agorise.bitsybitshareswallet.utils.Constants
 import cy.agorise.graphenej.api.ConnectionStatusUpdate
 import cy.agorise.graphenej.models.JsonRpcResponse
 import kotlinx.android.synthetic.main.activity_main.*
@@ -21,6 +23,11 @@ class MainActivity : ConnectedActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        // Sets the theme to night mode if it has been selected by the user
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(Constants.KEY_NIGHT_MODE_ACTIVATED, false)) {
+            setTheme(R.style.Theme_Bitsy_Dark_NoActionBar)
+        }
         setContentView(R.layout.activity_main)
 
         setSupportActionBar(toolbar)
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
index f191b54..327e77a 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
@@ -40,8 +40,7 @@ class SettingsFragment : Fragment() {
                 .putBoolean(Constants.KEY_NIGHT_MODE_ACTIVATED, isChecked).apply()
 
             // Recreates the activity to apply the selected theme
-            // TODO find a way to automatically change the theme
-            // this.recreate()
+            activity?.recreate()
         }
     }
 }
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt
index be4c5b7..3cca418 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/processors/TransfersLoader.kt
@@ -155,7 +155,7 @@ class TransfersLoader(private var mContext: Context?): ServiceConnection {
     }
 
     override fun onServiceDisconnected(name: ComponentName?) {
-
+        mShouldUnbindNetwork = false
     }
 
     override fun onServiceConnected(name: ComponentName?, service: IBinder?) {