From 5c0ce9375d4bd60052793bfb5aaff4c20b9832d0 Mon Sep 17 00:00:00 2001
From: RikyIsola <riky.isola@gmail.com>
Date: Sat, 6 Feb 2021 13:39:45 +0100
Subject: [PATCH] add home screen shortcut

---
 .idea/codeStyles/Project.xml                  | 24 ++++++-----------
 app/build.gradle                              |  5 ++--
 .../ExampleInstrumentedTest.kt                |  6 +++--
 app/src/main/AndroidManifest.xml              |  5 ++++
 .../island/filemanagerutils/MainActivity.kt   |  6 +++++
 .../sftp/SFTPAuthenticationActivity.kt        |  7 +----
 app/src/main/res/xml-v25/shortcuts.xml        | 14 ++++++++++
 app/src/main/res/xml-v26/shortcuts.xml        | 26 +++++++++++++++++++
 build.gradle                                  |  4 +--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 10 files changed, 70 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/xml-v25/shortcuts.xml
 create mode 100644 app/src/main/res/xml-v26/shortcuts.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a5388be..35fa7be 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,25 +1,17 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="LBRACE_ON_NEXT_LINE" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/app/build.gradle b/app/build.gradle
index 17bf0c5..889bdec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         multiDexEnabled true
-        versionCode 3
-        versionName "0.0.3"
+        versionCode 4
+        versionName "0.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -52,4 +52,5 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/island/filemanagerutils/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/island/filemanagerutils/ExampleInstrumentedTest.kt
index e18ae1a..6c6f776 100644
--- a/app/src/androidTest/java/com/island/filemanagerutils/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/island/filemanagerutils/ExampleInstrumentedTest.kt
@@ -14,9 +14,11 @@ import org.junit.Assert.*
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
+class ExampleInstrumentedTest
+{
     @Test
-    fun useAppContext() {
+    fun useAppContext()
+    {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.island.filemanagerutils", appContext.packageName)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c941da0..8b817ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,11 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.island.filemanagerutils.action.CREATE_FILE_SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts"
+                       android:resource="@xml/shortcuts" />
         </activity>
         <activity android:name=".sftp.SFTPAuthenticationActivity">
             <intent-filter>
diff --git a/app/src/main/java/com/island/filemanagerutils/MainActivity.kt b/app/src/main/java/com/island/filemanagerutils/MainActivity.kt
index 063ce81..f27d588 100644
--- a/app/src/main/java/com/island/filemanagerutils/MainActivity.kt
+++ b/app/src/main/java/com/island/filemanagerutils/MainActivity.kt
@@ -27,6 +27,7 @@ import com.google.android.material.switchmaterial.SwitchMaterial
 class MainActivity : AppCompatActivity()
 {
     private val TAG="MainActivity"
+    private val ACTION_CREATE_FILE_SHORTCUT="com.island.filemanagerutils.action.CREATE_FILE_SHORTCUT"
     private val CREATE_FILE_SHORTCUT=1
     override fun onCreate(savedInstanceState: Bundle?)
     {
@@ -60,11 +61,16 @@ class MainActivity : AppCompatActivity()
         if(!resources.getBoolean(R.bool.enable_apk_documents_provider))apkSwitch.visibility=View.GONE
         if(!(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O&&(getSystemService(ShortcutManager::class.java)).isRequestPinShortcutSupported))
             findViewById<View>(R.id.create_file_shortcut).visibility=View.GONE
+        if (intent!!.action==ACTION_CREATE_FILE_SHORTCUT)createFileShortcut()
     }
 
     fun createFileShortcut(view:View)
     {
         Log.i(TAG,"CreateFileShortcut $view")
+    }
+
+    private fun createFileShortcut()
+    {
         val intent=Intent(Intent.ACTION_OPEN_DOCUMENT).apply()
         {
             addCategory(Intent.CATEGORY_OPENABLE)
diff --git a/app/src/main/java/com/island/filemanagerutils/sftp/SFTPAuthenticationActivity.kt b/app/src/main/java/com/island/filemanagerutils/sftp/SFTPAuthenticationActivity.kt
index 3d76fd5..23cbc3b 100644
--- a/app/src/main/java/com/island/filemanagerutils/sftp/SFTPAuthenticationActivity.kt
+++ b/app/src/main/java/com/island/filemanagerutils/sftp/SFTPAuthenticationActivity.kt
@@ -27,11 +27,6 @@ class SFTPAuthenticationActivity:AppCompatActivity(),CoroutineScope by MainScope
     {
         Log.i(TAG, "OnCreate")
         super.onCreate(savedInstanceState)
-        if(intent.getStringExtra(AccountManager.KEY_ACCOUNT_TYPE)==null)
-        {
-            finish()
-            return
-        }
         setContentView(R.layout.authentication_activity)
         val uri=intent.data
         if (uri != null)
@@ -55,7 +50,7 @@ class SFTPAuthenticationActivity:AppCompatActivity(),CoroutineScope by MainScope
         val user = (findViewById<View>(R.id.username) as EditText).text.toString()
         val password = (findViewById<View>(R.id.password) as EditText).text.toString()
         if (ip.isEmpty() || port.isEmpty() || user.isEmpty() || password.isEmpty()) return
-        val accountType = intent.getStringExtra(AccountManager.KEY_ACCOUNT_TYPE)
+        val accountType = getString(R.string.account_type)
         val username = "$user@$ip:$port"
         val account = Account(username, accountType)
         val accountManager = AccountManager.get(this)
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
new file mode 100644
index 0000000..a45085e
--- /dev/null
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -0,0 +1,14 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="add_sftp"
+        android:enabled="true"
+        android:icon="@mipmap/sftp"
+        android:shortcutShortLabel="@string/add_account"
+        android:shortcutLongLabel="@string/add_account">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.island.filemanagerutils"
+            android:targetClass="com.island.filemanagerutils.sftp.SFTPAuthenticationActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v26/shortcuts.xml b/app/src/main/res/xml-v26/shortcuts.xml
new file mode 100644
index 0000000..32d4804
--- /dev/null
+++ b/app/src/main/res/xml-v26/shortcuts.xml
@@ -0,0 +1,26 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="add_sftp"
+        android:enabled="true"
+        android:icon="@mipmap/sftp"
+        android:shortcutShortLabel="@string/add_account"
+        android:shortcutLongLabel="@string/add_account">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.island.filemanagerutils"
+            android:targetClass="com.island.filemanagerutils.sftp.SFTPAuthenticationActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="add_file_shortcut"
+        android:enabled="true"
+        android:icon="@mipmap/generic_file"
+        android:shortcutShortLabel="@string/create_file_shortcut"
+        android:shortcutLongLabel="@string/create_file_shortcut">
+        <intent
+            android:action="com.island.filemanagerutils.action.CREATE_FILE_SHORTCUT"
+            android:targetPackage="com.island.filemanagerutils"
+            android:targetClass="com.island.filemanagerutils.MainActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 528ebba..80dad77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.21"
+    ext.kotlin_version = "1.4.30"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:4.0.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8861e92..02efdcc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip