Merge pull request #2456 from hussainmohd-a/main

Author: hussainmohd-a

.github/detekt-config.yml

@@ -1,9 +1,31 @@
+# Detekt configuration file
+# Excludes test files from code scanning
+
 style:
- MaxLineLength:
+  MaxLineLength:
     active: true
     maxLineLength: 1400
     excludePackageStatements: true
     excludeImportStatements: true
     excludeCommentStatements: false
     excludeRawStrings: true
+  ForbiddenComment:
+    active: false
+
+exceptions:
+  TooGenericExceptionCaught:
+    active: true
+    exceptionNames:
+      - Throwable
+      - Error
+
+coroutines:
+  RedundantSuspendModifier:
+    active: false
+
+complexity:
+  TooManyFunctions:
+    active: false
+  LargeClass:
+    active: false
 

.github/workflows/sa.yml

@@ -33,6 +33,7 @@ jobs:
           java -jar detekt-cli-all.jar \
               --build-upon-default-config \
               --config .github/detekt-config.yml \
+              --excludes '**/src/test/**,**/src/androidTest/**,**/src/testDebug/**,**/src/testRelease/**,**/src/androidTestDebug/**,**/src/androidTestRelease/**,**/*Test.kt,**/*Tests.kt,**/*Spec.kt' \
               --fail-on-severity ${SEV} \
               --analysis-mode full \
               --api-version ${KOTLIN_VER} \
@@ -70,6 +71,7 @@ jobs:
           # category: rethink-app
 
       - name: 🗃️ Artifact
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: "rethink-app-detekt-${{ github.run_id }}.sarif"

.gitignore

@@ -28,3 +28,6 @@ app/src/headless/assets
 /tools
 /.kotlin/sessions
 app/google-services.json
+app/fdroidFull/release
+app/playFull/release
+app/websiteFull/release

app/build.gradle

@@ -4,17 +4,35 @@ plugins {
     id 'kotlin-android'
 }
 
+// ensure consistent JVM version for Java and Kotlin compilation
+// kotl.in/gradle/jvm/toolchain
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
 // apply Google Services and Firebase Crashlytics plugins conditionally
 // strategy: For command-line builds, check task names. For IDE, always apply plugins
 // but they'll only process play/website variants (Firebase deps are scoped to those variants)
 def taskNames = gradle.startParameter.taskNames.join(',').toLowerCase()
-def isFdroidBuild = taskNames.contains("fdroid")
+def apkBuild = taskNames.contains("full")
+def fdroidBuild = taskNames.contains("fdroid")
+
+// check for fdroidserver value is set in system env
+def fdroidBuildServer = System.getenv("fdroidserver")
+def isFdroidBuildServer = fdroidBuildServer != null && !fdroidBuildServer.isEmpty() && fdroidBuildServer != "null"
+def deGoogled = !apkBuild || fdroidBuild || isFdroidBuildServer
 
 println("app-task names: '$taskNames'")
-println("app; is fdroid build? $isFdroidBuild")
+println("gradle deGoogled? $deGoogled (fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer, apkBuild: $apkBuild)")
 
 // don't apply firebase plugins for fdroid CLI builds
