From 6e7cdbc120bd0112755650122681b46b2a08fa6d Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarkiewicz Date: Fri, 1 Jun 2018 20:40:36 -0600 Subject: [PATCH 1/5] Fix app hanging for dirs with large number of files --- .idea/misc.xml | 2 +- .../java/ca/pkay/rcloneexplorer/Rclone.java | 41 +++++++++++-------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java b/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java index abb7f35..792c3b6 100644 --- a/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java +++ b/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java @@ -111,11 +111,6 @@ public List getDirectoryContent(String remote, String path) { Process process; try { process = Runtime.getRuntime().exec(command); - process.waitFor(); - if (process.exitValue() != 0) { - logErrorOutput(process); - return null; - } BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); String line; @@ -124,6 +119,12 @@ public List getDirectoryContent(String remote, String path) { output.append(line); } + process.waitFor(); + if (process.exitValue() != 0) { + logErrorOutput(process); + return null; + } + results = new JSONArray(output.toString()); } catch (IOException | InterruptedException | JSONException e) { @@ -159,12 +160,6 @@ public List getRemotes() { JSONObject remotesJSON; try { process = Runtime.getRuntime().exec(command); - process.waitFor(); - if (process.exitValue() != 0) { - Toasty.error(context, context.getString(R.string.error_getting_remotes), Toast.LENGTH_SHORT, true).show(); - logErrorOutput(process); - return new ArrayList<>(); - } BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); String line; @@ -172,6 +167,13 @@ public List getRemotes() { output.append(line); } + process.waitFor(); + if (process.exitValue() != 0) { + Toasty.error(context, context.getString(R.string.error_getting_remotes), Toast.LENGTH_SHORT, true).show(); + logErrorOutput(process); + return new ArrayList<>(); + } + remotesJSON = new JSONObject(output.toString()); } catch (IOException | InterruptedException | JSONException e) { Toasty.error(context, context.getString(R.string.error_getting_remotes), Toast.LENGTH_SHORT, true).show(); @@ -574,14 +576,10 @@ public Boolean decryptConfig(String password) { try { process = Runtime.getRuntime().exec(command, environmentalVars); - process.waitFor(); - } catch (IOException | InterruptedException e) { + } catch (IOException e) { e.printStackTrace(); return false; } - if (process.exitValue() != 0) { - return false; - } ArrayList result = new ArrayList<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); @@ -595,6 +593,17 @@ public Boolean decryptConfig(String password) { return false; } + try { + process.waitFor(); + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + + if (process.exitValue() != 0) { + return false; + } + String appsFileDir = context.getFilesDir().getPath(); File file = new File(appsFileDir, "rclone.conf"); From 32a77c85f545cedbdcb930bad0411e9a8d2d9a27 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarkiewicz Date: Fri, 1 Jun 2018 21:05:15 -0600 Subject: [PATCH 2/5] Fix theme of password dialog --- app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java index f342a90..44b27fa 100644 --- a/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java +++ b/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java @@ -331,6 +331,7 @@ private void askForConfigPassword() { .setMessage(R.string.please_enter_password) .setNegativeButton(R.string.cancel) .setPositiveButton(R.string.okay_confirmation) + .setDarkTheme(isDarkTheme) .setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD) .setOnPositiveListener(new InputDialog.OnPositive() { @Override From 1ca0e7ca56742e1fe777f253a3fafb0d88c78d55 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarkiewicz Date: Fri, 1 Jun 2018 21:12:59 -0600 Subject: [PATCH 3/5] Fix 'open-as' --- .../Fragments/FileExplorerFragment.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java b/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java index 3c7b69f..6636703 100644 --- a/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java +++ b/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java @@ -478,21 +478,15 @@ private void showOpenAsDialog(final FileItem fileItem) { .setOnClickListener(new OpenAsDialog.OnClickListener() { @Override public void onClickText() { - if (recyclerViewAdapter.getNumberOfSelectedItems() == 1) { - new DownloadAndOpen(DownloadAndOpen.OPEN_AS_TEXT).execute(fileItem); - } + new DownloadAndOpen(DownloadAndOpen.OPEN_AS_TEXT).execute(fileItem); } @Override public void onClickAudio() { - if (recyclerViewAdapter.getNumberOfSelectedItems() == 1) { - new StreamTask(StreamTask.OPEN_AS_AUDIO).execute(fileItem); - } + new StreamTask(StreamTask.OPEN_AS_AUDIO).execute(fileItem); } @Override public void onClickVideo() { - if (recyclerViewAdapter.getNumberOfSelectedItems() == 1) { - new StreamTask(StreamTask.OPEN_AS_VIDEO).execute(fileItem); - } + new StreamTask(StreamTask.OPEN_AS_VIDEO).execute(fileItem); } @Override public void onClickImage() { From e98e85818c96057baf920118b8c9906592112720 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarkiewicz Date: Fri, 1 Jun 2018 21:23:09 -0600 Subject: [PATCH 4/5] Remove unused files --- app/src/main/ic_launcher-web.png | Bin 19270 -> 0 bytes app/src/main/ic_shortcut_onedrive-web.png | Bin 13074 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/src/main/ic_launcher-web.png delete mode 100644 app/src/main/ic_shortcut_onedrive-web.png diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png deleted file mode 100644 index a756346d829cd5cad20300255c72c85fb23af9a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19270 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 QL;|{`t$)7YoXx}k03eSOZvX%Q From fb5e0561b9c1bc1392d1afec1cc6d7845bdcfad7 Mon Sep 17 00:00:00 2001 From: Patryk Kaczmarkiewicz Date: Fri, 1 Jun 2018 21:28:13 -0600 Subject: [PATCH 5/5] Update app version --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes app/build.gradle | 4 ++-- app/src/main/assets/changelog.md | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 6e485b631481a52b4de994eb54c1aef36cfef420..55d73bb8a580f5fc44cbca837d40debcf9851ab6 100644 GIT binary patch delta 33 rcmV++0N($X1eXMmm;}Cu3(~QiY5@_WD&Jy3^?B#lvuh)lRx_&X2D delta 33 pcmbQvGM#0@43@nvsu3IKWHAcbPn6^5u-LKV`-Y<5Vr_~x6#&om4BP+! diff --git a/app/build.gradle b/app/build.gradle index 82755b6..dcb32be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "ca.pkay.rcloneexplorer" minSdkVersion 21 targetSdkVersion 27 - versionCode 18 - versionName "1.3.2-DEV" + versionCode 19 + versionName "1.3.3-DEV" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/assets/changelog.md b/app/src/main/assets/changelog.md index 1fb2920..cb208ba 100644 --- a/app/src/main/assets/changelog.md +++ b/app/src/main/assets/changelog.md @@ -1,3 +1,11 @@ +### 1.3.3 +* **Fix:** Infinite loading for directories with large number of files +* **Fix:** Open as not working +* **Fix:** App launching behaviour +* **Fix:** Theme of password dialog + +*** + ### 1.3.2 * **New:** File options for individual files * **New:** Generate public link to file/folder (rclone link)