Release 1.10.

[PrivacyCell.git] / app / src / main / java / com / stoutner / privacycell / activities / SettingsActivity.kt

diff --git a/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt
index 098f45f8c54d8940429dc739e85a1ccb563aa844..c9fe9300f9cf50a89a7f8d69dce47b732a7f0502 100644 (file)
--- a/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt
@@ -24,7 +24,6 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.view.MenuItem
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
@@ -37,6 +36,9 @@ import com.stoutner.privacycell.fragments.SettingsFragment
 import com.stoutner.privacycell.services.RealtimeMonitoringService
 
 class SettingsActivity : AppCompatActivity(), NotificationPermissionDialogListener {
+    // Declare the class variables.
+    private lateinit var settingsFragment: SettingsFragment
+
     override fun onCreate(savedInstanceState: Bundle?) {
         // Run the default commands.
         super.onCreate(savedInstanceState)
@@ -66,8 +68,11 @@ class SettingsActivity : AppCompatActivity(), NotificationPermissionDialogListen
         // Display the home arrow on the action bar.
         actionBar.setDisplayHomeAsUpEnabled(true)
 
-        // Load the preferences fragment.
-        supportFragmentManager.beginTransaction().replace(R.id.preferences_framelayout, SettingsFragment()).commit()
+        // Instantiate the settings fragment.
+        settingsFragment = SettingsFragment()
+
+        // Load the settings fragment.
+        supportFragmentManager.beginTransaction().replace(R.id.preferences_framelayout, settingsFragment).commitNow()
     }
 
     override fun onCloseNotificationPermissionDialog() {
@@ -77,14 +82,6 @@ class SettingsActivity : AppCompatActivity(), NotificationPermissionDialogListen
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // As there is only one option, go back.
-        onBackPressed()
-
-        // Consume the event.
-        return true
-    }
-
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         // Run the default commands.
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
@@ -96,6 +93,9 @@ class SettingsActivity : AppCompatActivity(), NotificationPermissionDialogListen
             if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {  // The notification permission was granted.
                 // Start the realtime monitoring service.
                 startService(Intent(this, RealtimeMonitoringService::class.java))
+
+                // Update the realtime monitoring preference summary.
+                settingsFragment.updateRealtimeMonitoringSummary()
             }
         }
     }