improve permission handling related to GoogleDrive

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java

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

src/keepass2android/Properties/AndroidManifest_net.xml

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