rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'KeyfileInViewIntent' of https://github.com/nfd/keepassdroid into nfd-KeyfileInViewIntent

Browse Source
This commit is contained in:
Brian Pellin
2016-05-24 20:49:43 -05:00
parent baa91026b2 a7eec1b0cf
commit c9ab0172ea
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/keepassdroid/PasswordActivity.java
View File

@@ -19,14 +19,17 @@
*/ */
package com.keepassdroid; package com.keepassdroid;
import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.ClipData;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
@@ -350,6 +353,31 @@ public class PasswordActivity extends LockingActivity {
String password = ""; String password = "";
boolean launch_immediately = false; boolean launch_immediately = false;
@TargetApi(16)
private Uri getKeyFileFromIntent(Intent i) {
Uri uri = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
// Retrieve the KeyFile URI from ClipData so that file permissions are restored.
ClipData clipData = i.getClipData();
if(clipData != null
&& clipData.getDescription().getLabel().equals(KEY_KEYFILE)
&& clipData.getItemCount() == 1) {
ClipData.Item clipItem = clipData.getItemAt(0);
uri = clipItem.getUri();
}
} else {
// Can't retrieve it from ClipData, so just try retrieving it as an Extra.
// This won't give us permission to access the file, but on devices < JELLY_BEAN
// it will be accessible anyway.
uri = i.getParcelableExtra(KEY_KEYFILE);
}
return uri;
}
@Override @Override
protected Integer doInBackground(Intent... args) { protected Integer doInBackground(Intent... args) {
Intent i = args[0]; Intent i = args[0];
@@ -357,6 +385,9 @@ public class PasswordActivity extends LockingActivity {
if ( action != null && action.equals(VIEW_INTENT) ) { if ( action != null && action.equals(VIEW_INTENT) ) {
Uri incoming = i.getData(); Uri incoming = i.getData();
mDbUri = incoming; mDbUri = incoming;
mKeyUri = getKeyFileFromIntent(i);
if (incoming == null) { if (incoming == null) {
return R.string.error_can_not_handle_uri; return R.string.error_can_not_handle_uri;
} }
@@ -374,10 +405,12 @@ public class PasswordActivity extends LockingActivity {
return R.string.FileNotFound; return R.string.FileNotFound;
} }
mKeyUri = getKeyFile(mDbUri); if(mKeyUri == null)
mKeyUri = getKeyFile(mDbUri);
} }
else if (incoming.getScheme().equals("content")) { else if (incoming.getScheme().equals("content")) {
mKeyUri = getKeyFile(mDbUri); if(mKeyUri == null)
mKeyUri = getKeyFile(mDbUri);
} }
else { else {
return R.string.error_can_not_handle_uri; return R.string.error_can_not_handle_uri;