Settings: rename addDoor() to storeDoorSetup()

mwarning · Feb 13, 2025 · 9e6342b · 9e6342b
1 parent 969cda7
commit 9e6342b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/kotlin/app/trigger/BackupActivity.kt b/app/src/main/kotlin/app/trigger/BackupActivity.kt
@@ -100,7 +100,7 @@ class BackupActivity : AppCompatActivity() {
                 obj.put("id", Settings.getNewDoorIdentifier())
                 val door = Settings.fromJsonObject(obj)
                 if (door != null) {
-                    Settings.addDoor(door)
+                    Settings.storeDoorSetup(door)
                 }
                 count += 1
             }

diff --git a/app/src/main/kotlin/app/trigger/MainActivity.kt b/app/src/main/kotlin/app/trigger/MainActivity.kt
@@ -598,7 +598,7 @@ class MainActivity : AppCompatActivity(), OnTaskCompleted {
                     obj.put("name", new_name)
                     door = Settings.fromJsonObject(obj)
                     if (door != null) {
-                        Settings.addDoor(door)
+                        Settings.storeDoorSetup(door)
                     }
                     updateSpinner(false)
                 }

diff --git a/app/src/main/kotlin/app/trigger/QRScanActivity.kt b/app/src/main/kotlin/app/trigger/QRScanActivity.kt
@@ -133,7 +133,7 @@ class QRScanActivity : AppCompatActivity(), BarcodeCallback {
             obj.put("id", Settings.getNewDoorIdentifier())
             val setup = Settings.fromJsonObject(obj)
             if (setup != null) {
-                Settings.addDoor(setup)
+                Settings.storeDoorSetup(setup)
                 Toast.makeText(this, "Added ${setup.name}", Toast.LENGTH_LONG).show()
             } else {
                 Toast.makeText(this, "Invalid QR Code", Toast.LENGTH_LONG).show()

diff --git a/app/src/main/kotlin/app/trigger/Settings.kt b/app/src/main/kotlin/app/trigger/Settings.kt
@@ -42,7 +42,7 @@ object Settings {
                 if (ignore) {
                     door.ignore_hostname_mismatch = true
                 }
-                addDoor(door)
+                storeDoorSetup(door)
             }
             // remove old entries
             val e = sharedPreferences.edit()
@@ -77,7 +77,7 @@ object Settings {
                         if (ignore) {
                             door.ignore_hostname_mismatch = true
                         }
-                        addDoor(door)
+                        storeDoorSetup(door)
                     } else {
                         removeSetup_pre_172(id)
                     }
@@ -141,7 +141,7 @@ object Settings {
             var doors = getAllSetups_pre_172()
             for (door in doors) {
                 removeSetup_pre_172(door.id)
-                addDoor(door)
+                storeDoorSetup(door)
             }
             doors.clear()
             sharedPreferences.edit().putString("db_version", "1.8.0").commit()
@@ -378,7 +378,7 @@ object Settings {
     }
 
     // add to list and store to preferences
-    fun addDoor(door: Door): Boolean {
+    fun storeDoorSetup(door: Door): Boolean {
         if (door.id < 0) {
             return false
         }

diff --git a/app/src/main/kotlin/app/trigger/SetupActivity.kt b/app/src/main/kotlin/app/trigger/SetupActivity.kt
@@ -200,7 +200,7 @@ class SetupActivity : AppCompatActivity() {
             if (door.name.isEmpty()) {
                 showMessage(R.string.error_invalid_name)
             } else {
-                if (Settings.addDoor(door)) {
+                if (Settings.storeDoorSetup(door)) {
                     showMessage(R.string.done)
                     finish()
                 } else {

diff --git a/app/src/main/kotlin/app/trigger/nuki/NukiPairingCallback.kt b/app/src/main/kotlin/app/trigger/nuki/NukiPairingCallback.kt
@@ -1,7 +1,7 @@
 package app.trigger.nuki
 
 import app.trigger.Utils.byteArrayToHexString
-import app.trigger.Settings.addDoor
+import app.trigger.Settings
 import app.trigger.DoorReply.ReplyCode
 import android.bluetooth.BluetoothGattCharacteristic
 import org.libsodium.jni.Sodium
@@ -162,7 +162,7 @@ internal class NukiPairingCallback(door_id: Int, listener: OnTaskCompleted, var
                 setup.auth_id = auth_id
                 setup.app_id = app_id
                 setup.shared_key = byteArrayToHexString(shared_key)
-                addDoor(setup)
+                Settings.storeDoorSetup(setup)
                 listener.onTaskResult(door_id, ReplyCode.REMOTE_ERROR, "Pairing complete.")
                 closeConnection(gatt)
             } else {