Merge pull request #100 from tiwiz/autoupdate_v2

Autoupdate v2

Author: borisf

ClassySharkWS/src/com/google/classyshark/cli/CliMode.java

@@ -37,14 +37,14 @@ public class CliMode {
             "    -open\t  open an archive with GUI \n" +
             "    -export\t  export to file \n" +
             "    -methodcounts\t  packages with method counts \n" +
-            "    -inspect  experimental prints apk analysis" +
+            "    -inspect  experimental prints apk analysis\n" +
+            "    -update\tupdates ClassyShark" +
             "\nwhere args is an optional classname\n";
 
     private CliMode() {
     }
 
     public static void with(List<String> args) {
-        UpdateManager.getInstance().checkVersionConsole();
         if (args.size() < 2) {
             System.err.println("missing command line arguments " + "\n\n\n" + ERROR_MESSAGE);
             return;
@@ -71,6 +71,9 @@ public static void with(List<String> args) {
             case "-methodcounts":
                 inspectPackages(args);
                 break;
+            case "-update":
+                UpdateManager.getInstance().checkVersionConsole();
+                break;
             default:
                 System.err.println("wrong operand ==> " + operand + "\n\n\n" + ERROR_MESSAGE);
         }

ClassySharkWS/src/com/google/classyshark/updater/UpdateManager.java

@@ -16,16 +16,9 @@
 
 package com.google.classyshark.updater;
 
-import com.google.classyshark.updater.models.Release;
-import com.google.classyshark.updater.networking.AbstractReleaseCallback;
-import com.google.classyshark.updater.networking.MessageRunnable;
-import com.google.classyshark.updater.networking.NetworkManager;
-import com.google.classyshark.updater.utils.FileUtils;
-import retrofit2.Call;
-
-import javax.swing.*;
-import java.io.IOException;
-
+import com.google.classyshark.updater.networking.AbstractDownloader;
+import com.google.classyshark.updater.networking.CliDownloader;
+import com.google.classyshark.updater.networking.GuiDownloader;
 
 /**
  * This class is the core point for the update process: based on the response
@@ -35,17 +28,9 @@
  */
 public class UpdateManager{
     private static final UpdateManager instance = new UpdateManager();
-    private final AbstractReleaseCallback releaseCallback;
-    private final Release currentRelease = new Release();
-    private boolean isGui = false;
 
     private UpdateManager() {
-        releaseCallback = new AbstractReleaseCallback() {
-            @Override
-            public void onReleaseReceived(Release release) {
-                onReleaseResponse(release);
-            }
-        };
+
     }
 
     public static UpdateManager getInstance() {
@@ -61,29 +46,14 @@ public void checkVersionGui() {
     }
 
     private void checkVersion(boolean isGui) {
-        this.isGui = isGui;
-        Call<Release> call = NetworkManager.getGitHubApi().getLatestRelease();
-        call.enqueue(releaseCallback);
-    }
-
-    private void onReleaseResponse(final Release release) {
-        if (release.isNewerThan(currentRelease)) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    obtainNew(release);
-                    SwingUtilities.invokeLater(new MessageRunnable(release.getReleaseName(), release.getChangelog(), isGui));
-                }
-            }).start();
-
-        }
+        getDownloaderFrom(isGui).checkNewVersion();
     }
 
-    private void obtainNew(Release release) {
-        try {
-            FileUtils.downloadFileFrom(release);
-        } catch (IOException e) {
-            System.err.println("ERROR: " + e.getMessage());
+    private AbstractDownloader getDownloaderFrom(boolean isGui) {
+        if (isGui) {
+            return GuiDownloader.getInstance();
+        } else {
+            return CliDownloader.getInstance();
         }
     }
 }

ClassySharkWS/src/com/google/classyshark/updater/networking/AbstractDownloader.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.classyshark.updater.networking;
+
+import com.google.classyshark.updater.models.Release;
+import com.google.classyshark.updater.utils.FileUtils;
+import retrofit2.Call;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * This class is the skeleton of both the {@link GuiDownloader} and {@link CliDownloader}: it contains the core logic
+ * needed to download the new JAR and a couple of callbacks that helps in managing the different outputs between the
+ * two logics
+ */
+public abstract class AbstractDownloader extends AbstractReleaseCallback{
+    private final Release current = new Release();
+
+    public void checkNewVersion() {
+        Call<Release> call = NetworkManager.getGitHubApi().getLatestRelease();
+        call.enqueue(this);
+    }
+
+    @Override
+    public void onReleaseReceived(final Release release) {
+        if (release.isNewerThan(current)) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    if (warnAboutNew(release)) {
+                        obtainNew(release);
+                    }
+                }
+            }).start();
+
+        }
+    }
+
+    abstract boolean warnAboutNew(Release release);
+
+    private void obtainNew(Release release) {
+        try {
+            onReleaseDownloaded(FileUtils.downloadFileFrom(release), release);
+        } catch (IOException e) {
+            System.err.println("ERROR: " + e.getMessage());
+        }
+    }
+
+    abstract void onReleaseDownloaded(File file, Release release);
+}

