Skip to content

feat: Move AppLock from legacy #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baillyjamy merged 2 commits into from
Mar 2, 2026
Merged

feat: Move AppLock from legacy #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
066a9b7
feat: Move AppLock from legacy
baillyjamy Feb 27, 2026
75a3a21
chore(AppLock): Update Core after merge
baillyjamy Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 155 files
3 changes: 1 addition & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ sentry {
}

dependencies {

implementation(core.infomaniak.core.applock)
implementation(core.infomaniak.core.auth)
implementation(core.infomaniak.core.avatar)
implementation(core.infomaniak.core.bugtracker)
Expand Down Expand Up @@ -183,7 +183,6 @@ dependencies {
implementation(core.infomaniak.core.ui.view.edgetoedge)

implementation(project(":Core:Legacy"))
implementation(project(":Core:Legacy:AppLock"))

// Compose
implementation(platform(core.compose.bom))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
android:theme="@style/WebViewTheme" />

<activity
android:name="com.infomaniak.core.legacy.applock.LockActivity"
android:name="com.infomaniak.core.applock.LockActivity"
android:launchMode="singleTop"
android:theme="@style/AppTheme.Lock" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ import com.infomaniak.core.inappreview.BaseInAppReviewManager
import com.infomaniak.core.inappreview.reviewmanagers.InAppReviewManager
import com.infomaniak.core.inappreview.view.ReviewAlertDialog
import com.infomaniak.core.inappreview.view.ReviewAlertDialogData
import com.infomaniak.core.legacy.applock.LockActivity
import com.infomaniak.core.applock.LockActivity
import com.infomaniak.core.legacy.utils.CoilUtils.simpleImageLoader
import com.infomaniak.core.legacy.utils.SnackbarUtils.showIndefiniteSnackbar
import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import androidx.navigation.navArgs
import com.google.android.material.textfield.TextInputEditText
import com.infomaniak.core.common.utils.FORMAT_NEW_FILE
import com.infomaniak.core.common.utils.format
import com.infomaniak.core.legacy.applock.LockActivity
import com.infomaniak.core.applock.LockActivity
import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
import com.infomaniak.core.legacy.utils.getFileName
import com.infomaniak.core.legacy.utils.hideProgressCatching
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isGone
import androidx.core.view.isVisible
import com.infomaniak.core.legacy.applock.LockActivity
import com.infomaniak.core.legacy.applock.Utils.silentlyReverseSwitch
import com.infomaniak.core.applock.LockActivity
import com.infomaniak.core.applock.Utils.silentlyReverseSwitch
import com.infomaniak.core.twofactorauth.front.TwoFactorAuthApprovalAutoManagedBottomSheet
import com.infomaniak.core.twofactorauth.front.addComposeOverlay
import com.infomaniak.drive.R
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ 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.applock.LockActivity
import com.infomaniak.core.legacy.ui.WebViewActivity
import com.infomaniak.core.legacy.utils.UtilsUi.openUrl
import com.infomaniak.core.legacy.utils.getBackNavigationResult
Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ rootProject.name = "kDrive"
include(
":app",
":Core:Legacy",
":Core:Legacy:AppLock",
)
Loading