Addressing #36

Internal Updater behavior.
avluis · Aug 25, 2015 · fba32f9 · fba32f9
1 parent a442680
commit fba32f9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/app/src/main/java/me/devsaki/hentoid/HentoidApplication.java b/app/src/main/java/me/devsaki/hentoid/HentoidApplication.java
@@ -81,7 +81,7 @@ protected int sizeOf(String key, Bitmap bitmap) {
 
     private void UpdateCheck(boolean onlyWifi) {
         if (onlyWifi) {
-            UpdateCheck.getInstance().checkForUpdate(getApplicationContext(), updateURL, true, new UpdateCheck.UpdateCheckCallback() {
+            UpdateCheck.getInstance().checkForUpdate(getApplicationContext(), updateURL, true, false, new UpdateCheck.UpdateCheckCallback() {
                 @Override
                 public void noUpdateAvailable() {
                     System.out.println("No update available.");
@@ -93,7 +93,7 @@ public void onUpdateAvailable() {
                 }
             });
         } else {
-            UpdateCheck.getInstance().checkForUpdate(getApplicationContext(), updateURL, false, new UpdateCheck.UpdateCheckCallback() {
+            UpdateCheck.getInstance().checkForUpdate(getApplicationContext(), updateURL, false, false, new UpdateCheck.UpdateCheckCallback() {
                 @Override
                 public void noUpdateAvailable() {
                     System.out.println("No update available.");

diff --git a/app/src/main/java/me/devsaki/hentoid/PreferencesActivity.java b/app/src/main/java/me/devsaki/hentoid/PreferencesActivity.java
@@ -259,7 +259,8 @@ public void onClick(DialogInterface dialog, int which) {
             mUpdateCheck.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    UpdateCheck.getInstance().checkForUpdate(getActivity().getApplicationContext(), updateURL, false, new UpdateCheck.UpdateCheckCallback() {
+                    Toast.makeText(getActivity().getApplicationContext(), "Checking for updates...", Toast.LENGTH_SHORT).show();
+                    UpdateCheck.getInstance().checkForUpdate(getActivity().getApplicationContext(), updateURL, false, true, new UpdateCheck.UpdateCheckCallback() {
                         @Override
                         public void noUpdateAvailable() {
                             System.out.println("Manual update check: No update available.");

diff --git a/app/src/main/java/me/devsaki/hentoid/updater/IUpdateCheck.java b/app/src/main/java/me/devsaki/hentoid/updater/IUpdateCheck.java
@@ -7,7 +7,7 @@
  * Created by avluis on 8/21/15.
  */
 public interface IUpdateCheck {
-    void checkForUpdate(final Context context, final String updateURL, final boolean onlyWifi, final UpdateCheck.UpdateCheckCallback updateCheckResult);
+    void checkForUpdate(final Context context, final String updateURL, final boolean onlyWifi, final boolean showToast, final UpdateCheck.UpdateCheckCallback updateCheckResult);
 
     int getAppVersionCode(final Context context) throws PackageManager.NameNotFoundException;
 }
diff --git a/app/src/main/java/me/devsaki/hentoid/updater/UpdateCheck.java b/app/src/main/java/me/devsaki/hentoid/updater/UpdateCheck.java
@@ -63,6 +63,7 @@ public class UpdateCheck implements IUpdateCheck {
     private int progressBar;
     private long total;
     private long done;
+    private boolean showToast;
 
     private UpdateCheck() {
     }
@@ -75,7 +76,7 @@ public static UpdateCheck getInstance() {
     }
 
     @Override
-    public void checkForUpdate(Context context, final String updateURL, final boolean onlyWifi, final UpdateCheckCallback updateCheckResult) {
+    public void checkForUpdate(Context context, final String updateURL, final boolean onlyWifi, final boolean showToast, final UpdateCheckCallback updateCheckResult) {
         if (context == null || updateURL == null) {
             throw new NullPointerException("context or UpdateURL is null");
         }
@@ -98,6 +99,8 @@ public void checkForUpdate(Context context, final String updateURL, final boolea
         } else {
             Log.e("networkInfo", "Network is not connected!");
         }
+
+        this.showToast = showToast;
     }
 
     private void runAsyncTask(String updateURL) {
@@ -311,24 +314,28 @@ protected Void doInBackground(String... params) {
                     if (getAppVersionCode(context) < updateVersionCode) {
                         if (updateCheckResult != null) {
                             updateCheckResult.onUpdateAvailable();
-                            mHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(context, "Update Check: An update is available!", Toast.LENGTH_SHORT).show();
-                                }
-                            });
+                            if (showToast) {
+                                mHandler.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(context, "Update Check: An update is available!", Toast.LENGTH_LONG).show();
+                                    }
+                                });
+                            }
                         }
                         downloadURL = jsonObject.getString(KEY_UPDATED_URL);
                         updateAvailableNotification(downloadURL);
                     } else {
                         if (updateCheckResult != null) {
                             updateCheckResult.noUpdateAvailable();
-                            mHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(context, "Update Check: No new updates.", Toast.LENGTH_SHORT).show();
-                                }
-                            });
+                            if (showToast) {
+                                mHandler.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(context, "Update Check: No new updates.", Toast.LENGTH_LONG).show();
+                                    }
+                                });
+                            }
                         }
                         Log.i(DEBUG_TAG, "NO_UPDATE_FOUND_ON_SERVER");
                     }