Update libraries and fix crashes #1733
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| package org.wordpress.passcodelock; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.app.Activity; | ||
| import android.content.pm.ActivityInfo; | ||
| import android.os.Bundle; | ||
|
|
@@ -24,9 +25,11 @@ public abstract class AbstractPasscodeKeyboardActivity extends Activity { | |
| protected InputFilter[] filters = null; | ||
| protected TextView topMessage = null; | ||
|
|
||
| @SuppressLint("RestrictedApi") | ||
|
Contributor
Author
There was a problem hiding this comment. Added this to avoid linter complaining for now, but tracking separately here #1734 |
||
| protected FingerprintManagerCompat mFingerprintManager; | ||
| protected CancellationSignal mCancel; | ||
|
|
||
| @SuppressLint("RestrictedApi") | ||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
|
|
@@ -36,21 +39,21 @@ protected void onCreate(Bundle savedInstanceState) { | |
| } | ||
|
|
||
| setContentView(R.layout.app_passcode_keyboard); | ||
|
|
||
| topMessage = (TextView) findViewById(R.id.passcodelock_prompt); | ||
|
|
||
| Bundle extras = getIntent().getExtras(); | ||
| if (extras != null) { | ||
| String message = extras.getString(KEY_MESSAGE); | ||
| if (message != null) { | ||
| topMessage.setText(message); | ||
| } | ||
| } | ||
|
|
||
| filters = new InputFilter[2]; | ||
| filters[0]= new InputFilter.LengthFilter(1); | ||
| filters[1] = onlyNumber; | ||
|
|
||
| mPinCodeField = (EditText)findViewById(R.id.pin_field); | ||
|
|
||
| //setup the keyboard | ||
|
|
@@ -158,8 +161,9 @@ public void run() { | |
| protected void showPasswordError(){ | ||
| Toast.makeText(AbstractPasscodeKeyboardActivity.this, R.string.passcode_wrong_passcode, Toast.LENGTH_SHORT).show(); | ||
| } | ||
|
|
||
| protected abstract void onPinLockInserted(); | ||
| @SuppressLint("RestrictedApi") | ||
| protected abstract FingerprintManagerCompat.AuthenticationCallback getFingerprintCallback(); | ||
|
|
||
| private InputFilter onlyNumber = new InputFilter() { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,8 +27,13 @@ class DeepLinkActivity : AppCompatActivity() { | |
| startActivity(intent) | ||
| } | ||
| VERIFIED_WEB_SCHEME -> { | ||
| // Check if this is a password reset URL | ||
| if (uri.path?.contains("/account/") == true && uri.path?.contains("/reset") == true) { | ||
ParaskP7 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| handlePasswordReset(uri) | ||
| } else { | ||
| // New MagicLink | ||
| startMagicLinkConfirmation(uri) | ||
| } | ||
| } | ||
| LOGIN_SCHEME -> { | ||
| if (queryParamContainsData(uri.query, USERNAME_KEY_QUERY) && queryParamContainsData(uri.query, AUTH_CODE_QUERY)) { | ||
|
|
@@ -88,6 +93,21 @@ class DeepLinkActivity : AppCompatActivity() { | |
| } | ||
| } | ||
|
|
||
| private fun handlePasswordReset(uri: Uri) { | ||
| val redirectParam = uri.getQueryParameter("redirect") | ||
| if (redirectParam == "simplenote://launch") { | ||
|
||
| // Handle the redirect to launch the app | ||
| val intent = IntentUtils.maybeAliasedIntent(applicationContext) | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| startActivity(intent) | ||
| } else { | ||
| // Default behavior for reset URLs without redirect | ||
| val intent = IntentUtils.maybeAliasedIntent(applicationContext) | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| startActivity(intent) | ||
| } | ||
| } | ||
|
|
||
| private fun queryParamContainsData(path: String?, otherString: String) : Boolean = path?.contains(otherString, true) == true | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.