From ecaaeff539f138347136faffc76e2034de78b3de Mon Sep 17 00:00:00 2001
From: "Mr. Dragon" <whyorean@gmail.com>
Date: Sun, 18 Feb 2018 11:47:51 +0530
Subject: [PATCH] Make main actions more robust

---
 .../in/dragons/galaxy/DetailsDownloadReceiver.java     |  1 -
 .../java/in/dragons/galaxy/UpdatableAppsActivity.java  |  1 +
 .../dragons/galaxy/fragment/details/ButtonCancel.java  |  1 -
 .../galaxy/fragment/details/ButtonDownload.java        | 10 ++++------
 app/src/main/res/layout/details_activity_layout.xml    |  1 +
 app/src/main/res/values/strings.xml                    |  2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/in/dragons/galaxy/DetailsDownloadReceiver.java b/app/src/main/java/in/dragons/galaxy/DetailsDownloadReceiver.java
index d0e445911..2d2d1df54 100644
--- a/app/src/main/java/in/dragons/galaxy/DetailsDownloadReceiver.java
+++ b/app/src/main/java/in/dragons/galaxy/DetailsDownloadReceiver.java
@@ -86,7 +86,6 @@ public class DetailsDownloadReceiver extends DownloadReceiver {
             buttonCancel.setVisibility(View.GONE);
         }
         Button buttonDownload = (Button) activityRef.get().findViewById(R.id.download);
-        buttonDownload.setText(R.string.details_download);
         buttonDownload.setEnabled(true);
     }
 }
diff --git a/app/src/main/java/in/dragons/galaxy/UpdatableAppsActivity.java b/app/src/main/java/in/dragons/galaxy/UpdatableAppsActivity.java
index f13aad3a1..68807be48 100644
--- a/app/src/main/java/in/dragons/galaxy/UpdatableAppsActivity.java
+++ b/app/src/main/java/in/dragons/galaxy/UpdatableAppsActivity.java
@@ -38,6 +38,7 @@ public class UpdatableAppsActivity extends AppListActivity {
         task.setRespectUpdateBlacklist(true);
         task.setIncludeSystemApps(true);
         task.execute();
+        loadApps();
     }
 
     @Override
diff --git a/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonCancel.java b/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonCancel.java
index 971ad0dd0..f7b9af51a 100644
--- a/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonCancel.java
+++ b/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonCancel.java
@@ -32,7 +32,6 @@ public class ButtonCancel extends Button {
         activity.startService(intentCancel);
         button.setVisibility(View.GONE);
         android.widget.Button buttonDownload = (android.widget.Button) activity.findViewById(R.id.download);
-        buttonDownload.setText(R.string.details_download);
         buttonDownload.setVisibility(View.VISIBLE);
         buttonDownload.setEnabled(true);
     }
diff --git a/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonDownload.java b/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonDownload.java
index 45261402f..0240d472c 100644
--- a/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonDownload.java
+++ b/app/src/main/java/in/dragons/galaxy/fragment/details/ButtonDownload.java
@@ -88,7 +88,6 @@ public class ButtonDownload extends Button {
         if (Paths.getApkPath(activity, app.getPackageName(), app.getVersionCode()).exists()
                 && !state.isEverythingSuccessful()
                 ) {
-            disable(R.string.details_downloading);
             NumberProgressBar progressBar = (NumberProgressBar) activity.findViewById(R.id.download_progress);
             if (null != progressBar) {
                 new DownloadProgressBarUpdater(app.getPackageName(), progressBar).execute(PurchaseTask.UPDATE_INTERVAL);
@@ -147,10 +146,10 @@ public class ButtonDownload extends Button {
 
     static class LocalPurchaseTask extends PurchaseTask {
 
-        private ButtonDownload fragment;
+        private ButtonDownload buttonDownload;
 
         public LocalPurchaseTask setFragment(ButtonDownload fragment) {
-            this.fragment = fragment;
+            this.buttonDownload = fragment;
             return this;
         }
 
@@ -163,21 +162,20 @@ public class ButtonDownload extends Button {
             task.setErrorView(errorView);
             task.setContext(context);
             task.setProgressIndicator(progressIndicator);
-            task.setFragment(fragment);
+            task.setFragment(buttonDownload);
             return task;
         }
 
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            fragment.disable(R.string.details_downloading);
         }
 
         @Override
         protected void onPostExecute(AndroidAppDeliveryData deliveryData) {
             super.onPostExecute(deliveryData);
             if (!success()) {
-                fragment.draw();
+                buttonDownload.draw();
                 if (null != getRestrictionString()) {
                     ContextUtil.toastLong(context, getRestrictionString());
                     Log.i(getClass().getSimpleName(), "No download link returned, app restriction is " + app.getRestriction());
diff --git a/app/src/main/res/layout/details_activity_layout.xml b/app/src/main/res/layout/details_activity_layout.xml
index 87f327a62..f34458c4a 100644
--- a/app/src/main/res/layout/details_activity_layout.xml
+++ b/app/src/main/res/layout/details_activity_layout.xml
@@ -112,6 +112,7 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:layout_marginTop="10dp"
+                    android:weightSum="3"
                     android:gravity="end"
                     android:orientation="horizontal">
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3eb769953..c0cc9883c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="list_incompatible">incompatible</string>
     <string name="list_check_updates">Check update</string>
     <string name="list_check_updates_txt">My apps and games</string>
-    <string name="list_update_all">Update now</string>
+    <string name="list_update_all">Update All</string>
     <string name="list_update_all_txt">Update(s) available</string>
     <string name="list_updating">Updating…</string>
     <string name="list_app_has_ads">has ads</string>