Merge pull request #210 from simondankelmann/simondankelmann/dbMigration

Simondankelmann/db migration
simondankelmann · Jan 2, 2024 · 72e0aee · 72e0aee
2 parents 9bf1b6f + a155268
commit 72e0aee
Show file tree

Hide file tree

Showing 27 changed files with 140 additions and 387 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,7 +16,7 @@ android {
         minSdk = 26
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0.7"
+        versionName = "1.0.8"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk
diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0.7",
+      "versionName": "1.0.8",
       "outputFile": "app-debug.apk"
     }
   ],

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0.7",
+      "versionName": "1.0.8",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/...etoothlespam/AdvertisementSetGenerators/ContinuityActionModalAdvertisementSetGenerator.kt b/...etoothlespam/AdvertisementSetGenerators/ContinuityActionModalAdvertisementSetGenerator.kt
@@ -84,10 +84,12 @@ class ContinuityActionModalAdvertisementSetGenerator: IAdvertisementSetGenerator
     }
 
     private val _manufacturerId = 76 // 0x004c == 76 = Apple
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets: MutableList<AdvertisementSet> = mutableListOf()
 
-        _nearbyActions.map { nearbyAction ->
+        val data = inputData ?: _nearbyActions
+
+        data.map { nearbyAction ->
             var advertisementSet: AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_IOS
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_CONTINUITY_ACTION_MODALS

diff --git a/...uetoothlespam/AdvertisementSetGenerators/ContinuityIos17CrashAdvertisementSetGenerator.kt b/...uetoothlespam/AdvertisementSetGenerators/ContinuityIos17CrashAdvertisementSetGenerator.kt
@@ -88,10 +88,12 @@ class ContinuityIos17CrashAdvertisementSetGenerator: IAdvertisementSetGenerator
             return advertisementSet
         }
     }
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets: MutableList<AdvertisementSet> = mutableListOf()
 
