Skip to content

feat: Apply changes from AppLock #1971

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

Open
baillyjamy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Apply changes from AppLock #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 20 files
+119 −0 AppLock/README.md
+8 −0 AppLock/build.gradle.kts
+3 −4 AppLock/src/main/java/com/infomaniak/core/applock/AppLockHelper.kt
+145 −0 AppLock/src/main/java/com/infomaniak/core/applock/AppLockManager.kt
+72 −0 AppLock/src/main/java/com/infomaniak/core/applock/BaseAppLockActivity.kt
+0 −218 AppLock/src/main/java/com/infomaniak/core/applock/LockActivity.kt
+36 −0 AppLock/src/main/java/com/infomaniak/core/applock/compose/AppLockComposeActivity.kt
+48 −0 AppLock/src/main/java/com/infomaniak/core/applock/view/AppLockViewActivity.kt
+1 −1 AppLock/src/main/res/layout/activity_lock.xml
+0 −44 AppLock/src/main/res/navigation/app_lock_navigation.xml
+47 −0 Legacy/src/main/res/values-da/strings.xml
+47 −0 Legacy/src/main/res/values-el/strings.xml
+47 −0 Legacy/src/main/res/values-fi/strings.xml
+47 −0 Legacy/src/main/res/values-nb/strings.xml
+47 −0 Legacy/src/main/res/values-nl/strings.xml
+47 −0 Legacy/src/main/res/values-pl/strings.xml
+47 −0 Legacy/src/main/res/values-pt/strings.xml
+47 −0 Legacy/src/main/res/values-sv/strings.xml
+2 −0 ...nScaffolds/src/main/kotlin/com/infomaniak/core/ui/compose/bottomstickybuttonscaffolds/SinglePaneScaffold.kt
+2 −0 gradle/core.versions.toml
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 @@ -227,7 +227,7 @@
android:theme="@style/WebViewTheme" />

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

Expand Down
7 changes: 5 additions & 2 deletions 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 @@ -61,12 +61,13 @@ import com.google.android.material.bottomnavigation.BottomNavigationMenuView
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.navigation.NavigationBarItemView
import com.google.android.material.snackbar.Snackbar
import com.infomaniak.core.applock.AppLockManager
import com.infomaniak.core.applock.view.AppLockViewActivity
import com.infomaniak.core.common.observe
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.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 Expand Up @@ -119,6 +120,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import javax.inject.Inject
import kotlin.coroutines.resume
import kotlin.jvm.java
import com.infomaniak.core.legacy.R as RCore

@AndroidEntryPoint
Expand Down Expand Up @@ -202,8 +204,9 @@ class MainActivity : BaseActivity() {
observeDownloadCancellation()
observeFailureDownloadWorkerOffline()

LockActivity.scheduleLockIfNeeded(
AppLockManager.scheduleLockIfNeeded(
targetActivity = this,
lockActivityCls = AppLockViewActivity::class.java,
isAppLockEnabled = { AppSettings.appSecurityLock }
)

Expand Down
6 changes: 4 additions & 2 deletions 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 @@ -37,9 +37,10 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.lifecycleScope
import androidx.navigation.navArgs
import com.google.android.material.textfield.TextInputEditText
import com.infomaniak.core.applock.AppLockManager
import com.infomaniak.core.applock.view.AppLockViewActivity
import com.infomaniak.core.common.utils.FORMAT_NEW_FILE
import com.infomaniak.core.common.utils.format
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 Expand Up @@ -132,8 +133,9 @@ class SaveExternalFilesActivity : BaseActivity() {

fileNameEdit.selectAllButFileExtension()

LockActivity.scheduleLockIfNeeded(
AppLockManager.scheduleLockIfNeeded(
targetActivity = this@SaveExternalFilesActivity,
lockActivityCls = AppLockViewActivity::class.java,
isAppLockEnabled = { AppSettings.appSecurityLock }
)
}
Expand Down
6 changes: 3 additions & 3 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.applock.LockActivity
import com.infomaniak.core.applock.Utils.silentlyReverseSwitch
import com.infomaniak.core.applock.AppLockHelper.silentlyReverseSwitch
import com.infomaniak.core.applock.AppLockManager
import com.infomaniak.core.twofactorauth.front.TwoFactorAuthApprovalAutoManagedBottomSheet
import com.infomaniak.core.twofactorauth.front.addComposeOverlay
import com.infomaniak.drive.R
Expand Down Expand Up @@ -54,7 +54,7 @@ class AppSecuritySettingsActivity : AppCompatActivity() {
// Reverse switch (before official parameter changed) by silent click
silentlyReverseSwitch(this) { shouldLock ->
AppSettings.appSecurityLock = shouldLock
if (shouldLock) LockActivity.unlock()
if (shouldLock) AppLockManager.unlock()
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -34,14 +34,14 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.infomaniak.core.applock.AppLockManager
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.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 Expand Up @@ -94,7 +94,7 @@ class SettingsFragment : Fragment() {
themeSettings.setOnClickListener { openThemeSettings() }
notifications.setOnClickListener { requireContext().openAppNotificationSettings() }
appSecurity.apply {
if (LockActivity.hasBiometrics()) {
if (AppLockManager.hasBiometrics()) {
isVisible = true
setOnClickListener {
trackSettingsEvent(MatomoName.LockApp)
Expand Down