Fix #49

Also rename dialog is set to automatically close when a download is finished to prevent anticipated errors.
hikikomoriphoenix · May 6, 2019 · 8f132f8 · 8f132f8
1 parent e1ce46d
commit 8f132f8
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 6 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/...c/main/java/marabillas/loremar/lmvideodownloader/bookmarks_feature/AddBookmarkDialog.java b/...c/main/java/marabillas/loremar/lmvideodownloader/bookmarks_feature/AddBookmarkDialog.java
@@ -152,6 +152,11 @@ public void onClick(DialogInterface dialog, int which) {
                     .show();
         } else if (v == renameTitle) {
             new RenameDialog(activity, bookmark.title) {
+                @Override
+                public void onDismiss(DialogInterface dialog) {
+
+                }
+
                 @Override
                 public void onOK(String newName) {
                     bookmark.title = newName;

diff --git a/app/src/main/java/marabillas/loremar/lmvideodownloader/bookmarks_feature/Bookmarks.java b/app/src/main/java/marabillas/loremar/lmvideodownloader/bookmarks_feature/Bookmarks.java
@@ -291,6 +291,11 @@ public boolean onMenuItemClick(MenuItem item) {
                                         position = getAdapterPosition();
                                     }
                                     new RenameDialog(getActivity(), title.getText().toString()) {
+                                        @Override
+                                        public void onDismiss(DialogInterface dialog) {
+
+                                        }
+
                                         @Override
                                         public void onOK(String newName) {
 

diff --git a/app/src/main/java/marabillas/loremar/lmvideodownloader/browsing_feature/VideoList.java b/app/src/main/java/marabillas/loremar/lmvideodownloader/browsing_feature/VideoList.java
@@ -215,6 +215,11 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             public void onClick(View v) {
                 if (v == expand.findViewById(R.id.videoFoundRename)) {
                     new RenameDialog(activity, name.getText().toString()) {
+                        @Override
+                        public void onDismiss(DialogInterface dialog) {
+
+                        }
+
                         @Override
                         public void onOK(String newName) {
                             adjustedLayout = false;

diff --git a/...a/marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsCompleted.java b/...a/marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsCompleted.java
@@ -270,6 +270,11 @@ public void onClick(DialogInterface dialog, int which) {
                 @Override
                 public void onClick(View v) {
                     new RenameDialog(getActivity(), baseName) {
+                        @Override
+                        public void onDismiss(DialogInterface dialog) {
+
+                        }
+
                         @Override
                         public void onOK(String newName) {
                             File downloadsFolder = Environment.getExternalStoragePublicDirectory

diff --git a/.../marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsInProgress.java b/.../marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsInProgress.java
@@ -99,6 +99,8 @@ public class DownloadsInProgress extends LMvdFragment implements DownloadManager
     private OnAddDownloadItemToInactiveListener onAddDownloadItemToInactiveListener;
     private OnNumDownloadsInProgressChangeListener onNumDownloadsInProgressChangeListener;
 
+    private RenameDialog activeRenameDialog;
+
     public interface OnAddDownloadedVideoToCompletedListener {
         void onAddDownloadedVideoToCompleted(String name, String type);
     }
@@ -252,6 +254,10 @@ public void onDownloadFinished() {
         getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
+                if (activeRenameDialog != null && activeRenameDialog.isActive()) {
+                    activeRenameDialog.dismiss();
+                }
+
                 downloadsStartPauseButton.setText(R.string.start);
                 tracking.stopTracking();
                 if (downloads.size() > 0) {
@@ -460,10 +466,21 @@ public void onClick(DialogInterface dialog, int which) {
             rename.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    new RenameDialog(getActivity(), name.getText().toString()) {
+                    final int itemToRenamePosition = getAdapterPosition();
+                    if (itemToRenamePosition == -1)
+                        return;
+
+                    activeRenameDialog = new RenameDialog(
+                            getActivity(),
+                            name.getText().toString()) {
+                        @Override
+                        public void onDismiss(DialogInterface dialog) {
+                            activeRenameDialog = null;
+                        }
+
                         @Override
                         public void onOK(String newName) {
-                            queues.renameItem(getAdapterPosition(), newName);
+                            queues.renameItem(itemToRenamePosition, newName);
                             File renamedFile = new File(Environment
                                     .getExternalStoragePublicDirectory
                                             (Environment.DIRECTORY_DOWNLOADS), downloads.get
@@ -485,6 +502,7 @@ public void onOK(String newName) {
                                 saveQueues();
                                 getAdapter().notifyItemChanged(getAdapterPosition());
                             }
+                            activeRenameDialog = null;
                         }
                     };
                 }

diff --git a/...va/marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsInactive.java b/...va/marabillas/loremar/lmvideodownloader/download_feature/fragments/DownloadsInactive.java
@@ -208,6 +208,11 @@ public void onClick(DialogInterface dialog, int which) {
                 @Override
                 public void onClick(View v) {
                     new RenameDialog(getActivity(), name.getText().toString()) {
+                        @Override
+                        public void onDismiss(DialogInterface dialog) {
+
+                        }
+
                         @Override
                         public void onOK(String newName) {
                             File downloadsFolder = Environment.getExternalStoragePublicDirectory

diff --git a/app/src/main/java/marabillas/loremar/lmvideodownloader/utils/RenameDialog.java b/app/src/main/java/marabillas/loremar/lmvideodownloader/utils/RenameDialog.java
@@ -31,22 +31,23 @@
  * Created by loremar on 3/20/18.
  */
 
-public abstract class RenameDialog implements DialogInterface.OnClickListener {
+public abstract class RenameDialog implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
     private EditText text;
     private Context context;
+    private AlertDialog dialog;
 
     protected RenameDialog(Context context, String hint) {
         this.context = context;
         text = new EditText(context);
         text.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT));
         text.setHint(hint);
-        new AlertDialog.Builder(context)
+        dialog = new AlertDialog.Builder(context)
                 .setView(text).setMessage("Type new name:")
                 .setPositiveButton("OK", this)
                 .setNegativeButton("CANCEL", this)
-                .create()
-                .show();
+                .create();
+        dialog.show();
     }
 
     @Override
@@ -58,4 +59,12 @@ public final void onClick(DialogInterface dialog, int which) {
     }
 
     public abstract void onOK(String newName);
+
+    public boolean isActive() {
+        return dialog.isShowing();
+    }
+
+    public void dismiss() {
+        dialog.dismiss();
+    }
 }