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

Define the entire server URL as resource

Browse Source 
Currently the URL is only partially customizable, part of
it is hard-coded and there's no clear indication of it.
Define the entire URL as resource string and use placeholders
for runtime variables.

Also, invalidate old overrides by changing the name of the
resource.

Warning: lineage.updater.uri must be updated accordingly

Change-Id: Iecfdaf9d422d08a707c7319bafea5befc6b757d2
This commit is contained in:
Gabriele M
2018-03-29 19:28:22 +02:00
parent 4fa7ba910a
commit 5252d60671
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -26,7 +26,13 @@
The path is relative to the root of the external storage.--> The path is relative to the root of the external storage.-->
<string name="export_path" translatable="false">LineageOS updates/</string> <string name="export_path" translatable="false">LineageOS updates/</string>
<string name="conf_update_server_url_def" translatable="false">https://download.lineageos.org/api</string> <!--
Optional placeholders replaced at runtime:
{device} - Device name
{type} - Build type
{incr} - Incremental version
-->
<string name="updater_server_url" translatable="false">https://download.lineageos.org/api/v1/{device}/{type}/{incr}</string>
<string name="verification_failed_notification">Verification failed</string> <string name="verification_failed_notification">Verification failed</string>
<string name="verifying_download_notification">Verifying update</string> <string name="verifying_download_notification">Verifying update</string>

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

@@ -144,15 +144,19 @@ public class Utils {
} }
public static String getServerURL(Context context) { public static String getServerURL(Context context) {
String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
if (serverUrl.trim().isEmpty()) {
serverUrl = context.getString(R.string.conf_update_server_url_def);
}
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE)); SystemProperties.get(Constants.PROP_DEVICE));
String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT); String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
return serverUrl + "/v1/" + device + "/" + type + "/" + incrementalVersion;
String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
if (serverUrl.trim().isEmpty()) {
serverUrl = context.getString(R.string.updater_server_url);
}
return serverUrl.replace("{device}", device)
.replace("{type}", type)
.replace("{incr}", incrementalVersion);
} }
public static String getChangelogURL(Context context) { public static String getChangelogURL(Context context) {