Merge pull request #201 from seemoo-lab/development

Optimized Scanning

Author: Sn0wfreezeDev

api.properties

@@ -1,2 +1,2 @@
-API_KEY="GGzcJJ3J.EtaKNlPiZ6euI5JBI6OwoVSyH9sG9Q2q"
+API_KEY="g3T1wgsH.bb40FsxMYET7HC12I8CH83jtQ1FT0a9A"
 API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"

app/build.gradle

@@ -28,9 +28,8 @@ android {
         applicationId "de.seemoo.at_tracking_detection"
         minSdkVersion 28
         targetSdk = 35
-        versionCode 51
-        versionName "2.4.1"
-        
+        versionCode 52
+        versionName "2.5"
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -44,6 +43,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             applicationIdSuffix ".release"
             resValue "bool", "debug", "false"
+            ndk {
+                debugSymbolLevel = "FULL"
+            }
         }
         debug {
             minifyEnabled false
@@ -85,13 +87,13 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.7'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.8.7'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.9'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.9'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -103,9 +105,10 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.11.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation "androidx.work:work-testing:$work_version"
-    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.core:core-ktx:1.16.0'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'
 
     implementation "com.google.dagger:hilt-android:$hilt_compiler_version"
@@ -127,35 +130,35 @@ dependencies {
 
     ksp "com.google.dagger:hilt-compiler:$hilt_compiler_version"
     ksp "androidx.hilt:hilt-compiler:$hilt_version"
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
-
+    
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     ksp "androidx.room:room-compiler:$room_version"
 
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation "androidx.room:room-testing:$room_version"
-    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1'
+    
+    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
     androidTestImplementation 'androidx.test:core:1.6.1'
     androidTestImplementation 'androidx.test:core-ktx:1.6.1'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
     androidTestImplementation 'androidx.test:runner:1.6.2'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
     //Finds memory leaks while running the app in Debug mode
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 
     //Compose
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.10.0'
+    implementation 'androidx.activity:activity-compose:1.10.1'
     // Compose Material3 Design
-    implementation 'androidx.compose.material3:material3:1.3.1'
-    implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
+    implementation 'androidx.compose.material3:material3:1.3.2'
+    implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
     // Animations
     implementation 'androidx.compose.animation:animation:1.7.8'
     // Tooling support (Previews, etc.)

app/proguard-rules.pro

@@ -35,6 +35,16 @@
     @retrofit2.http.* <methods>;
 }
 
+-keepclassmembers class * {
+      @com.google.gson.annotations.SerializedName <fields>;
+      @de.seemoo.at_tracking_detection.database.relations.DeviceBeaconNotification <fields>;
+      @de.seemoo.at_tracking_detection.statistics.api.models.** <fields>;
+}
+
+-keepclassmembers class de.seemoo.at_tracking_detection.database.** { <fields>; }
+
+-keepclassmembers class de.seemoo.at_tracking_detection.statistics.api.models.** { <fields>; }
+
 # Ignore annotation used for build tooling.
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
@@ -109,3 +119,9 @@
 
 # Keep the SharedPrefs class and its methods
 -keep class de.seemoo.at_tracking_detection.util.SharedPrefs { *; }
+
+# Keep Gson annotations
+-keepattributes Signature,RuntimeVisibleAnnotations
+
+# Keep all data classes with Gson annotations
+-keep class de.seemoo.at_tracking_detection.database.relations.** { *; }