v055o

app/build.gradle

@@ -4,8 +4,6 @@ plugins {
     // to download blocklists for the headless variant
     id "de.undercouch.download" version "5.3.0"
     id 'kotlin-android'
-    id 'com.google.gms.google-services'
-    id 'com.google.firebase.crashlytics'
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -173,9 +171,8 @@ configurations {
 }
 
 dependencies {
-    androidTestImplementation 'androidx.test:rules:1.5.0'
     def room_version = "2.6.1"
-    def paging_version = "3.2.1"
+    def paging_version = "3.3.2"
 
     implementation 'com.google.guava:guava:32.1.1-android'
 
@@ -184,8 +181,8 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 
     fullImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21'
-    fullImplementation 'androidx.appcompat:appcompat:1.6.1'
-    fullImplementation 'androidx.core:core-ktx:1.12.0'
+    fullImplementation 'androidx.appcompat:appcompat:1.7.0'
+    fullImplementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     fullImplementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     fullImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
@@ -194,7 +191,7 @@ dependencies {
     fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
     // LiveData
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.6'
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
@@ -204,14 +201,14 @@ dependencies {
     implementation "androidx.room:room-paging:$room_version"
 
     fullImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
-    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
+    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
 
     // Pagers Views
     implementation "androidx.paging:paging-runtime-ktx:$paging_version"
-    fullImplementation 'androidx.fragment:fragment-ktx:1.6.2'
-    implementation 'com.google.android.material:material:1.11.0'
-    fullImplementation 'androidx.viewpager2:viewpager2:1.0.0'
+    fullImplementation 'androidx.fragment:fragment-ktx:1.8.3'
+    implementation 'com.google.android.material:material:1.12.0'
+    fullImplementation 'androidx.viewpager2:viewpager2:1.1.0'
 
     fullImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
     fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
@@ -249,14 +246,14 @@ dependencies {
     fullImplementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.9'
 
     // from: https://jitpack.io/#celzero/firestack
-    download 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    websiteImplementation 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    fdroidImplementation 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    // debug symbols for crashlytics
-    playImplementation 'com.github.celzero:firestack:ee0a5ac71f:debug@aar'
+    download 'com.github.celzero:firestack:1b3c80f71e@aar'
+    websiteImplementation 'com.github.celzero:firestack:1b3c80f71e@aar'
+    fdroidImplementation 'com.github.celzero:firestack:1b3c80f71e@aar'
+    // debug symbols
+    playImplementation 'com.github.celzero:firestack:1b3c80f71e:debug@aar'
 
     // Work manager
-    implementation('androidx.work:work-runtime-ktx:2.9.0') {
+    implementation('androidx.work:work-runtime-ktx:2.9.1') {
         modules {
             module("com.google.guava:listenablefuture") {
                 replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
@@ -270,13 +267,14 @@ dependencies {
     implementation 'com.github.seancfoley:ipaddress:5.4.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 
     leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
-    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
-    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.8.0'
+    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.8.0'
 
     fullImplementation 'androidx.biometric:biometric:1.1.0'
 
@@ -285,16 +283,12 @@ dependencies {
 
     // for encrypting wireguard configuration files
     implementation("androidx.security:security-crypto:1.1.0-alpha06")
-    implementation("androidx.security:security-app-authenticator:1.0.0-alpha03")
-    androidTestImplementation("androidx.security:security-app-authenticator:1.0.0-alpha03")
+    implementation("androidx.security:security-app-authenticator:1.0.0-beta01")
+    androidTestImplementation("androidx.security:security-app-authenticator:1.0.0-beta01")
 
     // barcode scanner for wireguard
     fullImplementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-
-    // only using firebase crashlytics experimentally for stability tracking, only in play variant
-    // not in fdroid or website
-    playImplementation 'com.google.firebase:firebase-crashlytics:19.0.0'
-    playImplementation 'com.google.firebase:firebase-crashlytics-ndk:19.0.0'
+    fullImplementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
 }
 
 // github.com/michel-kraemer/gradle-download-task/issues/131#issuecomment-464476903

app/src/full/AndroidManifest.xml

@@ -10,6 +10,9 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
+    <uses-permission
+            android:name="android.permission.SYSTEM_ALERT_WINDOW"
+            android:minSdkVersion="34" />
 
     <application
         android:name=".RethinkDnsApplication"
@@ -113,6 +116,8 @@
         <activity
             android:name=".ui.activity.AppWiseDomainLogsActivity"
             android:finishOnTaskLaunch="true" />
+        <activity android:name=".ui.activity.ConsoleLogActivity"
+            android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.NotificationHandlerDialog"
             android:excludeFromRecents="true"
@@ -126,6 +131,15 @@
         <activity
             android:name=".ui.activity.AlertsActivity"
             android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.AntiCensorshipActivity"
+            android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.AdvancedSettingActivity"
+            android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.DomainConnectionsActivity"
+            android:finishOnTaskLaunch="true" />
 
         <receiver
             android:name=".receiver.BraveAutoStartReceiver"

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

@@ -3,7 +3,6 @@ package com.celzero.bravedns
 import Logger
 import Logger.LOG_TAG_SCHEDULER
 import android.app.Application
-import android.content.ComponentCallbacks2
 import android.content.pm.ApplicationInfo
 import android.os.StrictMode
 import com.celzero.bravedns.scheduler.ScheduleManager
@@ -62,6 +61,7 @@ class RethinkDnsApplication : Application() {
         get<ScheduleManager>().scheduleDatabaseRefreshJob()
         get<WorkScheduler>().scheduleDataUsageJob()
         get<WorkScheduler>().schedulePurgeConnectionsLog()
+        get<WorkScheduler>().schedulePurgeConsoleLogs()
     }
 
     private fun turnOnStrictMode() {

app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt

@@ -40,7 +40,8 @@ import kotlin.math.log2
 class AppWiseDomainsAdapter(
     val context: Context,
     val lifecycleOwner: LifecycleOwner,
-    val uid: Int
+    val uid: Int,
+    val isRethink: Boolean
 ) :
     PagingDataAdapter<AppConnection, AppWiseDomainsAdapter.ConnectionDetailsViewHolder>(
         DIFF_CALLBACK
@@ -68,9 +69,6 @@ class AppWiseDomainsAdapter(
 
     private lateinit var adapter: AppWiseDomainsAdapter
 
-    // ui component to update/toggle the buttons
-    data class ToggleBtnUi(val txtColor: Int, val bgColor: Int)
-
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
@@ -145,6 +143,10 @@ class AppWiseDomainsAdapter(
                 return
             }
 
+            if (isRethink) {
+                return
+            }
+
             val bottomSheetFragment = AppDomainRulesBottomSheet()
             // Fix: free-form window crash
             // all BottomSheetDialogFragment classes created must have a public, no-arg constructor.

app/src/full/java/com/celzero/bravedns/adapter/AppWiseIpsAdapter.kt

@@ -37,7 +37,7 @@ import com.celzero.bravedns.util.Utilities
 import com.celzero.bravedns.util.Utilities.removeBeginningTrailingCommas
 import kotlin.math.log2
 
-class AppWiseIpsAdapter(val context: Context, val lifecycleOwner: LifecycleOwner, val uid: Int) :
+class AppWiseIpsAdapter(val context: Context, val lifecycleOwner: LifecycleOwner, val uid: Int, val isRethink: Boolean) :
     PagingDataAdapter<AppConnection, AppWiseIpsAdapter.ConnectionDetailsViewHolder>(DIFF_CALLBACK),
     AppIpRulesBottomSheet.OnBottomSheetDialogFragmentDismiss {
 
@@ -112,6 +112,10 @@ class AppWiseIpsAdapter(val context: Context, val lifecycleOwner: LifecycleOwner
                 return
             }
 
+            if (isRethink) {
+                return
+            }
+
             val bottomSheetFragment = AppIpRulesBottomSheet()
             // Fix: free-form window crash
             // all BottomSheetDialogFragment classes created must have a public, no-arg constructor.