Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-29 08:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix updater

Browse Source
This commit is contained in:
Tad 2018-04-06 21:50:20 -04:00
parent fcea2b8d1d
commit f3a92223a5
3 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch
View File

@ -1,34 +1,35 @@
From 5655fa77da654b0a638670506d07137796bc3e07 Mon Sep 17 00:00:00 2001
From d1d42f87977c344cc4e98551b073a89238c0f352 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 16 Oct 2017 14:18:53 -0400
Date: Fri, 6 Apr 2018 14:14:03 -0400
Subject: [PATCH] Switch to our update server
Change-Id: I1e247d3fb6c9f2878842c0d6957792bb773c494d
Change-Id: Ief2f6ae8952de1a5a8e3ca73989fab42ca22f622
---
src/org/lineageos/updater/misc/Utils.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
src/org/lineageos/updater/misc/Utils.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index e5cac4f..6555430 100644
index 6b15e2d..8008156 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -144,15 +144,10 @@ public class Utils {
}
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);
- }
@@ -147,16 +147,8 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE));
- 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);
+ return "https://divestos.xyz/updater.php?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
}
public static void triggerUpdate(Context context, String downloadId) {
public static String getChangelogURL(Context context) {
--
2.14.2
2.17.0

35
Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch
View File

@ -1,34 +1,35 @@
From 5655fa77da654b0a638670506d07137796bc3e07 Mon Sep 17 00:00:00 2001
From d1d42f87977c344cc4e98551b073a89238c0f352 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 16 Oct 2017 14:18:53 -0400
Date: Fri, 6 Apr 2018 14:14:03 -0400
Subject: [PATCH] Switch to our update server
Change-Id: I1e247d3fb6c9f2878842c0d6957792bb773c494d
Change-Id: Ief2f6ae8952de1a5a8e3ca73989fab42ca22f622
---
src/org/lineageos/updater/misc/Utils.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
src/org/lineageos/updater/misc/Utils.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index e5cac4f..6555430 100644
index 6b15e2d..8008156 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -144,15 +144,10 @@ public class Utils {
}
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);
- }
@@ -147,16 +147,8 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE));
- 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);
+ return "https://divestos.xyz/updater.php?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
}
public static void triggerUpdate(Context context, String downloadId) {
public static String getChangelogURL(Context context) {
--
2.14.2
2.17.0

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
View File

@ -118,7 +118,7 @@ git apply $cvePatchesLinux/CVE-2017-13218/3.10/0004.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-14880/3.10/0001.patch
#git apply $cvePatchesLinux/CVE-2017-14880/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch
git apply $cvePatchesLinux/CVE-2017-15833/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch