Skip to content
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.

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

Use FingerprintManager instead of FingerprintManagerCompat (Fix #300) #302

Merged
merged 2 commits into from
Jun 10, 2018
Merged

Use FingerprintManager instead of FingerprintManagerCompat (Fix #300) #302

merged 2 commits into from
Jun 10, 2018

Conversation

0140454
Copy link
Contributor

@0140454 0140454 commented Jun 9, 2018

No description provided.


return keyguardManager != null &&
return keyguardManager != null && fingerprintManager != null &&
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0140454 please use brackets around subexpressions: return (keyguardManager != null) && (fingerprintManager != null) && ... for legibility

@m2049r
Copy link
Owner

m2049r commented Jun 9, 2018

If I merge #297 into master, could you rebase this off that - I am having a hard time figuring out what's right!

@0140454
Copy link
Contributor Author

0140454 commented Jun 9, 2018

@m2049r
Sure, I will rebase branch after you merge the PR.

@m2049r m2049r merged commit 74ba36d into m2049r:master Jun 10, 2018
m2049r pushed a commit to monerujo-io/aeonwallet that referenced this pull request Jun 11, 2018
crtlib pushed a commit to evocodes/loki-android-wallet that referenced this pull request Jun 12, 2018
@0140454 0140454 deleted the bugfix/issue-300 branch June 15, 2018 02:26
m2049r added a commit to monerujo-io/aeonwallet that referenced this pull request Jun 28, 2018
* spinner tweaks (m2049r#306)

* Fix keystore null (m2049r#308)

* avoid crash if input to large

* avoid NPE if wallet key not found

* Use FingerprintManager instead of FingerprintManagerCompat (Fix m2049r#300) (m2049r#302)

* show correct amount for pending tx (m2049r#309)

* accounts (m2049r#312)

* Inform user the progress or result of opening wallet (m2049r#297)

* Fix balance (m2049r#313)

* fix length test (m2049r#314)

* sweep all (m2049r#317)

* French Strings updated to m2049r#297 (m2049r#316)

+ Missing update to m2049r#312

+ enhancement on "wrapping things up"

* Fixes to v1.5.5 (m2049r#318)

* fix disappearing hamburger

* german fixes to fit space

* Layout tweaks (m2049r#319)

* remove mixin settings (m2049r#320)

* subaddresses (m2049r#322)

* new subaddress bump effect (m2049r#327)

* Update Translations (m2049r#329)

* avoid NPE (m2049r#330)

* fix displayed subaddress #

* fix path of build script

* cleanup translations & resources

* include for aeon
crtlib pushed a commit to evocodes/loki-android-wallet that referenced this pull request Jun 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants