Merge pull request #9 from x0b/dev-x0b

Release 1.8.2

.gitignore

@@ -67,4 +67,6 @@ release/
 .idea/misc.xml
 .idea/modules.xml
 .idea/codeStyles/Project.xml
-
+.idea/codeStyles/codeStyleConfig.xml
+.idea/inspectionProfiles/Project_Default.xml
+.idea/

LICENSE_rcloneExplorer-1.7.4

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Patryk Kaczmarkiewicz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -35,30 +35,25 @@ Roadmap
 ------------
 Note that these plans are subject to change and might not materialize completely or at all.
 
-#### Current Version
-- Fixes for various bugs
-- Import without document UI
-- Android 10 (Android Q) readiness updates
-- Update to rclone 1.49.1
-- Support for x86_64 and automatic architecture editions
+#### Current Version (1.8.2)
+- Update to rclone 1.49.3
+- Android 10: Streaming now works with third party players (MX Player, VLC)
+- AndroidX migration
+- AndroidTV improvements (launcher & intent integration)
+- Support more external storage options when selecting files for upload
+- Fixed crash when selecting inaccessible storage location
 
 #### Next Version
 - Preview of Storage Access Layer for rclone (allows access to Storage Access Framework locations from rclone/rcloneExplorer)
 - New remotes
 - Bug fixes
-- Android 10 target version updates
-- AndroidX migration
-- AndroidTV improvements (launcher & intent integration)
-
 
 #### Next Month(s)
 - Bug fixes
 - Configuration dialogs for more remotes
 - Android 10 target version updates
-- AndroidX migration
 - AndroidTV improvements
 
-
 #### Next Year
 - Reasonably regular updates of rclone
 - F-Droid availability
@@ -78,7 +73,7 @@ Installation
 ------------
 Grab the [latest version](https://github.com/x0b/rcloneExplorer/releases/latest) of the signed APK and install it on your phone. Only devices running Android Lollipop 5.0 and up are supported. 
 
-If you don't know which version to pick use ```app-fatapk-release.apk```.
+If you don't know which version to pick use ```rcloneExplorer-fatapk-release.apk```.
 
 Known Issues
 ------------

app/build.gradle

@@ -7,14 +7,14 @@ android {
             keyAlias 'github_x0b'
         }
     }
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId 'ca.pkay.rcloneexplorer.x0b'
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 30
-        versionName '1.7.5'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 31
+        versionName '1.7.6'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -23,6 +23,9 @@ android {
         }
     }
     sourceSets {
+        main {
+            jniLibs.srcDirs = ["lib/x86"]
+        }
         x86 {
             jniLibs.srcDirs = ["lib/x86"]
         }
@@ -72,27 +75,30 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-vector-drawable:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:support-compat:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.core:core:1.2.0-alpha04'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'androidx.browser:browser:1.2.0-alpha07'
     implementation 'com.leinardi.android:speed-dial:2.0.0'
     implementation 'us.feras.mdv:markdownview:1.1.0'
     implementation 'jp.wasabeef:recyclerview-animators:2.3.0'
     implementation 'com.github.GrenderG:Toasty:1.3.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.7.1'
-    implementation 'com.google.firebase:firebase-core:16.0.5'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
+    implementation project(':safdav')
+    implementation 'org.nanohttpd:nanohttpd:2.3.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ca.pkay.rcloneexplorer">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="ca.pkay.rcloneexplorer">
+
+    <uses-feature android:name="android.software.leanback" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -9,21 +13,25 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme"
+            android:networkSecurityConfig="@xml/network_security_config"
+            android:requestLegacyExternalStorage="true"
+            tools:ignore="GoogleAppIndexingWarning"
+            tools:targetApi="29">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_short_name"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 
@@ -59,7 +67,7 @@
         <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="ca.pkay.rcloneexplorer.x0b.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/assets/changelog.md

@@ -1,4 +1,19 @@
-### 1.7.5
+### 1.8.2
+* **New:** Update to Rclone v1.49.3
+* **New:** Improved Android 10 support: Streaming now works with third party players
+* **New:** Improved Android TV support: App no longer crashes on unsupported link types and will show up on your home screen if installed
+* **New:** Support more external storage options when selecting files for upload
+* **New:** Updated dependencies and migrated to AndroidX
+* **Fix:** Crash when selecting inaccessible storage location
+
+***
+
+### 1.8.1 (previously released as 1.7.5-android10test)
+* **Fix:** Rebuild with go1.13 for Android 10 testing
+
+***
+
+### 1.8.0 (previously released as v1.7.5)
 * First Release with non-conflicting package name
 * **New:** Update to Rclone v1.49.1
 * **New:** Support for devices with x86_64 cpu and new Android W^X policy

app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java

@@ -9,13 +9,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import static ca.pkay.rcloneexplorer.StartActivity.tryStartActivity;
+
 
 public class AboutActivity extends AppCompatActivity {
 
@@ -117,7 +119,7 @@ private void showOpenSourceLibraries() {
 
     private void openAppGitHubLink() {
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_app_url)));
-        startActivity(browserIntent);
+        tryStartActivity(this, browserIntent);
     }
 
     private void reportBug() {
@@ -130,11 +132,11 @@ private void reportBug() {
         );
         String baseUri = getString(R.string.github_issue_url);
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(baseUri + Uri.encode(template)));
-        startActivity(browserIntent);
+        tryStartActivity(this, browserIntent);
     }
 
     private void openAuthorGitHubLink() {
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_author_url)));
-        startActivity(browserIntent);
+        tryStartActivity(this, browserIntent);
     }
 }

app/src/main/java/ca/pkay/rcloneexplorer/AboutLibsActivity.java

@@ -8,11 +8,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,6 +21,8 @@
 
 import ca.pkay.rcloneexplorer.RecyclerViewAdapters.AboutLibrariesAdapter;
 
+import static ca.pkay.rcloneexplorer.StartActivity.tryStartActivity;
+
 public class AboutLibsActivity extends AppCompatActivity implements AboutLibrariesAdapter.OnClickListener {
 
     private List<String> libraryNames;
@@ -135,7 +137,7 @@ public void onLibraryClick(String url) {
         Uri uri = Uri.parse(url);
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         if (intent.resolveActivity(getPackageManager()) != null) {
-            startActivity(intent);
+            tryStartActivity(this, intent);
         }
     }
 }

app/src/main/java/ca/pkay/rcloneexplorer/AppShortcutsHelper.java

@@ -9,13 +9,12 @@
 import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;

app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java

@@ -6,9 +6,9 @@
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import us.feras.mdv.MarkdownView;
 

app/src/main/java/ca/pkay/rcloneexplorer/ContributorActivity.java

@@ -6,9 +6,9 @@
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import us.feras.mdv.MarkdownView;
 
 

app/src/main/java/ca/pkay/rcloneexplorer/Dialogs/ColorPickerDialog.java

@@ -4,10 +4,10 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/ca/pkay/rcloneexplorer/Dialogs/FilePropertiesDialog.java

@@ -8,10 +8,10 @@
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/ca/pkay/rcloneexplorer/Dialogs/GoToDialog.java

@@ -3,10 +3,10 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;