diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
| commit | ba1ef7a38e1d923d1e0e31f0e16528649df41af8 (patch) | |
| tree | b4501c25bb06b084f324f525a6ab2dfe5037aa78 /app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | |
| parent | a782c3f83e6f40ad24f6ffbb3fa5b0d5b4f409f5 (diff) | |
| parent | 893e0ce89daaa39f1157298c6a8dd10b7e98eceb (diff) | |
| download | HardenedPass-ba1ef7a38e1d923d1e0e31f0e16528649df41af8.tar.gz HardenedPass-ba1ef7a38e1d923d1e0e31f0e16528649df41af8.zip | |
Merge branch 'upstream' into webview
Conflicts:
app/build.gradle
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index a620bd33..fd92a1f7 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -560,6 +560,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne } + // TODO (low priority but still...) android M potential permissions crashes @Override public void onBound(IOpenPgpService2 service) { Log.i("PGP", "ISBOUND!!"); |