-if (!isFdroidBuild) {
+if (!deGoogled) {
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'com.google.firebase.crashlytics'
     println("app firebase plugins applied")
@@ -145,7 +163,7 @@ android {
                 // This reduces the total symbol data Crashlytics needs to process
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
             }
-            if (!isFdroidBuild) {
+            if (!deGoogled) {
                 firebaseCrashlytics {
                     // Enable processing and uploading of native symbols to Firebase servers.
                     nativeSymbolUploadEnabled true
@@ -168,7 +186,7 @@ android {
 
     // fix: injectCrashlyticsBuildIds task has a buffer overflow bug
     // apply crashlytics configuration to firebase builds only
-    if (!isFdroidBuild) {
+    if (!deGoogled) {
         // workaround for crashlytics gradle plugin bug with large native symbols
         afterEvaluate {
             tasks.configureEach { task ->
@@ -187,6 +205,12 @@ android {
             }
         }
     }
+    kotlinOptions {
+        jvmTarget = '17'
+        freeCompilerArgs += [
+            '-Xsuppress-warning=SENSELESS_COMPARISON'
+        ]
+    }
 
     buildFeatures {
         viewBinding true
@@ -292,13 +316,13 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
     fullImplementation 'androidx.viewpager2:viewpager2:1.1.0'
 
-    fullImplementation 'com.squareup.okhttp3:okhttp:5.2.1'
-    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.2.1'
+    fullImplementation 'com.squareup.okhttp3:okhttp:5.3.2'
+    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.3.2'
 
     fullImplementation 'com.squareup.retrofit2:retrofit:3.0.0'
     fullImplementation 'com.squareup.retrofit2:converter-gson:3.0.0'
 
-    implementation 'com.squareup.okio:okio-jvm:3.16.2'
+    implementation 'com.squareup.okio:okio-jvm:3.16.4'
     // Glide
     fullImplementation('com.github.bumptech.glide:glide:5.0.5') {
         exclude group: 'glide-parent'
@@ -397,17 +421,12 @@ dependencies {
     // battery optimization permission helper
     implementation 'com.waseemsabir:betterypermissionhelper:1.0.3'
 
-    // Facebook battery metrics
-    implementation 'com.facebook.battery:metrics:1.0.0'
-    implementation 'com.facebook.battery:reporters:1.0.0'
-    implementation 'com.facebook.battery:serializers:1.0.0'
-
     // Firebase dependencies for error reporting (website and play variants only)
-    websiteImplementation platform('com.google.firebase:firebase-bom:34.4.0')
+    websiteImplementation platform('com.google.firebase:firebase-bom:34.6.0')
     websiteImplementation 'com.google.firebase:firebase-crashlytics'
     websiteImplementation 'com.google.firebase:firebase-crashlytics-ndk'
 
-    playImplementation platform('com.google.firebase:firebase-bom:34.4.0')
+    playImplementation platform('com.google.firebase:firebase-bom:34.6.0')
     playImplementation 'com.google.firebase:firebase-crashlytics'
     playImplementation 'com.google.firebase:firebase-crashlytics-ndk'
 }

app/lint.xml

@@ -4,4 +4,10 @@
     <issue id="all">
         <ignore regexp=".*/src/.*/res/values(?:-[^/]+)?/strings\.xml" />
     </issue>
+
+    <!-- Explicitly suppress StringFormatInvalid errors for translation files -->
+    <issue id="StringFormatInvalid" severity="ignore" />
+
+    <!-- Suppress StringFormatMatches errors for translation files (argument count mismatches) -->
+    <issue id="StringFormatMatches" severity="ignore" />
 </lint>

app/src/fdroid/java/com/celzero/bravedns/util/FirebaseErrorReporting.kt

@@ -20,59 +20,59 @@ import Logger.LOG_FIREBASE
 import org.koin.core.component.KoinComponent
 
 /**
- * Firebase Error Reporting Manager for F-Droid variant
- * This is a stub implementation since Firebase is not available in F-Droid builds
+ * Firebase Error Reporting Manager for fdroid variant
+ * This is a stub implementation since Firebase is not available in fdroid builds
  */
 object FirebaseErrorReporting : KoinComponent {
 
     const val TOKEN_REGENERATION_PERIOD_DAYS: Long = 45
     const val TOKEN_LENGTH = 16
     /**
-     * Initialize Firebase Crashlytics - No-op for F-Droid variant
+     * Initialize Firebase Crashlytics - no-op for fdroid variant
      */
     fun initialize() {
-        Logger.i(LOG_FIREBASE, "crashlytics not available in F-Droid variant")
+        Logger.i(LOG_FIREBASE, "crashlytics not available in fdroid variant")
     }
 
     /**
-     * Enable or disable Firebase Crashlytics data collection - No-op for F-Droid variant
+     * Enable or disable Firebase Crashlytics data collection - no-op for fdroid variant
      */
     fun setEnabled(enabled: Boolean) {
-        Logger.i(LOG_FIREBASE, "crashlytics not available in F-Droid variant")
+        Logger.i(LOG_FIREBASE, "crashlytics not available in fdroid variant")
     }
 
     /**
-     * Check if Firebase Crashlytics is available - Always false for F-Droid variant
+     * Check if Firebase Crashlytics is available - Always false for fdroid variant
      */
     fun isAvailable(): Boolean {
         return false
     }
 
     /**
-     * Log a custom message - No-op for F-Droid variant
+     * Log a custom message - no-op for fdroid variant
      */
-    fun log(message: String) {
-        // No-op: Firebase not available in F-Droid variant
+    fun log(msg: String) {
+        // no-op: firebase not available in fdroid variant
     }
 
     /**
-     * Record a non-fatal exception - No-op for F-Droid variant
+     * Record a non-fatal exception - no-op for fdroid variant
      */
     fun recordException(throwable: Throwable) {
-        // No-op: Firebase not available in F-Droid variant
+        // no-op: firebase not available in fdroid variant
     }
 
     /**
-     * Set user ID - No-op for F-Droid variant
+     * Set user ID - no-op for fdroid variant
      */
-    fun setUserId(userId: String) {
-        // No-op: Firebase not available in F-Droid variant
+    fun setUserId(uid: String) {
+        // no-op: firebase not available in fdroid variant
     }
 
     /**
-     * Set custom key-value pairs - No-op for F-Droid variant
+     * Set custom key-value pairs - no-op for fdroid variant
      */
     fun setCustomKey(key: String, value: String) {
-        // No-op: Firebase not available in F-Droid variant
+        // no-op: firebase not available in fdroid variant
     }
 }

app/src/full/AndroidManifest.xml

@@ -3,17 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".RethinkDnsApplication"
-        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppThemeInitial">
         <meta-data
             android:name="android.webkit.WebView.MetricsOptOut"
@@ -140,6 +132,8 @@
             android:finishOnTaskLaunch="true" />
         <activity android:name=".ui.activity.ConsoleLogActivity"
             android:finishOnTaskLaunch="true" />
+        <activity android:name=".ui.activity.EventsActivity"
+            android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.NotificationHandlerActivity"
             android:excludeFromRecents="true"
@@ -176,6 +170,14 @@
             android:finishOnTaskLaunch="true" />
         <activity android:name=".ui.activity.RpnWinProxyDetailsActivity"
             android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.BubbleActivity"
+            android:allowEmbedded="true"
+            android:resizeableActivity="true"
+            android:exported="false"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
+            android:launchMode="standard"/>
        <!-- <activity android:name=".ui.location.LocationSelectorActivity"
             android:finishOnTaskLaunch="true" />-->
 
@@ -187,7 +189,6 @@
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
             <intent-filter android:priority="999">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.USER_UNLOCKED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -212,6 +213,9 @@
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name=".receiver.BubbleDismissReceiver"
+            android:exported="false" />
 
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"

app/src/full/java/com/celzero/bravedns/RethinkDnsApplication.kt

@@ -17,13 +17,9 @@ package com.celzero.bravedns
 
 import Logger
 import Logger.LOG_TAG_SCHEDULER
-import android.app.Activity
 import android.app.Application
 import android.content.pm.ApplicationInfo
-import android.os.Bundle
 import android.os.StrictMode
-import com.celzero.bravedns.battery.BatteryStatsLogger
-import com.celzero.bravedns.battery.BatteryStatsProvider.logMetrics
 import com.celzero.bravedns.scheduler.ScheduleManager
 import com.celzero.bravedns.scheduler.WorkScheduler
 import com.celzero.bravedns.util.FirebaseErrorReporting
@@ -36,7 +32,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
 
-class RethinkDnsApplication : Application(), Application.ActivityLifecycleCallbacks {
+class RethinkDnsApplication : Application() {
     companion object {
         var DEBUG: Boolean = false
     }
@@ -57,20 +53,11 @@ class RethinkDnsApplication : Application(), Application.ActivityLifecycleCallba
         GlobalExceptionHandler.initialize(this)
         FirebaseErrorReporting.initialize()
 
-        // initialize battery stats provider (facebook battery-metrics)
-        try {
-            BatteryStatsLogger.start(this)
-        } catch (e: Exception) {
-            Logger.w(LOG_TAG_SCHEDULER, "battery-stats-init-failed: ${e.message}", e)
-        }
-
         turnOnStrictMode()
 
         CoroutineScope(SupervisorJob()).launch {
             scheduleJobs()
         }
-
-        registerActivityLifecycleCallbacks(this)
     }
 
     private suspend fun scheduleJobs() {
@@ -104,22 +91,4 @@ class RethinkDnsApplication : Application(), Application.ActivityLifecycleCallba
                 .build()
         )
     }
-
-    override fun onActivityCreated(p0: Activity, p1: Bundle?) {}
-
-    override fun onActivityDestroyed(p0: Activity) {}
-
-    override fun onActivityPaused(p0: Activity) {
-        logMetrics("foreground")
-    }
-
-    override fun onActivityResumed(p0: Activity) {
-        logMetrics("background")
-    }
-
-    override fun onActivitySaveInstanceState(p0: Activity, p1: Bundle) {}
-
-    override fun onActivityStarted(p0: Activity) {}
-
-    override fun onActivityStopped(p0: Activity) {}
 }