beta4

adityapk00 · Feb 12, 2019 · fa002fb · fa002fb
1 parent 8b7a73d
commit fa002fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/com/adityapk/zcash/zqwandroid/ConnectionManager.kt b/app/src/main/java/com/adityapk/zcash/zqwandroid/ConnectionManager.kt
@@ -76,6 +76,10 @@ object ConnectionManager {
         }
     }
 
+    fun closeConnection() {
+        DataModel.ws?.close(1000, "Close requested")
+    }
+
     fun sendRefreshSignal(finished: Boolean) {
         val i = Intent(DATA_SIGNAL)
         i.putExtra("action", "refresh")

diff --git a/app/src/main/java/com/adityapk/zcash/zqwandroid/SettingsActivity.kt b/app/src/main/java/com/adityapk/zcash/zqwandroid/SettingsActivity.kt
@@ -15,17 +15,27 @@ class SettingsActivity : AppCompatActivity() {
         btnDisconnect.setOnClickListener {
             DataModel.setConnString(null, applicationContext)
             DataModel.clear()
+            ConnectionManager.closeConnection()
+
             updateUI()
         }
 
         chkDisallowInternet.setOnClickListener {
-            DataModel.setGlobalAllowInternet(chkDisallowInternet.isChecked)
+            DataModel.setGlobalAllowInternet(!chkDisallowInternet.isChecked)
+
+            if (chkDisallowInternet.isChecked) {
+                ConnectionManager.closeConnection()
+            }
+
+            updateUI()
         }
     }
 
     fun updateUI() {
         txtSettingsConnString.text = DataModel.getConnString(ZQWApp.appContext!!) ?: "Not Connected"
 
+        chkDisallowInternet.isChecked = !DataModel.getGlobalAllowInternet()
+
         lblVersionName.text = BuildConfig.VERSION_NAME
         lblServerVersion.text = DataModel.mainResponseData?.serverversion ?: "Not Connected"
     }