aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/lineageos
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2019-04-14 23:52:52 +0200
committerLuca Stefani <luca.stefani.ge1@gmail.com>2019-04-28 11:33:32 +0200
commit5763bc9d388b7d7d1be04cb64951dfa6b1a07643 (patch)
tree680f9f33c882ff8dddcf5e7acfe4c163533725c9 /src/org/lineageos
parent50d0fd529159068041de72abf3deaab717d1cca6 (diff)
downloadandroid_packages_apps_Updater-5763bc9d388b7d7d1be04cb64951dfa6b1a07643.tar.gz
android_packages_apps_Updater-5763bc9d388b7d7d1be04cb64951dfa6b1a07643.tar.bz2
android_packages_apps_Updater-5763bc9d388b7d7d1be04cb64951dfa6b1a07643.zip
Updater: Make upgrade-url device specific
* After moving from the generic /upgrade.html url to a device specific one, updater needs to display that instead Change-Id: If9fc6bddfab206a97283f2080ea4df0cbb742a7d
Diffstat (limited to 'src/org/lineageos')
-rw-r--r--src/org/lineageos/updater/UpdatesListAdapter.java2
-rw-r--r--src/org/lineageos/updater/misc/Utils.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index e6f4e9a..a1aa944 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -536,7 +536,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
private void showInfoDialog() {
String messageString = String.format(StringGenerator.getCurrentLocale(mActivity),
mActivity.getString(R.string.blocked_update_dialog_message),
- mActivity.getString(R.string.blocked_update_info_url));
+ Utils.getUpgradeBlockedURL(mActivity));
SpannableString message = new SpannableString(messageString);
Linkify.addLinks(message, Linkify.WEB_URLS);
AlertDialog dialog = new AlertDialog.Builder(mActivity)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 9299114..eed4d56 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -166,6 +166,12 @@ public class Utils {
.replace("{incr}", incrementalVersion);
}
+ public static String getUpgradeBlockedURL(Context context) {
+ String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
+ SystemProperties.get(Constants.PROP_DEVICE));
+ return context.getString(R.string.blocked_update_info_url, device);
+ }
+
public static String getChangelogURL(Context context) {
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE));