v055o

app/build.gradle

@@ -175,7 +175,7 @@ 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.0"
 
     implementation 'com.google.guava:guava:32.1.1-android'
 
@@ -184,8 +184,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 +194,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.2'
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
@@ -204,14 +204,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.2'
+    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2'
 
     // 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.0'
+    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,11 +249,11 @@ 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'
+    download 'com.github.celzero:firestack:364ac37a66@aar'
+    websiteImplementation 'com.github.celzero:firestack:364ac37a66@aar'
+    fdroidImplementation 'com.github.celzero:firestack:364ac37a66@aar'
     // debug symbols for crashlytics
-    playImplementation 'com.github.celzero:firestack:ee0a5ac71f:debug@aar'
+    playImplementation 'com.github.celzero:firestack:364ac37a66:debug@aar'
 
     // Work manager
     implementation('androidx.work:work-runtime-ktx:2.9.0') {
@@ -293,8 +293,8 @@ dependencies {
 
     // 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'
+    playImplementation 'com.google.firebase:firebase-crashlytics:19.0.1'
+    playImplementation 'com.google.firebase:firebase-crashlytics-ndk:19.0.1'
 }
 
 // github.com/michel-kraemer/gradle-download-task/issues/131#issuecomment-464476903

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

@@ -15,6 +15,7 @@
  */
 import android.util.Log
 import com.celzero.bravedns.service.PersistentState
+import com.celzero.bravedns.service.VpnController
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -40,7 +41,7 @@ object Logger : KoinComponent {
     const val LOG_GO_LOGGER = "LibLogger"
 
     // github.com/celzero/firestack/blob/bce8de917fec5e48a41ed1e96c9d942ee0f7996b/intra/log/logger.go#L76
-    enum class LoggerType(val id: Int) {
+    enum class LoggerType(val id: Long) {
         VERY_VERBOSE(0),
         VERBOSE(1),
         DEBUG(2),
@@ -72,6 +73,10 @@ object Logger : KoinComponent {
             return this == STACKTRACE
         }
 
+        fun isLessThan(level: LoggerType): Boolean {
+            return this.id < level.id
+        }
+
         fun user(): Boolean {
             return this == USR
         }
@@ -105,6 +110,14 @@ object Logger : KoinComponent {
         log(tag, message, LoggerType.ERROR, e)
     }
 
+    fun enableCrashlytics() {
+        // no-op, crashlytics is not used for F-Droid builds
+    }
+
+    fun disableCrashlytics() {
+        // no-op, crashlytics is not used for F-Droid builds
+    }
+
     fun updateConfigLevel(level: Long) {
         logLevel = level
     }
@@ -129,5 +142,18 @@ object Logger : KoinComponent {
             LoggerType.USR -> {} // Do nothing
             LoggerType.NONE -> {} // Do nothing
         }
+        if (type.id >= logLevel) {
+            // get the first letter of the level and append it to the tag
+            val l = when (type) {
+                LoggerType.VERBOSE -> "V"
+                LoggerType.DEBUG -> "D"
+                LoggerType.INFO -> "I"
+                LoggerType.WARN -> "W"
+                LoggerType.ERROR -> "E"
+                LoggerType.STACKTRACE -> "E"
+                else -> "V"
+            }
+            VpnController.writeConsoleLog("$l $tag: $msg")
+        }
     }
 }

app/src/full/AndroidManifest.xml

@@ -113,6 +113,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"

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

@@ -62,6 +62,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/ConsoleLogAdapter.kt

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2024 RethinkDNS and its authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.celzero.bravedns.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.paging.PagingDataAdapter
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.celzero.bravedns.R
+import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG
+import com.celzero.bravedns.database.ConsoleLog
+import com.celzero.bravedns.databinding.ListItemConsoleLogBinding
+import com.celzero.bravedns.util.Constants.Companion.TIME_FORMAT_1
+import com.celzero.bravedns.util.UIUtils
+import com.celzero.bravedns.util.Utilities
+
+class ConsoleLogAdapter(private val context: Context) :
+    PagingDataAdapter<ConsoleLog, ConsoleLogAdapter.ConsoleLogViewHolder>(DIFF_CALLBACK) {
+
+    companion object {
+        private val DIFF_CALLBACK =
+            object : DiffUtil.ItemCallback<ConsoleLog>() {
+                override fun areItemsTheSame(old: ConsoleLog, new: ConsoleLog): Boolean {
+                    return old == new
+                }
+
+                override fun areContentsTheSame(old: ConsoleLog, new: ConsoleLog): Boolean {
+                    return old == new
+                }
+            }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConsoleLogViewHolder {
+        val itemBinding =
+            ListItemConsoleLogBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ConsoleLogViewHolder(itemBinding)
+    }
+
+    override fun onBindViewHolder(holder: ConsoleLogViewHolder, position: Int) {
+        val logInfo: ConsoleLog = getItem(position) ?: return
+        holder.update(logInfo)
+    }
+
+    inner class ConsoleLogViewHolder(private val b: ListItemConsoleLogBinding) :
+        RecyclerView.ViewHolder(b.root) {
+
+        fun update(log: ConsoleLog) {
+            // update the textview color with the first letter of the log level
+            val logLevel = log.message.first()
+            when (logLevel) {
+                'V' ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.primaryLightColorText)
+                    )
+                'D' ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.primaryLightColorText)
+                    )
+                'I' ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.defaultToggleBtnTxt)
+                    )
+                'W' ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.firewallWhiteListToggleBtnTxt)
+                    )
+                'E' ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.firewallBlockToggleBtnTxt)
+                    )
+                else ->
+                    b.logDetail.setTextColor(
+                        UIUtils.fetchColor(context, R.attr.firewallNoRuleToggleBtnTxt)
+                    )
+            }
+            b.logDetail.text = log.message
+            if (DEBUG) {
+                b.logTimestamp.text =
+                    " ${log.id} ${Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1)}"
+            } else {
+                b.logTimestamp.text = Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1)
+            }
+        }
+    }
+}