feat: Add Core2 & SentryLog modules

Core2/SentryLog/build.gradle.kts

@@ -0,0 +1,34 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.infomaniak.sentrylog"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(sentrylog.sentry.android)
+}

Core2/SentryLog/gradle/sentrylog.versions.toml

@@ -0,0 +1,5 @@
+[versions]
+sentry-android = "7.15.0"
+
+[libraries]
+sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-android" }

Core2/SentryLog/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

Core2/SentryLog/src/main/java/com/infomaniak/sentrylog/SentryLog.kt

@@ -0,0 +1,103 @@
+/*
+ * Infomaniak Core - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.sentrylog
+
+import android.util.Log
+import io.sentry.Breadcrumb
+import io.sentry.Sentry
+import io.sentry.SentryEvent
+import io.sentry.SentryLevel
+import io.sentry.protocol.Message
+
+object SentryLog {
+
+    private val TAG = SentryLog::class.java.simpleName
+
+    fun v(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.v(TAG, formattedMessage, throwable)
+        SentryLevel.DEBUG.addBreadcrumb(formattedMessage, throwable)
+    }
+
+    fun d(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.d(TAG, formattedMessage, throwable)
+        SentryLevel.DEBUG.addBreadcrumb(formattedMessage, throwable)
+    }
+
+    fun i(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.i(TAG, formattedMessage, throwable)
+        SentryLevel.INFO.addBreadcrumb(formattedMessage, throwable)
+    }
+
+    fun w(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.w(TAG, formattedMessage, throwable)
+        SentryLevel.WARNING.addBreadcrumb(formattedMessage, throwable)
+    }
+
+    fun e(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.e(TAG, formattedMessage, throwable)
+        SentryLevel.ERROR.apply {
+            addBreadcrumb(formattedMessage, throwable)
+            captureEvent(tag, msg, throwable)
+        }
+    }
+
+    fun wtf(tag: String, msg: String, throwable: Throwable? = null) {
+        val formattedMessage = formatLogMessage(tag, msg)
+        Log.wtf(TAG, formattedMessage, throwable)
+        SentryLevel.FATAL.apply {
+            addBreadcrumb(formattedMessage, throwable)
+            captureEvent(tag, msg, throwable)
+        }
+    }
+
+    private fun SentryLevel.captureEvent(tag: String, msg: String, throwable: Throwable?) {
+        val sentryEvent = SentryEvent().apply {
+            setTag("SentryLogTag", tag)
+            level = this@captureEvent
+            logger = TAG
+            message = Message().apply { this.message = msg }
+            throwable?.let(::setThrowable)
+        }
+
+        Sentry.captureEvent(sentryEvent)
+    }
+
+    private fun SentryLevel.addBreadcrumb(msg: String, throwable: Throwable?) {
+
+        val throwableMsg = throwable?.message
+        val breadCrumb = when {
+            throwableMsg != null -> Breadcrumb.error(throwableMsg).apply {
+                category = "exception"
+            }
+            else -> Breadcrumb().apply {
+                level = this@addBreadcrumb
+                category = TAG
+                message = msg
+            }
+        }
+
+        Sentry.addBreadcrumb(breadCrumb)
+    }
+
+    private fun formatLogMessage(tag: String, msg: String) = "($tag): $msg"
+}

Core2/build.gradle.kts

@@ -0,0 +1,34 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.infomaniak.core2"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+
+}

Core2/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

FileTypes/build.gradle.kts

@@ -39,10 +39,10 @@ android {
 dependencies {
 
     implementation(libs.androidx.core.ktx)
-    implementation(filetype.androidx.ui.android)
-    implementation(filetype.androidx.foundation.android)
-    implementation(filetype.androidx.ui.tooling.preview.android)
+    implementation(filetypes.androidx.ui.android)
+    implementation(filetypes.androidx.foundation.android)
+    implementation(filetypes.androidx.ui.tooling.preview.android)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
-    debugImplementation(filetype.androidx.ui.tooling)
+    debugImplementation(filetypes.androidx.ui.tooling)
 }

app/build.gradle.kts

@@ -80,6 +80,7 @@ sentry {
 }
 
 dependencies {
+    implementation(project(":Core2:SentryLog"))
     implementation(project(":FileTypes"))
     implementation(kotlin("reflect"))
 
@@ -96,7 +97,6 @@ dependencies {
     implementation(libs.compose.material3.adaptative.navigation)
     implementation(libs.navigation.compose)
     implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.sentry.android)
 
     implementation(libs.androidx.adaptive)
     implementation(libs.androidx.adaptive.layout)

gradle/libs.versions.toml

@@ -18,7 +18,6 @@ navigation = "2.8.1"
 serialization = "1.7.1"
 swisstransfer = "0.3.0"
 sentry = "4.12.0"
-sentry-android = "7.15.0"
 recaptcha = "18.6.1"
 
 [libraries]
@@ -45,7 +44,6 @@ hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", ve
 kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
 swisstransfer-core = { module = "com.github.Infomaniak.multiplatform-SwissTransfer:STCore", version.ref = "swisstransfer" }
-sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-android" }
 recaptcha = { module = "com.google.android.recaptcha:recaptcha", version.ref = "recaptcha" }
 # Tests
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }

settings.gradle.kts

@@ -22,12 +22,13 @@ dependencyResolutionManagement {
         maven { url = uri("https://jitpack.io") }
     }
     versionCatalogs {
-        create("filetype") {
-            from(files("FileTypes/gradle/filetype.versions.toml"))
-        }
+        create("sentrylog") { from(files("Core2/SentryLog/gradle/sentrylog.versions.toml")) }
+        create("filetypes") { from(files("FileTypes/gradle/filetypes.versions.toml")) }
     }
 }
 
 rootProject.name = "android-SwissTransfer"
 include(":app")
+include(":Core2")
+include(":Core2:SentryLog")
 include(":FileTypes")