From 0ae73a4ba942c0e86727b8e7e125e1ff1abbb84a Mon Sep 17 00:00:00 2001
From: Rohit <merothh@e.email>
Date: Thu, 4 Nov 2021 18:37:28 +0000
Subject: [PATCH] [r] Updater: Improve UX for users taking version upgrades

Conflicts:
	res/values/strings.xml
	src/org/lineageos/updater/UpdatesDbHelper.java
	src/org/lineageos/updater/UpdatesListAdapter.java
	src/org/lineageos/updater/misc/Utils.java
---
 res/layout/update_item_view.xml               | 12 ++++
 res/values/strings.xml                        |  8 ++-
 .../lineageos/updater/UpdatesListAdapter.java | 60 +++++++++++++++----
 .../lineageos/updater/model/UpdateBase.java   |  1 +
 4 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/res/layout/update_item_view.xml b/res/layout/update_item_view.xml
index c778334f..4928b800 100644
--- a/res/layout/update_item_view.xml
+++ b/res/layout/update_item_view.xml
@@ -36,6 +36,18 @@
                 android:textSize="16sp"
                 tools:text="LineageOS 15.1" />
 
+            <TextView
+                android:id="@+id/upgrade_type"
+                android:textColor="@color/theme_accent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:text="@string/version_upgrade_dialog_title"
+                android:textSize="14sp"
+                android:visibility="gone"
+                tools:text="@string/version_upgrade_dialog_title"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/build_date"
                 android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 670bcdda..cb870f67 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -117,8 +117,12 @@
     <string name="confirm_delete_dialog_message">Delete the selected update file?</string>
 
     <string name="apply_update_dialog_title">Apply update</string>
-    <string name="apply_update_dialog_message">You are about to install <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will restart itself in recovery mode to install the update.\n\nNote: This feature requires a compatible Recovery or updates will need to be installed manually.</string>
-    <string name="apply_update_dialog_message_ab">You are about to install <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot.</string>
+    <string name="apply_update_dialog_message">You are about to update to <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will restart itself in recovery mode to install the update.</string>
+    <string name="apply_update_dialog_message_ab">You are about to update to <xliff:g id="update_name">%1$s</xliff:g>.\n\nIf you press <xliff:g id="ok">%2$s</xliff:g>, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot.</string>
+
+    <string name="version_upgrade_dialog_title">Version Upgrade!</string>
+    <string name="version_upgrade_dialog_message">You are about to upgrade to <xliff:g id="update_name">%1$s</xliff:g>, based on Android <xliff:g id="version_android">%2$s</xliff:g>\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press <xliff:g id="ok">%3$s</xliff:g>, the device will restart itself into recovery mode to install the update.</string>
+    <string name="version_upgrade_dialog_message_ab">You are about to upgrade to <xliff:g id="update_name">%1$s</xliff:g>, based on Android <xliff:g id="version_android">%2$s</xliff:g>.\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press <xliff:g id="ok">%3$s</xliff:g>, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot.</string>
 
     <string name="cancel_installation_dialog_message">Cancel the installation?</string>
 
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index dd1a503c..fc95c0cf 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.BatteryManager;
+import android.os.Build;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.text.SpannableString;
@@ -102,6 +103,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         private final Button mAction;
         private final ImageButton mMenu;
 
+        private final TextView mUpgradeType;
         private final TextView mBuildDate;
         private final TextView mBuildVersion;
         private final TextView mBuildSize;
@@ -116,6 +118,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
             mAction = view.findViewById(R.id.update_action);
             mMenu = view.findViewById(R.id.update_menu);
 
+            mUpgradeType = view.findViewById(R.id.upgrade_type);
             mBuildDate = view.findViewById(R.id.build_date);
             mBuildVersion = view.findViewById(R.id.build_version);
             mBuildSize = view.findViewById(R.id.build_size);
@@ -278,6 +281,9 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildVersion = mActivity.getString(R.string.list_build_version,
                 update.getDisplayVersion());
 
+        if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
+            viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
+        }
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -468,26 +474,58 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                     .setPositiveButton(android.R.string.ok, null);
         }
         UpdateInfo update = mUpdaterController.getUpdate(downloadId);
-        int resId;
+
+        int title;
+        String message;
         try {
-            if (Utils.isABUpdate(update.getFile())) {
-                resId = R.string.apply_update_dialog_message_ab;
+            String buildDate =
+                    StringGenerator.getDateLocalizedUTC(
+                            mActivity, DateFormat.MEDIUM, update.getTimestamp());
+            String buildInfoText =
+                    mActivity.getString(
+                            R.string.list_build_version_date, update.getVersion(), buildDate);
+
+            if (update.getAndroidVersion().equals(Build.VERSION.RELEASE)) {
+                title = R.string.apply_update_dialog_title;
+                if (Utils.isABUpdate(update.getFile())) {
+                    message =
+                            mActivity.getString(
+                                    R.string.apply_update_dialog_message_ab,
+                                    buildInfoText,
+                                    mActivity.getString(android.R.string.ok));
+                } else {
+                    message =
+                            mActivity.getString(
+                                    R.string.apply_update_dialog_message,
+                                    buildInfoText,
+                                    mActivity.getString(android.R.string.ok));
+                }
             } else {
-                resId = R.string.apply_update_dialog_message;
+                title = R.string.version_upgrade_dialog_title;
+                if (Utils.isABUpdate(update.getFile())) {
+                    message =
+                            mActivity.getString(
+                                    R.string.version_upgrade_dialog_message_ab,
+                                    buildInfoText,
+                                    update.getAndroidVersion(),
+                                    mActivity.getString(android.R.string.ok));
+                } else {
+                    message =
+                            mActivity.getString(
+                                    R.string.version_upgrade_dialog_message,
+                                    buildInfoText,
+                                    update.getAndroidVersion(),
+                                    mActivity.getString(android.R.string.ok));
+                }
             }
         } catch (IOException e) {
             Log.e(TAG, "Could not determine the type of the update");
             return null;
         }
 
-        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
-                DateFormat.MEDIUM, update.getTimestamp());
-        String buildInfoText = mActivity.getString(R.string.list_build_version_date,
-                update.getDisplayVersion(), buildDate);
         return new AlertDialog.Builder(mActivity)
-                .setTitle(R.string.apply_update_dialog_title)
-                .setMessage(mActivity.getString(resId, buildInfoText,
-                        mActivity.getString(android.R.string.ok)))
+                .setTitle(title)
+                .setMessage(message)
                 .setPositiveButton(android.R.string.ok,
                         (dialog, which) -> {
                             Utils.triggerUpdate(mActivity, downloadId);
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index f1689bce..167e3629 100644
--- a/src/org/lineageos/updater/model/UpdateBase.java
+++ b/src/org/lineageos/updater/model/UpdateBase.java
@@ -38,6 +38,7 @@ public class UpdateBase implements UpdateBaseInfo {
         mType = update.getType();
         mVersion = update.getVersion();
         mDisplayVersion = update.getDisplayVersion();
+        mAndroidVersion = update.getAndroidVersion();
         mFileSize = update.getFileSize();
     }
 
-- 
GitLab