qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve permission handling related to GoogleDrive

Browse Source
This commit is contained in:
Philipp Crocoll
2018-06-23 11:43:54 +02:00
parent b1b7bff09d
commit 3eb84cc955
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java
View File

@@ -38,6 +38,8 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
public class GoogleDriveFileStorage extends JavaFileStorageBase { public class GoogleDriveFileStorage extends JavaFileStorageBase {
@@ -780,7 +782,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
public void onRequestPermissionsResult(FileStorageSetupActivity setupAct, int requestCode, String[] permissions, int[] grantResults) public void onRequestPermissionsResult(FileStorageSetupActivity setupAct, int requestCode, String[] permissions, int[] grantResults)
{ {
logDebug("onRequestPermissionsResult"); logDebug("onRequestPermissionsResult");
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) if (grantResults[0] == PERMISSION_GRANTED)
{ {
logDebug("granted"); logDebug("granted");
initFileStorage(setupAct); initFileStorage(setupAct);
@@ -852,9 +854,10 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
boolean allOk = true; boolean allOk = true;
for (String s: permissions) for (String s: permissions)
{ {
int permissionRes = act.checkSelfPermission(Manifest.permission.GET_ACCOUNTS); int permissionRes = act.checkSelfPermission(s);
logDebug("permissionRes="+permissionRes); logDebug("permissionRes "+s+"="+permissionRes);
allOk = false; if (permissionRes != PERMISSION_GRANTED)
allOk = false;
} }
if (!allOk) if (!allOk)

9
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="118" android:versionCode="119"
android:versionName="1.05d" android:versionName="1.05e"
package="keepass2android.keepass2android" package="keepass2android.keepass2android"
android:installLocation="auto"> android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" /> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
@@ -141,10 +141,11 @@
</application> </application>
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" android:maxSdkVersion="22" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22" />
<uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" /> <uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" />
<uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalSearch" /> <uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalSearch" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" /> <uses-permission android:name="android.permission.USE_FINGERPRINT" />