diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj index 9d3e3e8a..dd77e6e9 100644 --- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj +++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj @@ -64,6 +64,9 @@ + + Jars\app-debug.aar + @@ -72,11 +75,6 @@ - - - Jars\javafilestorage.jar - - Jars\json_simple-1.1.jar @@ -166,24 +164,4 @@ False - - - Jars\commons-logging-1.1.1.jar - - - - - Jars\dropbox-android-sdk-1.6.2.jar - - - - - Jars\httpclient-4.0.3.jar - - - - - Jars\httpcore-4.0.1.jar - - \ No newline at end of file diff --git a/src/JavaFileStorageBindings/Transforms/Metadata.xml b/src/JavaFileStorageBindings/Transforms/Metadata.xml index 0e721477..db7a5158 100644 --- a/src/JavaFileStorageBindings/Transforms/Metadata.xml +++ b/src/JavaFileStorageBindings/Transforms/Metadata.xml @@ -6,6 +6,22 @@ This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground: --> + + + + + + + + + + + + + + + + diff --git a/src/java/JavaFileStorage/.classpath b/src/java/JavaFileStorage/.classpath deleted file mode 100644 index c8c2cd23..00000000 --- a/src/java/JavaFileStorage/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/java/JavaFileStorage/.idea/.name b/src/java/JavaFileStorage/.idea/.name new file mode 100644 index 00000000..dc1efc6d --- /dev/null +++ b/src/java/JavaFileStorage/.idea/.name @@ -0,0 +1 @@ +JavaFileStorage \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/compiler.xml b/src/java/JavaFileStorage/.idea/compiler.xml new file mode 100644 index 00000000..96cc43ef --- /dev/null +++ b/src/java/JavaFileStorage/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/copyright/profiles_settings.xml b/src/java/JavaFileStorage/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/gradle.xml b/src/java/JavaFileStorage/.idea/gradle.xml new file mode 100644 index 00000000..3ed2e6cb --- /dev/null +++ b/src/java/JavaFileStorage/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml b/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml new file mode 100644 index 00000000..b8433971 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml b/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml new file mode 100644 index 00000000..53478ef6 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml b/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml new file mode 100644 index 00000000..a39b58ed --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml new file mode 100644 index 00000000..806fdeae --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml new file mode 100644 index 00000000..95c639c4 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml new file mode 100644 index 00000000..b0aa64f5 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml new file mode 100644 index 00000000..7edb953d --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml new file mode 100644 index 00000000..ef947f60 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml new file mode 100644 index 00000000..13a9adda --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml new file mode 100644 index 00000000..e1c9063e --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml new file mode 100644 index 00000000..7f253039 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml new file mode 100644 index 00000000..6ef030bc --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml new file mode 100644 index 00000000..72a5d3a1 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml b/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml new file mode 100644 index 00000000..2ebe839a --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml b/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml new file mode 100644 index 00000000..b4e875ac --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml b/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml new file mode 100644 index 00000000..e3b32696 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml b/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml new file mode 100644 index 00000000..a5ecac06 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml b/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml new file mode 100644 index 00000000..caaedba7 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml b/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml new file mode 100644 index 00000000..5a7e0133 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml b/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml new file mode 100644 index 00000000..c46ba058 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml b/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml new file mode 100644 index 00000000..52ccf61d --- /dev/null +++ b/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/misc.xml b/src/java/JavaFileStorage/.idea/misc.xml new file mode 100644 index 00000000..e9309050 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/misc.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/modules.xml b/src/java/JavaFileStorage/.idea/modules.xml new file mode 100644 index 00000000..f43c8564 --- /dev/null +++ b/src/java/JavaFileStorage/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.idea/vcs.xml b/src/java/JavaFileStorage/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/src/java/JavaFileStorage/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/.project b/src/java/JavaFileStorage/.project deleted file mode 100644 index 32ed6251..00000000 --- a/src/java/JavaFileStorage/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - JavaFileStorage - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/src/java/JavaFileStorage/.settings/org.eclipse.jdt.core.prefs b/src/java/JavaFileStorage/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2dd..00000000 --- a/src/java/JavaFileStorage/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/src/java/JavaFileStorage/JavaFileStorage.iml b/src/java/JavaFileStorage/JavaFileStorage.iml new file mode 100644 index 00000000..3182901a --- /dev/null +++ b/src/java/JavaFileStorage/JavaFileStorage.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/JavaFileStorage2.iml b/src/java/JavaFileStorage/JavaFileStorage2.iml new file mode 100644 index 00000000..4b7eee73 --- /dev/null +++ b/src/java/JavaFileStorage/JavaFileStorage2.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/app/app.iml b/src/java/JavaFileStorage/app/app.iml new file mode 100644 index 00000000..91b64a71 --- /dev/null +++ b/src/java/JavaFileStorage/app/app.iml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle new file mode 100644 index 00000000..d5dd100f --- /dev/null +++ b/src/java/JavaFileStorage/app/build.gradle @@ -0,0 +1,40 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 21 + } + + buildTypes { + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' + } + } +} + +dependencies { + compile 'com.google.http-client:google-http-client-gson:1.20.0' + compile 'com.google.code.gson:gson:2.1' + compile files('libs/commons-logging-1.1.1.jar') + compile files('libs/dropbox-android-sdk-1.6.2.jar') + compile files('libs/google-api-client-1.16.0-rc.jar') + compile files('libs/google-api-client-android-1.16.0-rc.jar') + compile files('libs/google-api-services-drive-v2-rev102-1.16.0-rc.jar') + compile files('libs/google-http-client-1.16.0-rc.jar') + compile files('libs/google-http-client-android-1.16.0-rc.jar') + compile files('libs/google-http-client-jackson-1.16.0-rc.jar') + compile files('libs/google-http-client-jackson2-1.16.0-rc.jar') + compile files('libs/google-oauth-client-1.16.0-rc.jar') + compile files('libs/httpclient-4.0.3.jar') + compile files('libs/httpcore-4.0.1.jar') + compile files('libs/httpmime-4.0.3.jar') + compile files('libs/jackson-core-2.1.3.jar') + compile files('libs/jackson-core-asl-1.9.11.jar') + compile files('libs/json_simple-1.1.jar') + compile files('libs/jsr305-1.3.9.jar') +} diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/app-debug.aar b/src/java/JavaFileStorage/app/build/outputs/aar/app-debug.aar new file mode 100644 index 00000000..51287905 Binary files /dev/null and b/src/java/JavaFileStorage/app/build/outputs/aar/app-debug.aar differ diff --git a/src/java/JavaFileStorage/app/libs/commons-logging-1.1.1.jar b/src/java/JavaFileStorage/app/libs/commons-logging-1.1.1.jar new file mode 100644 index 00000000..8758a96b Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/commons-logging-1.1.1.jar differ diff --git a/src/java/JavaFileStorage/app/libs/dropbox-android-sdk-1.6.2.jar b/src/java/JavaFileStorage/app/libs/dropbox-android-sdk-1.6.2.jar new file mode 100644 index 00000000..997663e8 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/dropbox-android-sdk-1.6.2.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-api-client-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-api-client-1.16.0-rc.jar new file mode 100644 index 00000000..4097d1bf Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-api-client-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-api-client-android-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-api-client-android-1.16.0-rc.jar new file mode 100644 index 00000000..f938da9e Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-api-client-android-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-api-services-drive-v2-rev102-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-api-services-drive-v2-rev102-1.16.0-rc.jar new file mode 100644 index 00000000..5baa6abc Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-api-services-drive-v2-rev102-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-http-client-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-http-client-1.16.0-rc.jar new file mode 100644 index 00000000..e10f42d4 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-http-client-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-http-client-android-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-http-client-android-1.16.0-rc.jar new file mode 100644 index 00000000..447db5e9 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-http-client-android-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-http-client-jackson-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-http-client-jackson-1.16.0-rc.jar new file mode 100644 index 00000000..411d2238 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-http-client-jackson-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-http-client-jackson2-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-http-client-jackson2-1.16.0-rc.jar new file mode 100644 index 00000000..23175261 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-http-client-jackson2-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/google-oauth-client-1.16.0-rc.jar b/src/java/JavaFileStorage/app/libs/google-oauth-client-1.16.0-rc.jar new file mode 100644 index 00000000..fb07f9be Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/google-oauth-client-1.16.0-rc.jar differ diff --git a/src/java/JavaFileStorage/app/libs/httpclient-4.0.3.jar b/src/java/JavaFileStorage/app/libs/httpclient-4.0.3.jar new file mode 100644 index 00000000..fd0d3774 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/httpclient-4.0.3.jar differ diff --git a/src/java/JavaFileStorage/app/libs/httpcore-4.0.1.jar b/src/java/JavaFileStorage/app/libs/httpcore-4.0.1.jar new file mode 100644 index 00000000..4638daa5 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/httpcore-4.0.1.jar differ diff --git a/src/java/JavaFileStorage/app/libs/httpmime-4.0.3.jar b/src/java/JavaFileStorage/app/libs/httpmime-4.0.3.jar new file mode 100644 index 00000000..0dfd3312 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/httpmime-4.0.3.jar differ diff --git a/src/java/JavaFileStorage/app/libs/jackson-core-2.1.3.jar b/src/java/JavaFileStorage/app/libs/jackson-core-2.1.3.jar new file mode 100644 index 00000000..f47619f4 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/jackson-core-2.1.3.jar differ diff --git a/src/java/JavaFileStorage/app/libs/jackson-core-asl-1.9.11.jar b/src/java/JavaFileStorage/app/libs/jackson-core-asl-1.9.11.jar new file mode 100644 index 00000000..145fc489 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/jackson-core-asl-1.9.11.jar differ diff --git a/src/java/JavaFileStorage/app/libs/json_simple-1.1.jar b/src/java/JavaFileStorage/app/libs/json_simple-1.1.jar new file mode 100644 index 00000000..f395f414 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/json_simple-1.1.jar differ diff --git a/src/java/JavaFileStorage/app/libs/jsr305-1.3.9.jar b/src/java/JavaFileStorage/app/libs/jsr305-1.3.9.jar new file mode 100644 index 00000000..a9afc661 Binary files /dev/null and b/src/java/JavaFileStorage/app/libs/jsr305-1.3.9.jar differ diff --git a/src/java/JavaFileStorage/proguard-project.txt b/src/java/JavaFileStorage/app/proguard-project.txt similarity index 100% rename from src/java/JavaFileStorage/proguard-project.txt rename to src/java/JavaFileStorage/app/proguard-project.txt diff --git a/src/java/JavaFileStorage/AndroidManifest.xml b/src/java/JavaFileStorage/app/src/main/AndroidManifest.xml similarity index 100% rename from src/java/JavaFileStorage/AndroidManifest.xml rename to src/java/JavaFileStorage/app/src/main/AndroidManifest.xml diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Buffer.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Buffer.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Channel.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Channel.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelAgentForwarding.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelAgentForwarding.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelDirectTCPIP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelDirectTCPIP.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelExec.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelExec.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelForwardedTCPIP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelForwardedTCPIP.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSession.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSession.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSftp.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSftp.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelShell.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelShell.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSubsystem.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelSubsystem.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelX11.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ChannelX11.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Cipher.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Cipher.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/CipherNone.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/CipherNone.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Compression.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Compression.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ConfigRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ConfigRepository.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/DH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/DH.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/DHG1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/DHG1.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/DHG14.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/DHG14.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/DHGEX.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/DHGEX.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/DHGEX256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/DHGEX256.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ForwardedTCPIPDaemon.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ForwardedTCPIPDaemon.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/GSSContext.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/GSSContext.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/HASH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/HASH.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/HostKey.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/HostKey.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/HostKeyRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/HostKeyRepository.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/IO.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/IO.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Identity.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Identity.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/IdentityFile.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/IdentityFile.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/IdentityRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/IdentityRepository.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/JSch.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/JSch.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/JSchAuthCancelException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/JSchAuthCancelException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/JSchException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/JSchException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/JSchPartialAuthException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/JSchPartialAuthException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyExchange.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyExchange.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPair.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPair.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairGenDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairGenDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairGenRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairGenRSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KeyPairRSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/KnownHosts.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/KnownHosts.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/LocalIdentityRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/LocalIdentityRepository.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Logger.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Logger.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/MAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/MAC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/OpenSSHConfig.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/OpenSSHConfig.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Packet.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Packet.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/PortWatcher.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/PortWatcher.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Proxy.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Proxy.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ProxyHTTP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ProxyHTTP.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ProxySOCKS4.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ProxySOCKS4.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ProxySOCKS5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ProxySOCKS5.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Random.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Random.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Request.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Request.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestAgentForwarding.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestAgentForwarding.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestEnv.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestEnv.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestExec.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestExec.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestPtyReq.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestPtyReq.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSftp.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSftp.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestShell.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestShell.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSignal.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSignal.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSubsystem.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestSubsystem.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestWindowChange.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestWindowChange.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/RequestX11.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/RequestX11.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/ServerSocketFactory.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/ServerSocketFactory.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Session.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Session.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SftpATTRS.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SftpATTRS.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SftpException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SftpException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SftpProgressMonitor.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SftpProgressMonitor.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SftpStatVFS.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SftpStatVFS.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Signature.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Signature.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SignatureDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SignatureDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SignatureRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SignatureRSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/SocketFactory.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/SocketFactory.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UIKeyboardInteractive.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UIKeyboardInteractive.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuth.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuth.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthKeyboardInteractive.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthKeyboardInteractive.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthNone.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthNone.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthPassword.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthPassword.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthPublicKey.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserAuthPublicKey.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/UserInfo.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/UserInfo.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/Util.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/Util.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES128CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES128CBC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES128CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES128CTR.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES192CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES192CBC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES192CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES192CTR.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES256CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES256CBC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES256CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/AES256CTR.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR128.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR128.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/ARCFOUR256.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/BlowfishCBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/BlowfishCBC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/DH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/DH.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMAC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACMD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACMD5.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACMD596.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACMD596.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA1.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA196.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA196.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA256.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA512.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/HMACSHA512.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/KeyPairGenDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/KeyPairGenDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/KeyPairGenRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/KeyPairGenRSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/MD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/MD5.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/Random.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/Random.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SHA1.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SHA256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SHA256.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SignatureDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SignatureDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SignatureRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/SignatureRSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/TripleDESCBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/TripleDESCBC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jce/TripleDESCTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jce/TripleDESCTR.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/Compression.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/Compression.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMAC.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACMD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACMD5.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACMD596.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACMD596.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACSHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACSHA1.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACSHA196.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jsch/jcraft/HMACSHA196.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Adler32.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Adler32.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Adler32.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Adler32.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/CRC32.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/CRC32.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/CRC32.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/CRC32.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Checksum.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Checksum.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Checksum.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Checksum.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Deflate.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Deflate.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Deflate.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Deflate.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Deflater.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Deflater.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Deflater.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Deflater.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/DeflaterOutputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/DeflaterOutputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/DeflaterOutputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPException.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPHeader.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPHeader.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPHeader.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPHeader.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPInputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPInputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPInputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPInputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPOutputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/GZIPOutputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/GZIPOutputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/InfBlocks.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfBlocks.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/InfBlocks.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfBlocks.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/InfCodes.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfCodes.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/InfCodes.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfCodes.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/InfTree.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfTree.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/InfTree.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InfTree.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Inflate.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Inflate.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Inflate.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Inflate.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Inflater.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Inflater.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Inflater.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Inflater.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/InflaterInputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InflaterInputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/InflaterInputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/InflaterInputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/JZlib.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/JZlib.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/JZlib.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/JZlib.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/StaticTree.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/StaticTree.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/StaticTree.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/StaticTree.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/Tree.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Tree.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/Tree.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/Tree.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/ZInputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZInputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/ZInputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZInputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/ZOutputStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZOutputStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/ZOutputStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZOutputStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/ZStream.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZStream.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/ZStream.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZStream.java diff --git a/src/java/JavaFileStorage/src/com/jcraft/jzlib/ZStreamException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZStreamException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/jcraft/jzlib/ZStreamException.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jzlib/ZStreamException.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/AccessTokenRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/AccessTokenRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/AccessTokenRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/AccessTokenRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/ApiRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ApiRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/ApiRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ApiRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/ApiRequestAsync.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ApiRequestAsync.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/ApiRequestAsync.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ApiRequestAsync.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/AuthorizationRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/AuthorizationRequest.java similarity index 99% rename from src/java/JavaFileStorage/src/com/microsoft/live/AuthorizationRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/AuthorizationRequest.java index 8751f654..757ea7c1 100644 --- a/src/java/JavaFileStorage/src/com/microsoft/live/AuthorizationRequest.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/AuthorizationRequest.java @@ -118,14 +118,15 @@ class AuthorizationRequest implements ObservableOAuthRequest, OAuthRequestObserv AuthorizationRequest.this.onError("", description, failingUrl); OAuthDialog.this.dismiss(); } - +/* +Removed. Allows Man in the middle attacks and does not seem necessary. @Override public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { // TODO: Android does not like the SSL certificate we use, because it has '*' in // it. Proceed with the errors. handler.proceed(); } - +*/ private void saveCookiesInMemory(String cookie) { // Not all URLs will have cookies if (TextUtils.isEmpty(cookie)) { diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/Config.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/Config.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/Config.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/Config.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/CopyRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/CopyRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/CopyRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/CopyRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/DefaultObservableOAuthRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DefaultObservableOAuthRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/DefaultObservableOAuthRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DefaultObservableOAuthRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/DeleteRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DeleteRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/DeleteRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DeleteRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/DeviceType.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DeviceType.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/DeviceType.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DeviceType.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/DownloadRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DownloadRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/DownloadRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/DownloadRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/EntityEnclosingApiRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/EntityEnclosingApiRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/EntityEnclosingApiRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/EntityEnclosingApiRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/ErrorMessages.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ErrorMessages.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/ErrorMessages.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ErrorMessages.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/GetRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/GetRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/GetRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/GetRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/HttpCopy.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/HttpCopy.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/HttpCopy.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/HttpCopy.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/HttpMove.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/HttpMove.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/HttpMove.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/HttpMove.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/InputStreamResponseHandler.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/InputStreamResponseHandler.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/InputStreamResponseHandler.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/InputStreamResponseHandler.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/JsonEntity.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/JsonEntity.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/JsonEntity.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/JsonEntity.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/JsonResponseHandler.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/JsonResponseHandler.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/JsonResponseHandler.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/JsonResponseHandler.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthClient.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthClient.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthClient.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthClient.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthException.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthException.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthException.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthListener.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthListener.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveAuthListener.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveAuthListener.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectClient.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectClient.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectClient.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectClient.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectSession.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectSession.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectSession.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectSession.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectUtils.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectUtils.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveConnectUtils.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveConnectUtils.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveDownloadOperation.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveDownloadOperation.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveDownloadOperation.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveDownloadOperation.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveDownloadOperationListener.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveDownloadOperationListener.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveDownloadOperationListener.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveDownloadOperationListener.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveOperation.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperation.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveOperation.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperation.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveOperationException.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperationException.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveOperationException.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperationException.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveOperationListener.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperationListener.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveOperationListener.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveOperationListener.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveStatus.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveStatus.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveStatus.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveStatus.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/LiveUploadOperationListener.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveUploadOperationListener.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/LiveUploadOperationListener.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/LiveUploadOperationListener.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/MoveRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/MoveRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/MoveRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/MoveRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuth.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuth.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuth.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuth.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuthErrorResponse.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthErrorResponse.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuthErrorResponse.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthErrorResponse.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuthRequestObserver.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthRequestObserver.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuthRequestObserver.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthRequestObserver.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuthResponse.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthResponse.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuthResponse.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthResponse.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuthResponseVisitor.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthResponseVisitor.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuthResponseVisitor.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthResponseVisitor.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OAuthSuccessfulResponse.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthSuccessfulResponse.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OAuthSuccessfulResponse.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OAuthSuccessfulResponse.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/ObservableOAuthRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ObservableOAuthRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/ObservableOAuthRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ObservableOAuthRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/OverwriteOption.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OverwriteOption.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/OverwriteOption.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/OverwriteOption.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/PostRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PostRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/PostRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PostRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/PreferencesConstants.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PreferencesConstants.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/PreferencesConstants.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PreferencesConstants.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/PutRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PutRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/PutRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/PutRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/QueryParameters.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/QueryParameters.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/QueryParameters.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/QueryParameters.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/RefreshAccessTokenRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/RefreshAccessTokenRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/RefreshAccessTokenRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/RefreshAccessTokenRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/ScreenSize.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ScreenSize.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/ScreenSize.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/ScreenSize.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/TokenRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/TokenRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/TokenRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/TokenRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/TokenRequestAsync.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/TokenRequestAsync.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/TokenRequestAsync.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/TokenRequestAsync.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/UploadRequest.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/UploadRequest.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/UploadRequest.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/UploadRequest.java diff --git a/src/java/JavaFileStorage/src/com/microsoft/live/UriBuilder.java b/src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/UriBuilder.java similarity index 100% rename from src/java/JavaFileStorage/src/com/microsoft/live/UriBuilder.java rename to src/java/JavaFileStorage/app/src/main/java/com/microsoft/live/UriBuilder.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/AsyncTaskResult.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/AsyncTaskResult.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/AsyncTaskResult.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/AsyncTaskResult.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxAppFolderFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxAppFolderFileStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxAppFolderFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxAppFolderFileStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxFileStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxFileStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/GoogleDriveFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java similarity index 99% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/GoogleDriveFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java index b7632242..b8f87a23 100644 --- a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/GoogleDriveFileStorage.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java @@ -11,7 +11,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import com.google.android.gms.auth.UserRecoverableAuthException; import com.google.api.client.extensions.android.http.AndroidHttp; import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential; import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException; diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/JavaFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/JavaFileStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/JavaFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/JavaFileStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/JavaFileStorageBase.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/JavaFileStorageBase.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/JavaFileStorageBase.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/JavaFileStorageBase.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/KitKatFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/KitKatFileStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/KitKatFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/KitKatFileStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/SftpStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/SftpStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/SftpUserInfo.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpUserInfo.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/SftpUserInfo.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpUserInfo.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SkyDriveFileStorage.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveFileStorage.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SkyDriveFileStorage.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/UserInteractionRequiredException.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/UserInteractionRequiredException.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/UserInteractionRequiredException.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/UserInteractionRequiredException.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/PrepareFileUsageListener.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/PrepareFileUsageListener.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/PrepareFileUsageListener.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/PrepareFileUsageListener.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveException.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveException.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveException.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveException.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFile.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveFile.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFile.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveFile.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFolder.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveFolder.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFolder.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveFolder.java diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveObject.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveObject.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveObject.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/skydrive/SkyDriveObject.java diff --git a/src/java/JavaFileStorage/src/keepass2android/yubiclip/scancode/KeyboardLayout.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/yubiclip/scancode/KeyboardLayout.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/yubiclip/scancode/KeyboardLayout.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/yubiclip/scancode/KeyboardLayout.java diff --git a/src/java/JavaFileStorage/src/keepass2android/yubiclip/scancode/USKeyboardLayout.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/yubiclip/scancode/USKeyboardLayout.java similarity index 100% rename from src/java/JavaFileStorage/src/keepass2android/yubiclip/scancode/USKeyboardLayout.java rename to src/java/JavaFileStorage/app/src/main/java/keepass2android/yubiclip/scancode/USKeyboardLayout.java diff --git a/src/java/JavaFileStorage/res/drawable-hdpi/ic_launcher.png b/src/java/JavaFileStorage/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from src/java/JavaFileStorage/res/drawable-hdpi/ic_launcher.png rename to src/java/JavaFileStorage/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/src/java/JavaFileStorage/res/drawable-mdpi/ic_launcher.png b/src/java/JavaFileStorage/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from src/java/JavaFileStorage/res/drawable-mdpi/ic_launcher.png rename to src/java/JavaFileStorage/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/src/java/JavaFileStorage/res/drawable-xhdpi/ic_launcher.png b/src/java/JavaFileStorage/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from src/java/JavaFileStorage/res/drawable-xhdpi/ic_launcher.png rename to src/java/JavaFileStorage/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/src/java/JavaFileStorage/res/values-v11/styles.xml b/src/java/JavaFileStorage/app/src/main/res/values-v11/styles.xml similarity index 100% rename from src/java/JavaFileStorage/res/values-v11/styles.xml rename to src/java/JavaFileStorage/app/src/main/res/values-v11/styles.xml diff --git a/src/java/JavaFileStorage/res/values-v14/styles.xml b/src/java/JavaFileStorage/app/src/main/res/values-v14/styles.xml similarity index 100% rename from src/java/JavaFileStorage/res/values-v14/styles.xml rename to src/java/JavaFileStorage/app/src/main/res/values-v14/styles.xml diff --git a/src/java/JavaFileStorage/res/values/strings.xml b/src/java/JavaFileStorage/app/src/main/res/values/strings.xml similarity index 100% rename from src/java/JavaFileStorage/res/values/strings.xml rename to src/java/JavaFileStorage/app/src/main/res/values/strings.xml diff --git a/src/java/JavaFileStorage/res/values/styles.xml b/src/java/JavaFileStorage/app/src/main/res/values/styles.xml similarity index 100% rename from src/java/JavaFileStorage/res/values/styles.xml rename to src/java/JavaFileStorage/app/src/main/res/values/styles.xml diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar deleted file mode 100644 index 0a8a25d9..00000000 Binary files a/src/java/JavaFileStorage/bin/javafilestorage.jar and /dev/null differ diff --git a/src/java/JavaFileStorage/build.gradle b/src/java/JavaFileStorage/build.gradle new file mode 100644 index 00000000..88d246d4 --- /dev/null +++ b/src/java/JavaFileStorage/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/JavaFileStorage/gradle/wrapper/gradle-wrapper.jar b/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties b/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..0c71e760 --- /dev/null +++ b/src/java/JavaFileStorage/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/JavaFileStorage/gradlew b/src/java/JavaFileStorage/gradlew new file mode 100644 index 00000000..91a7e269 --- /dev/null +++ b/src/java/JavaFileStorage/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/JavaFileStorage/gradlew.bat b/src/java/JavaFileStorage/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/src/java/JavaFileStorage/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/JavaFileStorage/import-summary.txt b/src/java/JavaFileStorage/import-summary.txt new file mode 100644 index 00000000..5ff498ed --- /dev/null +++ b/src/java/JavaFileStorage/import-summary.txt @@ -0,0 +1,69 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Replaced Jars with Dependencies: +-------------------------------- +The importer recognized the following .jar files as third party +libraries and replaced them with Gradle dependencies instead. This has +the advantage that more explicit version information is known, and the +libraries can be updated automatically. However, it is possible that +the .jar file in your project was of an older version than the +dependency we picked, which could render the project not compileable. +You can disable the jar replacement in the import wizard and try again: + +google-http-client-gson-1.16.0-rc.jar => com.google.http-client:google-http-client-gson:1.20.0 +gson-2.1.jar => com.google.code.gson:gson:2.1 + +Potentially Missing Dependency: +------------------------------- +When we replaced the following .jar files with a Gradle dependency, we +inferred the dependency version number from the filename. This +specific version may not actually be available from the repository. +If you get a build error stating that the dependency is missing, edit +the version number to for example "+" to pick up the latest version +instead. (This may require you to update your code if the library APIs +have changed.) + +gson-2.1.jar => version 2.1 in com.google.code.gson:gson:2.1 + +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 +* libs\commons-logging-1.1.1.jar => app\libs\commons-logging-1.1.1.jar +* libs\dropbox-android-sdk-1.6.2.jar => app\libs\dropbox-android-sdk-1.6.2.jar +* libs\google-api-client-1.16.0-rc.jar => app\libs\google-api-client-1.16.0-rc.jar +* libs\google-api-client-android-1.16.0-rc.jar => app\libs\google-api-client-android-1.16.0-rc.jar +* libs\google-api-services-drive-v2-rev102-1.16.0-rc.jar => app\libs\google-api-services-drive-v2-rev102-1.16.0-rc.jar +* libs\google-http-client-1.16.0-rc.jar => app\libs\google-http-client-1.16.0-rc.jar +* libs\google-http-client-android-1.16.0-rc.jar => app\libs\google-http-client-android-1.16.0-rc.jar +* libs\google-http-client-jackson-1.16.0-rc.jar => app\libs\google-http-client-jackson-1.16.0-rc.jar +* libs\google-http-client-jackson2-1.16.0-rc.jar => app\libs\google-http-client-jackson2-1.16.0-rc.jar +* libs\google-oauth-client-1.16.0-rc.jar => app\libs\google-oauth-client-1.16.0-rc.jar +* libs\httpclient-4.0.3.jar => app\libs\httpclient-4.0.3.jar +* libs\httpcore-4.0.1.jar => app\libs\httpcore-4.0.1.jar +* libs\httpmime-4.0.3.jar => app\libs\httpmime-4.0.3.jar +* libs\jackson-core-2.1.3.jar => app\libs\jackson-core-2.1.3.jar +* libs\jackson-core-asl-1.9.11.jar => app\libs\jackson-core-asl-1.9.11.jar +* libs\json_simple-1.1.jar => app\libs\json_simple-1.1.jar +* libs\jsr305-1.3.9.jar => app\libs\jsr305-1.3.9.jar +* proguard-project.txt => app\proguard-project.txt +* 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/JavaFileStorage/project.properties b/src/java/JavaFileStorage/project.properties deleted file mode 100644 index e5bc908c..00000000 --- a/src/java/JavaFileStorage/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt:proguard-google-api-client.txt - -# Project target. -target=android-17 -android.library=true -android.library.reference.1=..\\..\\..\\..\\..\\..\\..\\AppData\\Local\\Android\\android-sdk\\extras\\google\\google_play_services\\libproject\\google-play-services_lib diff --git a/src/java/JavaFileStorage/settings.gradle b/src/java/JavaFileStorage/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/src/java/JavaFileStorage/settings.gradle @@ -0,0 +1 @@ +include ':app'