From d27622de1e1067275318ff320be091c1abaae2e9 Mon Sep 17 00:00:00 2001
From: jludden <jasonludden@gmail.com>
Date: Sun, 11 Nov 2018 19:54:35 +0800
Subject: [PATCH 1/2] downloaded files can now be opened with one click

For consistency, I removed the view file option from the overflow menu as well
---
 .../giga/ui/adapter/MissionAdapter.java       | 51 +++++++++----------
 app/src/main/res/menu/mission.xml             |  6 +--
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index d5555c2be..de7301a30 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -96,12 +96,11 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
             }
         });
 
-		/*h.itemView.setOnClickListener(new View.OnClickListener() {
+		h.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
 			public void onClick(View v) {
-				showDetail(h);
 			}
-		});*/
+		});
 
         return h;
     }
@@ -200,14 +199,12 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         Menu menu = popup.getMenu();
         MenuItem start = menu.findItem(R.id.start);
         MenuItem pause = menu.findItem(R.id.pause);
-        MenuItem view = menu.findItem(R.id.view);
         MenuItem delete = menu.findItem(R.id.delete);
         MenuItem checksum = menu.findItem(R.id.checksum);
 
         // Set to false first
         start.setVisible(false);
         pause.setVisible(false);
-        view.setVisible(false);
         delete.setVisible(false);
         checksum.setVisible(false);
 
@@ -222,7 +219,6 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
                 pause.setVisible(true);
             }
         } else {
-            view.setVisible(true);
             delete.setVisible(true);
             checksum.setVisible(true);
         }
@@ -241,27 +237,6 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
                         mBinder.onMissionRemoved(mItemList.get(h.position));
                         h.lastTimeStamp = -1;
                         h.lastDone = -1;
-                        return true;
-                    case R.id.view:
-                        File f = new File(h.mission.location, h.mission.name);
-                        String ext = Utility.getFileExt(h.mission.name);
-
-                        Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
-
-                        if (ext == null) {
-                            Log.w(TAG, "Can't view file because it has no extension: " +
-                                    h.mission.name);
-                            return false;
-                        }
-
-                        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-                        Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
-                        if (f.exists()) {
-                            viewFileWithFileProvider(f, mime);
-                        } else {
-                            Log.w(TAG, "File doesn't exist");
-                        }
-
                         return true;
                     case R.id.delete:
                         mDeleteDownloadManager.add(h.mission);
@@ -282,6 +257,28 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         popup.show();
     }
 
+    private boolean viewFile(ViewHolder h) {
+        File f = new File(h.mission.location, h.mission.name);
+        String ext = Utility.getFileExt(h.mission.name);
+
+        Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
+
+        if (ext == null) {
+            Log.w(TAG, "Can't view file because it has no extension: " +
+                    h.mission.name);
+            return true;
+        }
+
+        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
+        Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
+        if (f.exists()) {
+            viewFileWithFileProvider(f, mime);
+        } else {
+            Log.w(TAG, "File doesn't exist");
+        }
+        return false;
+    }
+
     private void viewFileWithFileProvider(File file, String mimetype) {
         String ourPackage = mContext.getApplicationContext().getPackageName();
         Uri uri = FileProvider.getUriForFile(mContext, ourPackage + ".provider", file);
diff --git a/app/src/main/res/menu/mission.xml b/app/src/main/res/menu/mission.xml
index b76d1a923..c1688ac5b 100644
--- a/app/src/main/res/menu/mission.xml
+++ b/app/src/main/res/menu/mission.xml
@@ -7,11 +7,7 @@
 	<item
 		android:id="@+id/pause"
 		android:title="@string/pause"/>
-	
-	<item
-		android:id="@+id/view"
-		android:title="@string/view"/>
-	
+
 	<item
 		android:id="@+id/delete"
 		android:title="@string/delete"/>

From 0df8d13020420925517f247595908a0ad1951738 Mon Sep 17 00:00:00 2001
From: jludden <jasonludden@gmail.com>
Date: Sun, 11 Nov 2018 22:25:37 +0800
Subject: [PATCH 2/2] downloads can now be viewed with one click fixed

---
 .../main/java/us/shandian/giga/ui/adapter/MissionAdapter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index de7301a30..bca8796b5 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -99,6 +99,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		h.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
 			public void onClick(View v) {
+                if(h.mission.finished) viewFile(h);
 			}
 		});