AirGuard Version 2.2

api.properties

@@ -1,2 +1,2 @@
-API_KEY="UCKgXwP.Dvmxyn1UygvnJfy2DV16OjbmHia4xXpd"
+API_KEY="AGdk9qPF.Bl9yatnjjoy9WEEjXYGVewE7ZyJET9Yy"
 API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"

app/build.gradle

@@ -17,16 +17,18 @@ android {
         viewBinding true
         dataBinding true
         compose true
+        buildConfig true
     }
 
+    compileSdk = 34
+
     defaultConfig {
         applicationId "de.seemoo.at_tracking_detection"
         minSdkVersion 28
-        targetSdkVersion 33
-        compileSdk 33
-        versionCode 39
-        versionName "2.1.1"
-
+        targetSdk = 34
+        versionCode 44
+        versionName "2.2"
+
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -64,7 +66,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.8"
+        kotlinCompilerExtensionVersion "1.5.11"
     }
 
 
@@ -91,79 +93,83 @@ dependencies {
 
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'com.github.bastienpaulfr:Treessence:1.0.0'
-    implementation 'androidx.work:work-runtime-ktx:2.8.1'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation "androidx.work:work-runtime-ktx:$work_version"
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.5'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.work:work-testing:2.8.1'
-    implementation 'androidx.core:core-ktx:1.10.1'
-    debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.5'
+    implementation "androidx.work:work-testing:$work_version"
+    implementation 'androidx.core:core-ktx:1.13.1'
+    debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.12'
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
-    implementation 'androidx.hilt:hilt-work:1.0.0'
-    implementation 'androidx.hilt:hilt-navigation-fragment:1.0.0'
+    implementation 'androidx.hilt:hilt-work:1.2.0'
+    implementation 'androidx.hilt:hilt-navigation-fragment:1.2.0'
 
     implementation 'com.github.AppIntro:AppIntro:6.1.0'
 
-    implementation 'org.osmdroid:osmdroid-android:6.1.16'
+    implementation 'org.osmdroid:osmdroid-android:6.1.18'
+    implementation 'com.github.MKergall:osmbonuspack:6.9.0'
 
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
 
     implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
 
-    implementation 'io.noties.markwon:core:4.6.2'
+    implementation 'com.github.mukeshsolanki:MarkdownView-Android:2.0.0'
+
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
 
 
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
-    kapt 'androidx.hilt:hilt-compiler:1.0.0'
+    kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.room:room-testing:2.5.2'
-    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+    androidTestImplementation "androidx.room:room-testing:$room_version"
+    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     //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.7.2'
+    implementation 'androidx.activity:activity-compose:1.9.0'
     // Compose Material Design
-    implementation 'androidx.compose.material:material:1.4.3'
+    implementation 'androidx.compose.material:material:1.6.7'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.4.3'
+    implementation 'androidx.compose.animation:animation:1.6.7'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.4.3'
+    implementation 'androidx.compose.ui:ui-tooling:1.6.7'
     // Integration with ViewModels
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.6.7'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"
 

app/proguard-rules.pro

@@ -72,4 +72,15 @@
 # R8 full mode strips generic signatures from return types if not kept.
 -keep,allowobfuscation,allowshrinking class retrofit2.Response
 
--keep class de.seemoo.at_tracking_detection.** { *; }
+# Keep Gson classes
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class com.google.gson.Gson { *; }
+-keep class com.google.gson.TypeAdapter { *; }
+-keep class com.google.gson.stream.JsonReader { *; }
+-keep class com.google.gson.stream.JsonWriter { *; }
+
+# Ensure that the classes related to Article are not stripped
+-keep class de.seemoo.at_tracking_detection.ui.dashboard.Article { *; }
+
+# Keep ProGuard/R8 from stripping out important methods or classes
+-keep class * implements com.google.gson.reflect.TypeToken { *; }