PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updater: Make upgrade-url device specific

Browse Source 
* After moving from the generic /upgrade.html url to a device specific
  one, updater needs to display that instead

Change-Id: If9fc6bddfab206a97283f2080ea4df0cbb742a7d
This commit is contained in:
Michael W
2019-04-14 23:52:52 +02:00
parent 9a13b2dc0c
commit 122377db5f
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -142,7 +142,7 @@
<string name="blocked_update_dialog_title">Update blocked</string>
<string name="blocked_update_dialog_message">This update cannot be installed using the updater app. Please read <xliff:g id="info_url">%1$s</xliff:g> for more information.</string>
<string name="blocked_update_info_url" translatable="false">http://wiki.lineageos.org/upgrading.html</string>
<string name="blocked_update_info_url" translatable="false">http://wiki.lineageos.org/devices/<xliff:g id="device_name">%1$s</xliff:g>/upgrade</string>
<string name="export_channel_title">Export completion</string>
<string name="new_updates_channel_title">New updates</string>

2
src/org/lineageos/updater/UpdatesListAdapter.java
View File

@@ -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)

6
src/org/lineageos/updater/misc/Utils.java
View File

@@ -162,6 +162,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));