Merge pull request #202 from kaczmarkiewiczp/dev

v1.7.0

Author: patrykcoding

.idea/assetWizardSettings.xml

@@ -7,8 +7,8 @@ android {
         applicationId "ca.pkay.rcloneexplorer"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 24
-        versionName "1.6.0-DEV"
+        versionCode 25
+        versionName "1.7.0-DEV"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

.idea/caches/build_file_checksums.ser

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ca.pkay.rcloneexplorer">
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

.idea/misc.xml

@@ -1,3 +1,17 @@
+### 1.7.0
+* **New:** Show progress in upload, download, and sync notifications
+* **New:** Pin remotes to navigation drawer
+* **New:** Option to limit transfers to Wi-Fi only
+* **New:** Sync
+* **New:** Add sync webdev
+* **New:** When downloading, uploading, syncing, transfer only one file in parallel
+* **New:** Make crash reports and app update notifications optional
+* **New:** Update some icons
+* **Fix:** Proper encoding of URLs for streaming
+* **Fix:** Crashes
+
+***
+
 ### 1.6.0
 * **New:** Allow setting which remotes are in app shortcuts (from settings)
 * **New:** Pin remotes on supported launchers (Android 8.0)

app/build.gradle

@@ -45,6 +45,7 @@ private void init(Context context) {
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         childFrame = new LinearLayout(context);
         childFrame.setLayoutParams(layoutParams);
+        childFrame.removeAllViews();
         this.context = context;
         addView(childFrame, layoutParams);
         pathList = new ArrayList<>();

app/src/main/AndroidManifest.xml

@@ -61,6 +61,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         LayoutInflater inflater = ((FragmentActivity)context).getLayoutInflater();
         View view = inflater.inflate(R.layout.dialog_loading_indicator, null);
         builder.setCancelable(cancelable);
+        setCancelable(cancelable);
         if (title != null) {
             builder.setTitle(title);
         } else if (titleId > 0) {

app/src/main/assets/changelog.md

@@ -1075,6 +1075,7 @@ private void onClickOutsideOfView() {
     public void onAttach(Context context) {
         super.onAttach(context);
         this.context = context;
+        isRunning = true;
     }
 
     @Override
@@ -1980,10 +1981,12 @@ protected Boolean doInBackground(Void... voids) {
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
-            if (result) {
-                Toasty.success(context, getString(R.string.trash_emptied), Toast.LENGTH_SHORT, true).show();
-            } else {
-                Toasty.error(context, getString(R.string.error_emptying_trash), Toast.LENGTH_SHORT, true).show();
+            if (isRunning) {
+                if (result) {
+                    Toasty.success(context, getString(R.string.trash_emptied), Toast.LENGTH_SHORT, true).show();
+                } else {
+                    Toasty.error(context, getString(R.string.error_emptying_trash), Toast.LENGTH_SHORT, true).show();
+                }
             }
         }
     }

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

@@ -17,7 +17,6 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -46,10 +45,20 @@ public class RemotesFragment extends Fragment implements RemotesRecyclerViewAdap
     private Rclone rclone;
     private RemotesRecyclerViewAdapter recyclerViewAdapter;
     private List<RemoteItem> remotes;
-    private OnRemoteClickListener clickListener;
+    private OnRemoteClickListener remoteClickListener;
+    private AddRemoteToNavDrawer pinToDrawerListener;
     private Context context;
     private boolean isDarkTheme;
 
+    public interface OnRemoteClickListener {
+        void onRemoteClick(RemoteItem remote);
+    }
+
+    public interface AddRemoteToNavDrawer {
+        void addRemoteToNavDrawer(RemoteItem remoteItem);
+        void removeRemoteFromNavDrawer(RemoteItem remoteItem);
+    }
+
     /**
      * Mandatory empty constructor for the fragment manager to instantiate the
      * fragment (e.g. upon screen orientation changes).
@@ -109,7 +118,7 @@ public void onClick(View v) {
         RecyclerView recyclerView =  view.findViewById(R.id.remotes_list);
         recyclerView.setItemAnimator(new LandingAnimator());
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerViewAdapter = new RemotesRecyclerViewAdapter(remotes, clickListener, this);
+        recyclerViewAdapter = new RemotesRecyclerViewAdapter(remotes, remoteClickListener, this);
         recyclerView.setAdapter(recyclerViewAdapter);
 
         SpeedDialView speedDialView = view.findViewById(R.id.fab);
@@ -139,7 +148,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             case CONFIG_RECREATE_REQ_CODE:
                 remotes = rclone.getRemotes();
                 Collections.sort(remotes);
-                recyclerViewAdapter = new RemotesRecyclerViewAdapter(remotes, clickListener, this);
+                recyclerViewAdapter = new RemotesRecyclerViewAdapter(remotes, remoteClickListener, this);
                 refreshFragment();
                 if (remotes.size() == 1) {
                     AppShortcutsHelper.populateAppShortcuts(context, remotes);
@@ -164,17 +173,23 @@ public void onAttach(Context context) {
         super.onAttach(context);
         this.context = context;
         if (context instanceof OnRemoteClickListener) {
-            clickListener = (OnRemoteClickListener) context;
+            remoteClickListener = (OnRemoteClickListener) context;
         } else {
             throw new RuntimeException(context.toString() + " must implement OnRemoteClickListener");
         }
+        if (context instanceof AddRemoteToNavDrawer) {
+            pinToDrawerListener = (AddRemoteToNavDrawer) context;
+        } else {
+            throw new RuntimeException(context.toString() + " must implement AddRemoteToNavDrawer");
+        }
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         context = null;
-        clickListener = null;
+        remoteClickListener = null;
+        pinToDrawerListener = null;
     }
 
     @Override
@@ -199,6 +214,13 @@ public boolean onMenuItemClick(MenuItem item) {
                             pinRemote(remoteItem);
                         }
                         break;
+                    case R.id.action_favorite:
+                        if (remoteItem.isDrawerPinned()) {
+                            unpinFromDrawer(remoteItem);
+                        } else {
+                            pinToDrawer(remoteItem);
+                        }
+                        break;
                     case R.id.action_add_to_home_screen:
                         AppShortcutsHelper.addRemoteToHomeScreen(context, remoteItem);
                         break;
@@ -220,6 +242,13 @@ public boolean onMenuItemClick(MenuItem item) {
             MenuItem addToHomeScreenAction = popupMenu.getMenu().findItem(R.id.action_add_to_home_screen);
             addToHomeScreenAction.setVisible(false);
         }
+
+        MenuItem favoriteAction = popupMenu.getMenu().findItem(R.id.action_favorite);
+        if (remoteItem.isDrawerPinned()) {
+            favoriteAction.setTitle(R.string.unpin_from_drawer);
+        } else {
+            favoriteAction.setTitle(R.string.pin_to_drawer);
+        }
     }
 
     private void pinRemote(RemoteItem remoteItem) {
@@ -260,6 +289,38 @@ private void unPinRemote(RemoteItem remoteItem) {
         recyclerViewAdapter.moveDataItem(remotes, from, to);
     }
 
+    private void pinToDrawer(RemoteItem remoteItem) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+
+        Set<String> stringSet = sharedPreferences.getStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), new HashSet<String>());
+        Set<String> pinnedRemotes = new HashSet<>(stringSet); // bug in android means that we have to create a copy
+        pinnedRemotes.add(remoteItem.getName());
+        remoteItem.setDrawerPinned(true);
+
+        editor.putStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), pinnedRemotes);
+        editor.apply();
+
+        pinToDrawerListener.addRemoteToNavDrawer(remoteItem);
+    }
+
+    private void unpinFromDrawer(RemoteItem remoteItem) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+
+        Set<String> stringSet = sharedPreferences.getStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), new HashSet<String>());
+        Set<String> pinnedRemotes = new HashSet<>(stringSet);
+        if (pinnedRemotes.contains(remoteItem.getName())) {
+            pinnedRemotes.remove(remoteItem.getName());
+        }
+        remoteItem.setDrawerPinned(false);
+
+        editor.putStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), pinnedRemotes);
+        editor.apply();
+
+        pinToDrawerListener.removeRemoteFromNavDrawer(remoteItem);
+    }
+
     private void deleteRemote(final RemoteItem remoteItem) {
         AlertDialog.Builder builder;
         if (isDarkTheme) {
@@ -279,10 +340,6 @@ public void onClick(DialogInterface dialog, int which) {
         builder.show();
     }
 
-    public interface OnRemoteClickListener {
-        void onRemoteClick(RemoteItem remote);
-    }
-
     @SuppressLint("StaticFieldLeak")
     private class DeleteRemote extends AsyncTask<Void, Void, Void> {
 
@@ -313,6 +370,13 @@ protected void onPostExecute(Void aVoid) {
 
             AppShortcutsHelper.removeAppShortcut(context, remoteItem.getName());
 
+            Set<String> drawerPinnedRemote = sharedPreferences.getStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), new HashSet<String>());
+            if (drawerPinnedRemote.contains(remoteItem.getName())) {
+                drawerPinnedRemote.remove(remoteItem.getName());
+                editor.putStringSet(getString(R.string.shared_preferences_drawer_pinned_remotes), new HashSet<String>(pinnedRemotes));
+                editor.apply();
+            }
+            
             recyclerViewAdapter.removeItem(remoteItem);
 
             if (rclone.getRemotes().isEmpty()) {