From 9ef98d027e9fd98bfa66e13079656c00fba32b83 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 2 Dec 2019 07:52:17 +0100 Subject: [PATCH] Backport of #4933 Signed-off-by: tobiasKaminsky --- .../com/owncloud/android/authentication/PassCodeManager.java | 3 ++- .../com/owncloud/android/ui/activity/DrawerActivity.java | 3 ++- .../com/owncloud/android/ui/activity/PassCodeActivity.java | 5 +++-- .../android/ui/activity/RequestCredentialsActivity.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/owncloud/android/authentication/PassCodeManager.java b/src/main/java/com/owncloud/android/authentication/PassCodeManager.java index 897ec472432a..665a160a5c6f 100644 --- a/src/main/java/com/owncloud/android/authentication/PassCodeManager.java +++ b/src/main/java/com/owncloud/android/authentication/PassCodeManager.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.os.Build; import android.os.PowerManager; +import android.os.SystemClock; import android.view.Window; import android.view.WindowManager; @@ -102,7 +103,7 @@ public boolean onActivityStarted(Activity activity) { activity.startActivityForResult(i, PASSCODE_ACTIVITY); } else { if (!askedForPin && preferences.getLockTimestamp() != 0) { - preferences.setLockTimestamp(System.currentTimeMillis()); + preferences.setLockTimestamp(SystemClock.elapsedRealtime()); } } diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 7c96625bfc74..77fd95883000 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -41,6 +41,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.os.SystemClock; import android.text.Html; import android.view.Menu; import android.view.MenuItem; @@ -1421,7 +1422,7 @@ protected void onStart() { @Override protected void onStop() { if (preferences.getLockTimestamp() != 0) { - preferences.setLockTimestamp(System.currentTimeMillis()); + preferences.setLockTimestamp(SystemClock.elapsedRealtime()); } EventBus.getDefault().unregister(this); super.onStop(); diff --git a/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java index cc07ad85ed3c..7146f9f0dbd1 100644 --- a/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.os.Bundle; +import android.os.SystemClock; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -240,7 +241,7 @@ private void processFullPassCode() { if (ACTION_CHECK.equals(getIntent().getAction())) { if (checkPassCode()) { /// pass code accepted in request, user is allowed to access the app - AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis()); + AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime()); hideSoftKeyboard(); finish(); @@ -250,7 +251,7 @@ private void processFullPassCode() { } else if (ACTION_CHECK_WITH_RESULT.equals(getIntent().getAction())) { if (checkPassCode()) { - AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis()); + AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime()); Intent resultIntent = new Intent(); resultIntent.putExtra(KEY_CHECK_RESULT, true); setResult(RESULT_OK, resultIntent); diff --git a/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java b/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java index 5e777715978b..37f1a4ec50eb 100644 --- a/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.Intent; import android.os.Build; +import android.os.SystemClock; import android.widget.Toast; import com.nextcloud.client.preferences.AppPreferencesImpl; @@ -53,7 +54,7 @@ public class RequestCredentialsActivity extends Activity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) { if (resultCode == Activity.RESULT_OK) { - AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis()); + AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime()); finishWithResult(KEY_CHECK_RESULT_TRUE); } else if (resultCode == Activity.RESULT_CANCELED) { finishWithResult(KEY_CHECK_RESULT_CANCEL);