diff --git a/.gitignore b/.gitignore
index 92a121f9..5602dc5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,30 @@ Thumbs.db
/src/java/PluginInputStick3/keepass2AndroidPluginSDK/build/
/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/cache.properties
/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/cache.properties.lock
+/src/java/JavaFileStorageTest-AS/.idea/.name
+/src/java/JavaFileStorageTest-AS/.idea/compiler.xml
+/src/java/JavaFileStorageTest-AS/.idea/copyright/profiles_settings.xml
+/src/java/JavaFileStorageTest-AS/.idea/encodings.xml
+/src/java/JavaFileStorageTest-AS/.idea/gradle.xml
+/src/java/JavaFileStorageTest-AS/.idea/misc.xml
+/src/java/JavaFileStorageTest-AS/.idea/modules.xml
+/src/java/JavaFileStorageTest-AS/.idea/runConfigurations.xml
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/cache.properties
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/cache.properties.lock
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/fileHashes.bin
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
+/src/java/Keepass2AndroidPluginSDK2/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
+/src/java/Keepass2AndroidPluginSDK2/.idea/.name
+/src/java/Keepass2AndroidPluginSDK2/.idea/compiler.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/copyright/profiles_settings.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/encodings.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/gradle.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/libraries/effects_android_23.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/libraries/maps_android_23.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/libraries/mockable_Google_Inc__Google_APIs_23.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/libraries/usb_android_23.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/misc.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/modules.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/runConfigurations.xml
+/src/java/Keepass2AndroidPluginSDK2/.idea/workspace.xml
diff --git a/src/Kp2aBusinessLogic/Io/IoUtil.cs b/src/Kp2aBusinessLogic/Io/IoUtil.cs
index 03463d3a..ee1463f8 100644
--- a/src/Kp2aBusinessLogic/Io/IoUtil.cs
+++ b/src/Kp2aBusinessLogic/Io/IoUtil.cs
@@ -10,6 +10,28 @@ namespace keepass2android.Io
{
public static class IoUtil
{
+
+ public static bool TryTakePersistablePermissions(ContentResolver contentResolver, Android.Net.Uri uri)
+ {
+ if ((int)Build.VERSION.SdkInt >= 19)
+ {
+ //try to take persistable permissions
+ try
+ {
+ Kp2aLog.Log("TakePersistableUriPermission");
+ var takeFlags = (ActivityFlags.GrantReadUriPermission
+ | ActivityFlags.GrantWriteUriPermission);
+ contentResolver.TakePersistableUriPermission(uri, takeFlags);
+ return true;
+ }
+ catch (Exception e)
+ {
+ Kp2aLog.Log(e.ToString());
+ }
+
+ }
+ return false;
+ }
public static bool DeleteDir(File dir, bool contentsOnly=false)
{
if (dir != null && dir.IsDirectory)
@@ -102,5 +124,6 @@ namespace keepass2android.Io
else
return ctx.FilesDir;
}
+
}
}
diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
index 32a1ef3b..015203d8 100644
--- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
+++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
@@ -47,13 +47,23 @@
4
+
+ ..\Components\modernhttpclient-2.4.2\lib\android\ModernHttpClient.dll
+
+
+ ..\Components\modernhttpclient-2.4.2\lib\android\OkHttp.dll
+
+
+
+ ..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll
+
@@ -123,6 +133,10 @@
+
+ {48574278-4779-4b3a-a9e4-9cf1bc285d0b}
+ JavaFileStorageBindings
+
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}
KeePassLib2Android
@@ -131,6 +145,10 @@
{70D3844A-D9FA-4A64-B205-A84C6A822196}
KP2AKdbLibraryBinding
+
+ {146FD497-BA03-4740-B6C5-5C84EA8FCDE2}
+ System.Net.FtpClient.Android
+
{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}
TwofishCipher
@@ -139,6 +157,12 @@
+
+
+ False
+ 2.4.2
+
+
+
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-v14/styles.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-v14/styles.xml
new file mode 100644
index 00000000..a91fd037
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-w820dp/dimens.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..f3e70203
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,10 @@
+
+
+
+ 64dp
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/dimens.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..55c1e590
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/dimens.xml
@@ -0,0 +1,7 @@
+
+
+
+ 16dp
+ 16dp
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/strings.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..5f5b7531
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+ Keepass2Android Plugin SDK
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/styles.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..6ce89c7b
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/java/Keepass2AndroidPluginSDK2/build.gradle b/src/java/Keepass2AndroidPluginSDK2/build.gradle
new file mode 100644
index 00000000..88d246d4
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.2.3'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
diff --git a/src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin b/src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin
new file mode 100644
index 00000000..da4b2001
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK2/build/intermediates/gradle_project_sync_data.bin differ
diff --git a/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.jar b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..8c0fb64a
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..0c71e760
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/src/java/Keepass2AndroidPluginSDK2/gradlew b/src/java/Keepass2AndroidPluginSDK2/gradlew
new file mode 100644
index 00000000..91a7e269
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/src/java/Keepass2AndroidPluginSDK2/gradlew.bat b/src/java/Keepass2AndroidPluginSDK2/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/java/Keepass2AndroidPluginSDK2/import-summary.txt b/src/java/Keepass2AndroidPluginSDK2/import-summary.txt
new file mode 100644
index 00000000..67c3af95
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/import-summary.txt
@@ -0,0 +1,35 @@
+ECLIPSE ANDROID PROJECT IMPORT SUMMARY
+======================================
+
+Ignored Files:
+--------------
+The following files were *not* copied into the new Gradle project; you
+should evaluate whether these are still needed in your project and if
+so manually move them:
+
+* proguard-project.txt
+
+Moved Files:
+------------
+Android Gradle projects use a different directory structure than ADT
+Eclipse projects. Here's how the projects were restructured:
+
+* AndroidManifest.xml => app\src\main\AndroidManifest.xml
+* lint.xml => app\lint.xml
+* res\ => app\src\main\res\
+* src\ => app\src\main\java\
+
+Next Steps:
+-----------
+You can now build the project. The Gradle project needs network
+connectivity to download dependencies.
+
+Bugs:
+-----
+If for some reason your project does not build, and you determine that
+it is due to a bug or limitation of the Eclipse to Gradle importer,
+please file a bug at http://b.android.com with category
+Component-Tools.
+
+(This import summary is for your information only, and can be deleted
+after import once you are satisfied with the results.)
diff --git a/src/java/Keepass2AndroidPluginSDK2/local.properties b/src/java/Keepass2AndroidPluginSDK2/local.properties
new file mode 100644
index 00000000..e98aa9b1
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/local.properties
@@ -0,0 +1,11 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Apr 10 10:51:25 CEST 2017
+sdk.dir=C\:\\Users\\Philipp\\AppData\\Local\\Xamarin\\Universal\\AndroidSDK
diff --git a/src/java/Keepass2AndroidPluginSDK2/settings.gradle b/src/java/Keepass2AndroidPluginSDK2/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK2/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 754408b4..472df224 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -1157,6 +1157,9 @@ namespace keepass2android
Finish();
return false;
}
+ IoUtil.TryTakePersistablePermissions(this.ContentResolver, i.Data);
+
+
}
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index f7d61ab0..585e2ef5 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -36,7 +36,7 @@
Keepass2Android Debug
/keepass/keepass.kdbx
-
+
http://keepass2android.codeplex.com
keepass2android.codeplex.com
Alex Vallat, Ben Rush, Matthieu, Wiktor Ławski