ClassySharkWS/src/com/google/classyshark/updater/networking/CliDownloader.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.classyshark.updater.networking;
+
+import com.google.classyshark.updater.models.Release;
+
+import java.io.File;
+import java.util.Scanner;
+
+/**
+ * This class is the one taking care of downloading the update from the CLI, asking the user if they want to update
+ * to the new version when one is found.
+ */
+public class CliDownloader extends AbstractDownloader{
+    private static final AbstractDownloader instance = new CliDownloader();
+
+    private CliDownloader() {}
+
+    @Override
+    boolean warnAboutNew(Release release) {
+        String message = "New ClassyShark version available!\n" +
+                release.getReleaseName() + "\n" +
+                release.getChangelog() + "\n" +
+                "Do you wish to download it? (y/N)";
+
+        System.out.println(message);
+        Scanner scanner = new Scanner(System.in);
+
+        return scanner.next().equalsIgnoreCase("y");
+    }
+
+    @Override
+    void onReleaseDownloaded(File file, Release release) {
+
+        String message = "New ClassyShark version available offline!\n" +
+                "The new release " +
+                release.getReleaseName() +
+                " has been downloaded to " +
+                file.getAbsolutePath();
+
+        System.out.println(message);
+    }
+
+    public static AbstractDownloader getInstance() {
+        return instance;
+    }
+}

ClassySharkWS/src/com/google/classyshark/updater/networking/GuiDownloader.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.classyshark.updater.networking;
+
+import com.google.classyshark.updater.models.Release;
+
+import javax.swing.*;
+import java.io.File;
+
+/**
+ * This class is the one being called when ClassyShark shall be updated from the GUI.
+ * Its callback is informing the user about the new version and the new changelog
+ */
+public class GuiDownloader extends AbstractDownloader{
+    private final static AbstractDownloader instance = new GuiDownloader();
+
+    private GuiDownloader() {}
+
+    @Override
+    boolean warnAboutNew(Release release) {
+        return true;
+    }
+
+    @Override
+    void onReleaseDownloaded(File file, Release release) {
+        SwingUtilities.invokeLater(new MessageRunnable(release.getReleaseName(), release.getChangelog()));
+    }
+
+    public static AbstractDownloader getInstance() {
+        return instance;
+    }
+}

ClassySharkWS/src/com/google/classyshark/updater/networking/MessageRunnable.java

@@ -18,17 +18,15 @@
 
 import javax.swing.*;
 
-public class MessageRunnable implements Runnable {
+class MessageRunnable implements Runnable {
     private final String title;
     private final String changelog;
-    private final boolean isGui;
 
     private final String ICON_PATH = "/resources/ic_update.png";
 
-    public MessageRunnable(String title, String changelog, boolean gui) {
+    MessageRunnable(String title, String changelog) {
         this.title = buildTitleFrom(title);
         this.changelog = buildChangelogFrom(changelog);
-        this.isGui = gui;
     }
 
     private String buildTitleFrom(String title) {
@@ -41,12 +39,6 @@ private String buildChangelogFrom(String changelog) {
 
     @Override
     public void run() {
-        if (isGui) {
-            warnUserAboutNewRelease();
-        }
-    }
-
-    private void warnUserAboutNewRelease() {
         final Icon icon = new ImageIcon(getClass().getResource(ICON_PATH));
         JOptionPane.showConfirmDialog(null, changelog, title, JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, icon);
     }