Merge Debug build type

.gitignore

@@ -60,3 +60,5 @@ kotlin-ide/
 .kotlin/
 .teamcity
 .idea/
+.aider*
+.env

app/build.gradle.kts

@@ -30,6 +30,13 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            signingConfig = signingConfigs.getByName("debug")
+        }
+
+        debug {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
         }
     }
     compileOptions {
@@ -145,4 +152,7 @@ dependencies {
 
     // For JSON serialisation
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+
+    // For Debug Build
+    implementation("com.jakewharton.timber:timber:5.0.1")
 }

app/src/main/AndroidManifest.xml

@@ -83,7 +83,7 @@
         </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.greybox.projectmesh.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
 

app/src/main/java/com/greybox/projectmesh/MNetLoggerAndroid.kt

@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import java.io.File
 import java.text.DateFormat
 import java.util.Date
@@ -52,12 +53,12 @@ class MNetLoggerAndroid(
 
     private fun doLog(priority: Int, message: String, exception: Exception?) {
         when (priority) {
-            Log.VERBOSE -> Log.v(MeshrabiyaConstants.LOG_TAG, message, exception)
-            Log.DEBUG -> Log.d(MeshrabiyaConstants.LOG_TAG, message, exception)
-            Log.INFO -> Log.i(MeshrabiyaConstants.LOG_TAG, message, exception)
-            Log.WARN -> Log.w(MeshrabiyaConstants.LOG_TAG, message, exception)
-            Log.ERROR -> Log.e(MeshrabiyaConstants.LOG_TAG, message, exception)
-            Log.ASSERT -> Log.wtf(MeshrabiyaConstants.LOG_TAG, message, exception)
+            Log.VERBOSE -> Timber.tag(MeshrabiyaConstants.LOG_TAG).v(exception, message)
+            Log.DEBUG -> Timber.tag(MeshrabiyaConstants.LOG_TAG).d(exception, message)
+            Log.INFO -> Timber.tag(MeshrabiyaConstants.LOG_TAG).i(exception, message)
+            Log.WARN -> Timber.tag(MeshrabiyaConstants.LOG_TAG).w(exception, message)
+            Log.ERROR -> Timber.tag(MeshrabiyaConstants.LOG_TAG).e(exception, message)
+            Log.ASSERT -> Timber.tag(MeshrabiyaConstants.LOG_TAG).wtf(exception, message)
         }
 
         val logDisplay = buildString {

app/src/main/java/com/greybox/projectmesh/components/WifiConnection.kt

@@ -28,7 +28,6 @@ import com.ustadmobile.meshrabiya.vnet.wifi.WifiConnectException
 import java.util.regex.Pattern
 import android.util.Log
 
-
 // This File is to pre-check the wifi connection, reusing from Meshrabiya test app
 /*
 WorkFlow:

app/src/main/java/com/greybox/projectmesh/debug/CrashHandler.kt

@@ -1,13 +1,9 @@
 package com.greybox.projectmesh.debug
 
-import android.R.layout
 import android.content.Context
 import android.content.Intent
-import android.util.Log
-import android.widget.FrameLayout
-import android.widget.PopupWindow
 import com.google.gson.Gson
-import org.xml.sax.helpers.DefaultHandler
+import timber.log.Timber
 import java.lang.Exception
 import java.lang.Thread.UncaughtExceptionHandler
 import kotlin.system.exitProcess
@@ -29,7 +25,7 @@ class CrashHandler(private val context: Context, private val defaultHandler: Unc
     {
         val crashIntent = Intent(applicationContext, activity).also {
             it.putExtra("CrashData", Gson().toJson(exception))
-            Log.e("Project Mesh Error","Error: ",exception);
+            Timber.tag("Project Mesh Error").e(exception, "Error: ");
         }
 
         crashIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -50,7 +46,7 @@ class CrashHandler(private val context: Context, private val defaultHandler: Unc
                 Gson().fromJson(intent.getStringExtra("CrashData"), Throwable::class.java)
             }
             catch (e: Exception) {
-                Log.e("CrashHandler","getThrowableFromIntent: ",e);
+                Timber.tag("CrashHandler",).e(e,"getThrowableFromIntent: ");
                 null
             }
 

app/src/main/java/com/greybox/projectmesh/logging/ReleaseTree.kt

@@ -0,0 +1,20 @@
+package com.greybox.projectmesh.logging
+
+import android.util.Log
+import timber.log.Timber
+
+class ReleaseTree : Timber.Tree() {
+    @Suppress("LogNotTimber")
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        // Log WARN and ERROR only to avoid leaking debug info in release
+        if (priority == Log.ERROR || priority == Log.WARN) {
+            val safeTag = tag ?: "ReleaseTree"
+            Log.println(priority, safeTag, message)
+
+            // Log Exceptions if present
+            t?.let {
+                Log.e(safeTag, "Exception: $message", it)
+            }
+        }
+    }
+}

app/src/main/java/com/greybox/projectmesh/messaging/data/entities/FileEncoder.kt

@@ -5,53 +5,12 @@ import android.net.Uri
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
-import java.io.OutputStream
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
-import android.content.SharedPreferences
-import android.os.Build
-import android.util.Log
-import com.greybox.projectmesh.GlobalApp
-import com.greybox.projectmesh.db.MeshDatabase
-import com.greybox.projectmesh.messaging.data.entities.Message
-import com.greybox.projectmesh.messaging.network.MessageNetworkHandler
-import com.greybox.projectmesh.extension.updateItem
-import com.greybox.projectmesh.testing.TestDeviceService
-import com.ustadmobile.meshrabiya.ext.copyToWithProgressCallback
-import com.ustadmobile.meshrabiya.util.FileSerializer
-import com.ustadmobile.meshrabiya.util.InetAddressSerializer
-import fi.iki.elonen.NanoHTTPD
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.flow.updateAndGet
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.internal.headersContentLength
-import java.io.Closeable
 import java.net.InetAddress
 import java.net.URLEncoder
-import java.util.concurrent.atomic.AtomicInteger
-import com.greybox.projectmesh.extension.getUriNameAndSize
-import org.kodein.di.DI
-import org.kodein.di.DIAware
-import org.kodein.di.instance
-import okhttp3.HttpUrl
-import okhttp3.MediaType.Companion.toMediaType
 import java.net.HttpURLConnection
 import java.net.URL
-import java.net.URLConnection
-import java.net.URLDecoder
 
 //Use this to encode files not just images
 //Needs to be tested sometime

app/src/main/java/com/greybox/projectmesh/messaging/data/entities/JSONSchema.kt

@@ -1,8 +1,8 @@
 package com.greybox.projectmesh.messaging.data.entities
 
-import android.util.Log
 import org.json.JSONObject
 import org.json.JSONException
+import timber.log.Timber
 
 class JSONSchema {
 
@@ -22,16 +22,16 @@ class JSONSchema {
 """
     //Takes JSON string and validates it against JSON Schema
     fun schemaValidation(json: String): Boolean {
-        //Log.d("JSONSchema", "Validating JSON: $json")
-        //Log.d("JSONSchema", "Against schema: $schemaString")
+        //Timber.tag("JSONSchema").d("Validating JSON: $json")
+        //Timber.tag("JSONSchema").d("Against schema: $schemaString")
         try {
             val schemaJson = JSONObject(schemaString)
             val jsonObject = JSONObject(json)
 
             validate(jsonObject, schemaJson)
             return true
         }catch (e: JSONException) {
-            Log.e("JSONSchema", "JSON schema validation failed: ${e.message}")
+            Timber.tag("JSONSchema",).e("JSON schema validation failed: ${e.message}")
             return false
         }
     }

app/src/main/java/com/greybox/projectmesh/messaging/network/MessageNetworkHandler.kt

@@ -5,9 +5,7 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import androidx.core.app.NotificationCompat
-import com.google.gson.Gson
 import com.greybox.projectmesh.GlobalApp
 import com.greybox.projectmesh.MainActivity
 import com.greybox.projectmesh.R
@@ -17,7 +15,6 @@ import com.greybox.projectmesh.messaging.utils.ConversationUtils
 import com.greybox.projectmesh.messaging.repository.ConversationRepository
 import com.greybox.projectmesh.server.AppServer
 import com.greybox.projectmesh.testing.TestDeviceService
-import com.greybox.projectmesh.util.NotificationHelper
 import java.net.InetAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -29,11 +26,8 @@ import okhttp3.Request
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.instance
-import com.greybox.projectmesh.user.UserRepository
-import kotlinx.coroutines.runBlocking
 import android.content.SharedPreferences
-import android.os.Parcel
-import android.os.Parcelable
+import timber.log.Timber
 import java.net.URI
 
 class MessageNetworkHandler(
@@ -69,7 +63,7 @@ class MessageNetworkHandler(
                     .get()
                     .build()
 
-                Log.d("MessageNetworkHandler", "Request URL: ${request.url}")
+                Timber.tag("MessageNetworkHandler").d("Request URL: ${request.url}")
                 //Turn this into JSON
                 /*
                 val gs = Gson()
@@ -89,20 +83,25 @@ class MessageNetworkHandler(
                 try {
                     httpClient.newCall(request).execute().use { response ->
                         if (response.isSuccessful) {
-                            Log.d("MessageNetworkHandler", "Message sent successfully")
+                            Timber.tag("MessageNetworkHandler").d("Message sent successfully")
                         } else {
-                            Log.e("MessageNetworkHandler", "Failed to send message: ${response.code}")
+                            Timber.tag("MessageNetworkHandler").e("Failed to send message: " +
+                                    "${response
+                                .code}")
                         }
                     }
                 } catch (e: Exception) {
-                    Log.e("MessageNetworkHandler", "Failed to send message, connection error: ${e.message}", e)
+                    Timber.tag("MessageNetworkHandler").e(e,"Failed to send message, connection " +
+                            "error: ${e.message}")
                 }
 
             } catch (e: Exception) {
-                Log.e("MessageNetworkHandler", "Failed to send message to ${address.hostAddress}")
+                Timber.tag("MessageNetworkHandler").e("Failed to send message to ${address
+                    .hostAddress}")
             }
         }
     }
+
     companion object {
         //process incoming messages and route them to the correct conversation
         fun handleIncomingMessage(
@@ -111,8 +110,8 @@ class MessageNetworkHandler(
             senderIp: InetAddress,
             incomingfile: URI?
         ): Message {
-            Log.d(
-                "MessageNetworkHandler",
+            Timber.tag(
+                "MessageNetworkHandler").d(
                 "Handling incoming message: $chatMessage, from: ${senderIp.hostAddress}, has file: ${incomingfile != null}"
             )
 
@@ -134,8 +133,8 @@ class MessageNetworkHandler(
             val localUuid = GlobalApp.GlobalUserRepo.prefs.getString("UUID", null) ?: "local-user"
             val chatName = ConversationUtils.createConversationId(localUuid, userUuid)
 
-            Log.d(
-                "MessageNetworkHandler",
+            Timber.tag(
+                "MessageNetworkHandler").d(
                 "Creating message with chat name: $chatName, sender: $sender"
             )
 
@@ -168,9 +167,9 @@ class MessageNetworkHandler(
                         )
                     }
 
-                    Log.d("MessageNetworkHandler", "Updated conversation with new message")
+                    Timber.tag("MessageNetworkHandler").d("Updated conversation with new message")
                 } catch (e: Exception) {
-                    Log.e("MessageNetworkHandler", "Failed to update conversation", e)
+                    Timber.tag("MessageNetworkHandler").e(e,"Failed to update conversation")
                 }
             }
             return message
@@ -190,7 +189,7 @@ class MessageNetworkHandler(
                         ?.getDeclaredField("INSTANCE")?.get(null) as? Context
                         ?: throw Exception("Cannot get application context")
                 } catch (e: Exception) {
-                    Log.e("MessageNetworkHandler", "Failed to get application context", e)
+                    Timber.tag("MessageNetworkHandler").e(e,"Failed to get application context")
                     return
                 }
 
@@ -228,9 +227,9 @@ class MessageNetworkHandler(
                 val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
                 notificationManager.notify(message.hashCode(), notification)
 
-                Log.d("MessageNetworkHandler", "Showed notification for message with file")
+                Timber.tag("MessageNetworkHandler").d("Showed notification for message with file")
             } catch (e: Exception) {
-                Log.e("MessageNetworkHandler", "Failed to show notification", e)
+                Timber.tag("MessageNetworkHandler").e(e, "Failed to show notification")
             }
         }
     }

app/src/main/java/com/greybox/projectmesh/messaging/network/MessageService.kt

@@ -2,18 +2,15 @@
 package com.greybox.projectmesh.messaging.network
 
 import android.content.SharedPreferences
-import android.util.Log
-import com.greybox.projectmesh.GlobalApp
 import com.greybox.projectmesh.messaging.repository.MessageRepository
 import com.greybox.projectmesh.messaging.data.entities.Message
 import com.greybox.projectmesh.messaging.repository.ConversationRepository
-import com.greybox.projectmesh.messaging.data.entities.Conversation
-import com.greybox.projectmesh.messaging.utils.MessageUtils
 import com.greybox.projectmesh.user.UserRepository
 import java.net.InetAddress
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.instance
+import timber.log.Timber
 
 class MessageService(
     override val di: DI
@@ -61,7 +58,7 @@ class MessageService(
 
             }
         }catch (e: Exception){
-            Log.e("MessageService", "Error updating conversation with message", e)
+            Timber.tag("MessageService").e(e,"Error updating conversation with message")
         }
     }
 }