-        _nearbyActions.map { nearbyAction ->
+        val data = inputData ?: _nearbyActions
+
+        data.map { nearbyAction ->
             var advertisementSet: AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_IOS
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_CONTINUITY_IOS_17_CRASH

diff --git a/...othlespam/AdvertisementSetGenerators/ContinuityNewAirtagPopUpAdvertisementSetGenerator.kt b/...othlespam/AdvertisementSetGenerators/ContinuityNewAirtagPopUpAdvertisementSetGenerator.kt
@@ -100,10 +100,12 @@ class ContinuityNewAirtagPopUpAdvertisementSetGenerator: IAdvertisementSetGenera
         }
     }
 
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        deviceData.forEach{deviceData ->
+        val data = inputData ?: deviceData
+
+        data.forEach{deviceData ->
             val colorMap = getColorMap(deviceData.key)
             val prefix = "05" // => NEW AIRTAG
 

diff --git a/...othlespam/AdvertisementSetGenerators/ContinuityNewDevicePopUpAdvertisementSetGenerator.kt b/...othlespam/AdvertisementSetGenerators/ContinuityNewDevicePopUpAdvertisementSetGenerator.kt
@@ -96,10 +96,12 @@ class ContinuityNewDevicePopUpAdvertisementSetGenerator: IAdvertisementSetGenera
         }
     }
 
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        deviceData.forEach{deviceData ->
+        val data = inputData ?: deviceData
+
+        data.forEach{deviceData ->
 
             val prefix = "07" // => NEW DEVICE
             val color = "00"

diff --git a/...espam/AdvertisementSetGenerators/ContinuityNotYourDevicePopUpAdvertisementSetGenerator.kt b/...espam/AdvertisementSetGenerators/ContinuityNotYourDevicePopUpAdvertisementSetGenerator.kt
@@ -263,10 +263,12 @@ class ContinuityNotYourDevicePopUpAdvertisementSetGenerator: IAdvertisementSetGe
         }
     }
 
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        deviceData.forEach{deviceData ->
+        val data = inputData ?: deviceData
+
+        data.forEach{deviceData ->
             val colorMap = getColorMap(deviceData.key)
             val prefix = "01" // => NOT YOUR DEVICE
 

diff --git a/...mann/bluetoothlespam/AdvertisementSetGenerators/EasySetupBudsAdvertisementSetGenerator.kt b/...mann/bluetoothlespam/AdvertisementSetGenerators/EasySetupBudsAdvertisementSetGenerator.kt
@@ -56,11 +56,13 @@ class EasySetupBudsAdvertisementSetGenerator:IAdvertisementSetGenerator{
         "011716" to "Sleek Black Buds2",
     )
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
+        val data = inputData ?: _genuineBudsIds
+
         // BUDS
-        _genuineBudsIds.map {
+        data.map {
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_SAMSUNG
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_EASY_SETUP_BUDS

diff --git a/...ann/bluetoothlespam/AdvertisementSetGenerators/EasySetupWatchAdvertisementSetGenerator.kt b/...ann/bluetoothlespam/AdvertisementSetGenerators/EasySetupWatchAdvertisementSetGenerator.kt
@@ -54,13 +54,13 @@ class EasySetupWatchAdvertisementSetGenerator:IAdvertisementSetGenerator{
         "20" to "Green Watch6 Classic 43m",
     )
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-
+        val data = inputData ?: _genuineWatchIds
 
         // WATCHES
-        _genuineWatchIds.map {
+        data.map {
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_SAMSUNG
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_EASY_SETUP_WATCH

diff --git a/...mann/bluetoothlespam/AdvertisementSetGenerators/FastPairDebugAdvertisementSetGenerator.kt b/...mann/bluetoothlespam/AdvertisementSetGenerators/FastPairDebugAdvertisementSetGenerator.kt
@@ -41,10 +41,12 @@ class FastPairDebugAdvertisementSetGenerator:IAdvertisementSetGenerator{
 
     val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        _genuineDeviceIds.map {
+        val data = inputData ?: _genuineDeviceIds
+
+        data.map {
 
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_ANDROID

diff --git a/...nn/bluetoothlespam/AdvertisementSetGenerators/FastPairDevicesAdvertisementSetGenerator.kt b/...nn/bluetoothlespam/AdvertisementSetGenerators/FastPairDevicesAdvertisementSetGenerator.kt
@@ -511,10 +511,12 @@ class FastPairDevicesAdvertisementSetGenerator:IAdvertisementSetGenerator{
 
     val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        _genuineDeviceIds.map {
+        val data = inputData ?: _genuineDeviceIds
+
+        data.map {
 
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_ANDROID

diff --git a/...etoothlespam/AdvertisementSetGenerators/FastPairNonProductionAdvertisementSetGenerator.kt b/...etoothlespam/AdvertisementSetGenerators/FastPairNonProductionAdvertisementSetGenerator.kt
@@ -55,10 +55,12 @@ class FastPairNonProductionAdvertisementSetGenerator:IAdvertisementSetGenerator{
 
     val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        _genuineDeviceIds.map {
+        val data = inputData ?: _genuineDeviceIds
+
+        data.map {
 
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_ANDROID

diff --git a/...bluetoothlespam/AdvertisementSetGenerators/FastPairPhoneSetupAdvertisementSetGenerator.kt b/...bluetoothlespam/AdvertisementSetGenerators/FastPairPhoneSetupAdvertisementSetGenerator.kt
@@ -29,10 +29,12 @@ class FastPairPhoneSetupAdvertisementSetGenerator:IAdvertisementSetGenerator{
 
     val serviceUuid = ParcelUuid(UUID.fromString("0000fe2c-0000-1000-8000-00805f9b34fb"))
 
-    override fun getAdvertisementSets():List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        _genuineDeviceIds.map {
+        val data = inputData ?: _genuineDeviceIds
+
+        data.map {
 
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_ANDROID

diff --git a/...simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/IAdvertisementSetGenerator.kt b/...simon/dankelmann/bluetoothlespam/AdvertisementSetGenerators/IAdvertisementSetGenerator.kt
@@ -3,5 +3,6 @@ package de.simon.dankelmann.bluetoothlespam.AdvertisementSetGenerators
 import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSet
 
 interface IAdvertisementSetGenerator {
-    fun getAdvertisementSets():List<AdvertisementSet>
+    fun getAdvertisementSets(inputData: Map<String, String>?):List<AdvertisementSet>
+
 }
diff --git a/...ann/bluetoothlespam/AdvertisementSetGenerators/LovespousePlayAdvertisementSetGenerator.kt b/...ann/bluetoothlespam/AdvertisementSetGenerators/LovespousePlayAdvertisementSetGenerator.kt
@@ -57,10 +57,12 @@ class LovespousePlayAdvertisementSetGenerator:IAdvertisementSetGenerator {
 
     private val _manufacturerId = 255 // 0xFF == 255 == Typo Products, LLC
 
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets: MutableList<AdvertisementSet> = mutableListOf()
 
-        lovespousePlays.forEach { lovespousePlay ->
+        val data = inputData ?: lovespousePlays
+
+        data.forEach { lovespousePlay ->
             var advertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_LOVESPOUSE
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_LOVESPOUSE_PLAY

diff --git a/...ann/bluetoothlespam/AdvertisementSetGenerators/LovespouseStopAdvertisementSetGenerator.kt b/...ann/bluetoothlespam/AdvertisementSetGenerators/LovespouseStopAdvertisementSetGenerator.kt
@@ -33,10 +33,12 @@ class LovespouseStopAdvertisementSetGenerator:IAdvertisementSetGenerator {
 
     private val _manufacturerId = 255 // 0xFF == 255 == Typo Products, LLC
 
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets: MutableList<AdvertisementSet> = mutableListOf()
 
-        lovespouseStops.forEach { lovespouseStop ->
+        val data = inputData ?: lovespouseStops
+
+        data.forEach { lovespouseStop ->
             var advertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_LOVESPOUSE
             advertisementSet.type = AdvertisementSetType.ADVERTISEMENT_TYPE_LOVESPOUSE_STOP

diff --git a/...nkelmann/bluetoothlespam/AdvertisementSetGenerators/SwiftPairAdvertisementSetGenerator.kt b/...nkelmann/bluetoothlespam/AdvertisementSetGenerators/SwiftPairAdvertisementSetGenerator.kt
@@ -22,23 +22,27 @@ class SwiftPairAdvertisementSetGenerator : IAdvertisementSetGenerator {
     // https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/external/ble_spam/protocols/swiftpair.c
 
     private val _prependedBytes = StringHelpers.decodeHex("030080")
-    private var _deviceNames = mutableListOf(
-        "Device 1",
-        "Device 2",
-        "Device 3",
-        "Device 4",
-        "Device 5",
-        "Device 6",
-        "Device 7",
-        "Device 8",
-        "Device 9",
-        "Device 10")
+
+    private val _deviceNames = mapOf(
+        "Device 1" to "Not used...",
+        "Device 2" to "Not used...",
+        "Device 3" to "Not used...",
+        "Device 4" to "Not used...",
+        "Device 5" to "Not used...",
+        "Device 6" to "Not used...",
+        "Device 7" to "Not used...",
+        "Device 8" to "Not used...",
+        "Device 9" to "Not used...",
+        "Device 10" to "Not used...",
+    )
 
     private val _manufacturerId = 6 // 0x0006 == 6 = Microsoft
-    override fun getAdvertisementSets(): List<AdvertisementSet> {
+    override fun getAdvertisementSets(inputData: Map<String, String>?): List<AdvertisementSet> {
         var advertisementSets:MutableList<AdvertisementSet> = mutableListOf()
 
-        _deviceNames.map {deviceName ->
+        val data = inputData ?: _deviceNames
+
+        data.map {deviceName ->
 
             var advertisementSet:AdvertisementSet = AdvertisementSet()
             advertisementSet.target = AdvertisementTarget.ADVERTISEMENT_TARGET_WINDOWS
@@ -63,15 +67,15 @@ class SwiftPairAdvertisementSetGenerator : IAdvertisementSetGenerator {
 
             val manufacturerSpecificData = ManufacturerSpecificData()
             manufacturerSpecificData.manufacturerId = _manufacturerId
-            manufacturerSpecificData.manufacturerSpecificData = _prependedBytes.plus(deviceName.toByteArray())
+            manufacturerSpecificData.manufacturerSpecificData = _prependedBytes.plus(deviceName.key.toByteArray())
             advertisementSet.advertiseData.manufacturerData.add(manufacturerSpecificData)
             advertisementSet.advertiseData.includeTxPower = false
 
             // Scan Response
             // advertisementSet.scanResponse.includeTxPower = false
 
             // General Data
-            advertisementSet.title = deviceName
+            advertisementSet.title = deviceName.key
 
             // Callbacks
             advertisementSet.advertisingSetCallback = GenericAdvertisingSetCallback()

diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Database/AppDatabase.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Database/AppDatabase.kt
@@ -42,6 +42,7 @@ import de.simon.dankelmann.bluetoothlespam.Database.Entities.AdvertisingSetParam
 import de.simon.dankelmann.bluetoothlespam.Database.Entities.AssociatonCollectionListEntity
 import de.simon.dankelmann.bluetoothlespam.Database.Entities.AssociationListSetEntity
 import de.simon.dankelmann.bluetoothlespam.Database.Entities.PeriodicAdvertisingParametersEntity
+import de.simon.dankelmann.bluetoothlespam.Database.Migrations.Migration_1_2
 import de.simon.dankelmann.bluetoothlespam.Helpers.DatabaseHelpers
 
 @androidx.room.Database(
@@ -56,7 +57,7 @@ import de.simon.dankelmann.bluetoothlespam.Helpers.DatabaseHelpers
                 AssociatonCollectionListEntity::class,
                 AssociationListSetEntity::class,
                 PeriodicAdvertisingParametersEntity::class],
-    version = 1,
+    version = 2,
     exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
 
@@ -94,6 +95,8 @@ abstract class AppDatabase : RoomDatabase() {
         private fun buildDatabase(context: Context) =
             Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, "BluetoothLeSpamDatabase.db")
                 .addCallback(seedDatabaseCallback(context))
+                .addMigrations(Migration_1_2)
+                //.fallbackToDestructiveMigration()
                 .build()
 
         private fun seedDatabaseCallback(context: Context): Callback {
@@ -136,7 +139,7 @@ abstract class AppDatabase : RoomDatabase() {
             )
 
             advertisementSetGenerators.forEach{ generator ->
-                val advertisementSets = generator.getAdvertisementSets()
+                val advertisementSets = generator.getAdvertisementSets(null)
                 advertisementSets.forEach{ advertisementSet ->
                     DatabaseHelpers.saveAdvertisementSet(advertisementSet)
                 }

diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Database/Migrations/Migration_1_2.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/Database/Migrations/Migration_1_2.kt
@@ -0,0 +1,41 @@
+package de.simon.dankelmann.bluetoothlespam.Database.Migrations
+
+import android.util.Log
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import de.simon.dankelmann.bluetoothlespam.AdvertisementSetGenerators.ContinuityActionModalAdvertisementSetGenerator
+import de.simon.dankelmann.bluetoothlespam.AppContext.AppContext
+import de.simon.dankelmann.bluetoothlespam.Database.AppDatabase
+import de.simon.dankelmann.bluetoothlespam.Helpers.DatabaseHelpers
+
+val Migration_1_2 = object : Migration(1,2) {
+    private val _logTag = "Migration_1_2"
+
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        Log.d(_logTag, "Executing Migration...")
+
+        val nearbyActionsAdded = mapOf(
+            "05" to "Apple Watch",
+            "24" to "Apple Vision Pro",
+            "2F" to "Connect to other Device",
+            "21" to "Software Update",
+        )
+
+
+        val continuityActionModalAdvertisementSetGenerator = ContinuityActionModalAdvertisementSetGenerator()
+        val nearbyActionsAddedAdvertisementSets = continuityActionModalAdvertisementSetGenerator.getAdvertisementSets(nearbyActionsAdded)
+
+        Thread {
+            synchronized(this) {
+                AppDatabase.getInstance().isSeeding = true
+                nearbyActionsAddedAdvertisementSets.forEach{ advertisementSet ->
+                    DatabaseHelpers.saveAdvertisementSet(advertisementSet)
+                }
+                AppDatabase.getInstance().isSeeding = false
+            }
+        }.start()
+
+        Log.d(_logTag, "Finished Executing Migration...")
+    }
+}