mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-09-02 15:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use openpgpapi correctly to address #128

Browse Source
This commit is contained in:
Matthew Wong
2015-09-03 15:00:01 -04:00
parent c534cfe498
commit 68e1495ef2
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillActivity.java
View File

@@ -34,7 +34,7 @@ public class AutofillActivity extends AppCompatActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
finish(); // go back to the password field app finish(); // go back to the password field app
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
AutofillService.setUnlockOK(); // report the result to service AutofillService.setResultData(data); // report the result to service
} }
} }
} }

17
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.java
View File

@@ -44,7 +44,7 @@ public class AutofillService extends AccessibilityService {
private ArrayList<PasswordItem> items; // password choices private ArrayList<PasswordItem> items; // password choices
private AlertDialog dialog; private AlertDialog dialog;
private AccessibilityWindowInfo window; private AccessibilityWindowInfo window;
private static boolean unlockOK = false; // if openkeychain user interaction was successful private static Intent resultData = null; // need the intent which contains results from user interaction
private CharSequence packageName; private CharSequence packageName;
private boolean ignoreActionFocus = false; private boolean ignoreActionFocus = false;
@@ -52,7 +52,7 @@ public class AutofillService extends AccessibilityService {
public static final String TAG = "Keychain"; public static final String TAG = "Keychain";
} }
public static void setUnlockOK() { unlockOK = true; } public static void setResultData(Intent data) { resultData = data; }
@Override @Override
protected void onServiceConnected() { protected void onServiceConnected() {
@@ -66,7 +66,7 @@ public class AutofillService extends AccessibilityService {
public void onAccessibilityEvent(AccessibilityEvent event) { public void onAccessibilityEvent(AccessibilityEvent event) {
// if returning to the source app from a successful AutofillActivity // if returning to the source app from a successful AutofillActivity
if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
&& event.getPackageName().equals(packageName) && unlockOK) { && event.getPackageName().equals(packageName) && resultData != null) {
decryptAndVerify(); decryptAndVerify();
} }
@@ -203,10 +203,15 @@ public class AutofillService extends AccessibilityService {
} }
public void decryptAndVerify() { public void decryptAndVerify() {
unlockOK = false;
packageName = info.getPackageName(); packageName = info.getPackageName();
Intent data = new Intent(); Intent data;
data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY); if (resultData == null) {
data = new Intent();
data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
} else {
data = resultData;
resultData = null;
}
InputStream is = null; InputStream is = null;
try { try {
is = FileUtils.openInputStream(items.get(0).getFile()); is = FileUtils.openInputStream(items.get(0).getFile());