From 0943da181c8f6a20d8748faacf8b7f49d94f9f3c Mon Sep 17 00:00:00 2001 From: Jamy Bailly Date: Thu, 26 Feb 2026 10:30:47 +0100 Subject: [PATCH 1/3] feat(Bugtracker): Use Bugtracker from Core instead of legacy --- Core | 2 +- app/build.gradle.kts | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt | 4 ++-- gradle/libs.versions.toml | 1 + settings.gradle.kts | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Core b/Core index 5d33ffb6ec..a5282e74b5 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit 5d33ffb6ec07ea86a863d3c851e45dbf46ca2a47 +Subproject commit a5282e74b5d286dd02f827d9524429e7f3161765 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 531c4a67f9..baf7d98e91 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,6 +158,7 @@ dependencies { implementation(libs.infomaniak.core) implementation(libs.infomaniak.core.auth) implementation(libs.infomaniak.core.avatar) + implementation(libs.infomaniak.core.bugtracker) implementation(libs.infomaniak.core.coil) implementation(libs.infomaniak.core.crossapplogin) implementation(libs.infomaniak.core.fragmentnavigation) @@ -182,7 +183,6 @@ dependencies { implementation(project(":Core:Legacy")) implementation(project(":Core:Legacy:AppLock")) - implementation(project(":Core:Legacy:BugTracker")) // Compose implementation(platform(core.compose.bom)) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cba3c5e0f1..f7a9be117f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -238,7 +238,7 @@ android:theme="@style/AppTheme.RequiredUpdate"/> diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt index 8488a84346..7272964f78 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt @@ -35,13 +35,13 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.infomaniak.core.auth.room.UserDatabase +import com.infomaniak.core.bugtracker.BugTrackerActivity +import com.infomaniak.core.bugtracker.BugTrackerActivityArgs import com.infomaniak.core.crossapplogin.back.CrossAppLogin import com.infomaniak.core.fragmentnavigation.safelyNavigate import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData import com.infomaniak.core.ksuite.ui.utils.MatomoKSuite import com.infomaniak.core.legacy.applock.LockActivity -import com.infomaniak.core.legacy.bugtracker.BugTrackerActivity -import com.infomaniak.core.legacy.bugtracker.BugTrackerActivityArgs import com.infomaniak.core.legacy.ui.WebViewActivity import com.infomaniak.core.legacy.utils.UtilsUi.openUrl import com.infomaniak.core.legacy.utils.getBackNavigationResult diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7155cb03cc..bdfae27265 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,6 +43,7 @@ gs-sdk = { module = "com.geniusscansdk:gssdk", version.ref = "gsSdk" } infomaniak-core = { module = "com.infomaniak.core:Common" } infomaniak-core-auth = { module = "com.infomaniak.core:Auth" } infomaniak-core-avatar = { module = "com.infomaniak.core:Avatar" } +infomaniak-core-bugtracker = { module = "com.infomaniak.core:BugTracker" } infomaniak-core-coil = { module = "com.infomaniak.core:Coil" } infomaniak-core-crossapplogin = { module = "com.infomaniak.core:CrossAppLogin.Front" } infomaniak-core-fragmentnavigation = { module = "com.infomaniak.core:FragmentNavigation" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 639580098f..c7d4574d95 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,5 +30,4 @@ include( ":app", ":Core:Legacy", ":Core:Legacy:AppLock", - ":Core:Legacy:BugTracker", ) From 5e539e4c20e44db1946df81ef997d668c35a80a6 Mon Sep 17 00:00:00 2001 From: Jamy Bailly Date: Fri, 27 Feb 2026 07:15:59 +0100 Subject: [PATCH 2/3] chore(core): Update core after merge --- Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core b/Core index a5282e74b5..d913d0b701 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit a5282e74b5d286dd02f827d9524429e7f3161765 +Subproject commit d913d0b701f691eed1833c7117fa4b0838d429cf From 9e4d7a61d70c1d4d3980d742d6c688d5b797c46b Mon Sep 17 00:00:00 2001 From: Jamy Bailly Date: Fri, 27 Feb 2026 08:33:08 +0100 Subject: [PATCH 3/3] chore: Update core --- Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core b/Core index d913d0b701..6ed3f23ffb 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit d913d0b701f691eed1833c7117fa4b0838d429cf +Subproject commit 6ed3f23ffbefbf212cdb2a9560d8947b01aaccad