diff --git a/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch b/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch
index 78a4cb1a..cf9a193e 100644
--- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Switch to our update server
Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
---
- src/org/lineageos/updater/misc/Utils.java | 11 ++---------
+ .../main/java/org/lineageos/updater/misc/Utils.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
-diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index f0e390a..4ab3a51 100644
---- a/src/org/lineageos/updater/misc/Utils.java
-+++ b/src/org/lineageos/updater/misc/Utils.java
+diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
+index b7ba720..f3d334b 100644
+--- a/app/src/main/java/org/lineageos/updater/misc/Utils.java
++++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java
@@ -155,16 +155,9 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
diff --git a/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch b/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
index 73f46e52..4ac6ece5 100644
--- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Add support for routing over Tor
Change-Id: Ibfe080c3d801af34fb64fda1b6b8f4f39a2b1ccf
---
- AndroidManifest.xml | 4 ++
- res/layout/preferences_dialog.xml | 8 +++
- res/values/strings.xml | 2 +
+ app/src/main/AndroidManifest.xml | 4 ++
.../lineageos/updater/UpdatesActivity.java | 12 ++++
.../updater/UpdatesCheckReceiver.java | 4 ++
.../updater/controller/UpdaterController.java | 8 +++
.../updater/download/DownloadClient.java | 8 ++-
.../download/HttpURLConnectionClient.java | 27 ++++++--
- src/org/lineageos/updater/misc/Constants.java | 1 +
- src/org/lineageos/updater/misc/Utils.java | 65 +++++++++++++++++++
+ .../org/lineageos/updater/misc/Constants.java | 1 +
+ .../org/lineageos/updater/misc/Utils.java | 65 +++++++++++++++++++
+ .../main/res/layout/preferences_dialog.xml | 8 +++
+ app/src/main/res/values/strings.xml | 2 +
10 files changed, 134 insertions(+), 5 deletions(-)
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cc485f7..7cdfb93 100644
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
+--- a/app/src/main/AndroidManifest.xml
++++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,10 @@
@@ -32,50 +32,11 @@ index cc485f7..7cdfb93 100644
-
-
-+
-+
- Once a week
- Once a month
- Never
-+ Perform requests over Tor
- Delete updates when installed
- Delete
- Copy URL
-@@ -87,6 +88,7 @@
- The download failed. Please check your internet connection and try again later.
- The update verification failed.
- Download completed.
-+ Orbot is not installed, disabling Tor routing!
-
- This update can\'t be installed on top of the current build.
-
-diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
-index 12254c7..5da1026 100644
---- a/src/org/lineageos/updater/UpdatesActivity.java
-+++ b/src/org/lineageos/updater/UpdatesActivity.java
-@@ -377,10 +377,14 @@ public class UpdatesActivity extends UpdatesListActivity {
+diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+index c359575..a4f7e37 100644
+--- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
++++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+@@ -398,10 +398,14 @@ public class UpdatesActivity extends UpdatesListActivity {
final DownloadClient downloadClient;
try {
@@ -90,7 +51,7 @@ index 12254c7..5da1026 100644
.build();
} catch (IOException exception) {
Log.e(TAG, "Could not build download client");
-@@ -480,6 +484,7 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -501,6 +505,7 @@ public class UpdatesActivity extends UpdatesListActivity {
private void showPreferencesDialog() {
View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null);
Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
@@ -98,7 +59,7 @@ index 12254c7..5da1026 100644
SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
SwitchCompat meteredNetworkWarning = view.findViewById(
R.id.preferences_metered_network_warning);
-@@ -492,6 +497,7 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -513,6 +518,7 @@ public class UpdatesActivity extends UpdatesListActivity {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
@@ -106,7 +67,7 @@ index 12254c7..5da1026 100644
autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING,
prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)));
-@@ -532,6 +538,8 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -553,6 +559,8 @@ public class UpdatesActivity extends UpdatesListActivity {
prefs.edit()
.putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
autoCheckInterval.getSelectedItemPosition())
@@ -115,7 +76,7 @@ index 12254c7..5da1026 100644
.putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
.putBoolean(Constants.PREF_METERED_NETWORK_WARNING,
meteredNetworkWarning.isChecked())
-@@ -545,6 +553,10 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -566,6 +574,10 @@ public class UpdatesActivity extends UpdatesListActivity {
UpdatesCheckReceiver.cancelUpdatesCheck(this);
}
@@ -126,10 +87,10 @@ index 12254c7..5da1026 100644
if (Utils.isABDevice()) {
boolean enableABPerfMode = abPerfMode.isChecked();
mUpdaterService.getUpdaterController().setPerformanceMode(enableABPerfMode);
-diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java
+diff --git a/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java b/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
index 9f45423..382fbd4 100644
---- a/src/org/lineageos/updater/UpdatesCheckReceiver.java
-+++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java
+--- a/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
++++ b/app/src/main/java/org/lineageos/updater/UpdatesCheckReceiver.java
@@ -110,10 +110,14 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
};
@@ -145,10 +106,10 @@ index 9f45423..382fbd4 100644
.build();
downloadClient.start();
} catch (IOException e) {
-diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/src/org/lineageos/updater/controller/UpdaterController.java
+diff --git a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
index 5d7d51a..7ac5f5b 100644
---- a/src/org/lineageos/updater/controller/UpdaterController.java
-+++ b/src/org/lineageos/updater/controller/UpdaterController.java
+--- a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
++++ b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
@@ -374,12 +374,16 @@ public class UpdaterController {
update.setFile(destination);
DownloadClient downloadClient;
@@ -184,10 +145,10 @@ index 5d7d51a..7ac5f5b 100644
.build();
} catch (IOException exception) {
Log.e(TAG, "Could not build download client");
-diff --git a/src/org/lineageos/updater/download/DownloadClient.java b/src/org/lineageos/updater/download/DownloadClient.java
+diff --git a/app/src/main/java/org/lineageos/updater/download/DownloadClient.java b/app/src/main/java/org/lineageos/updater/download/DownloadClient.java
index 3494947..7a7f7cf 100644
---- a/src/org/lineageos/updater/download/DownloadClient.java
-+++ b/src/org/lineageos/updater/download/DownloadClient.java
+--- a/app/src/main/java/org/lineageos/updater/download/DownloadClient.java
++++ b/app/src/main/java/org/lineageos/updater/download/DownloadClient.java
@@ -60,6 +60,7 @@ public interface DownloadClient {
private DownloadClient.DownloadCallback mCallback;
private DownloadClient.ProgressListener mProgressListener;
@@ -216,10 +177,10 @@ index 3494947..7a7f7cf 100644
+ }
}
}
-diff --git a/src/org/lineageos/updater/download/HttpURLConnectionClient.java b/src/org/lineageos/updater/download/HttpURLConnectionClient.java
+diff --git a/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java b/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
index b9c4b5d..b94fff0 100644
---- a/src/org/lineageos/updater/download/HttpURLConnectionClient.java
-+++ b/src/org/lineageos/updater/download/HttpURLConnectionClient.java
+--- a/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
++++ b/app/src/main/java/org/lineageos/updater/download/HttpURLConnectionClient.java
@@ -18,12 +18,16 @@ package org.lineageos.updater.download;
import android.os.SystemClock;
import android.util.Log;
@@ -295,10 +256,10 @@ index b9c4b5d..b94fff0 100644
mClient.setInstanceFollowRedirects(!mUseDuplicateLinks);
mClient.connect();
int responseCode = mClient.getResponseCode();
-diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
+diff --git a/app/src/main/java/org/lineageos/updater/misc/Constants.java b/app/src/main/java/org/lineageos/updater/misc/Constants.java
index beb9423..a51ab15 100644
---- a/src/org/lineageos/updater/misc/Constants.java
-+++ b/src/org/lineageos/updater/misc/Constants.java
+--- a/app/src/main/java/org/lineageos/updater/misc/Constants.java
++++ b/app/src/main/java/org/lineageos/updater/misc/Constants.java
@@ -30,6 +30,7 @@ public final class Constants {
public static final String PREF_LAST_UPDATE_CHECK = "last_update_check";
@@ -307,10 +268,10 @@ index beb9423..a51ab15 100644
public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates";
public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
public static final String PREF_METERED_NETWORK_WARNING = "pref_metered_network_warning";
-diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 4ab3a51..805285b 100644
---- a/src/org/lineageos/updater/misc/Utils.java
-+++ b/src/org/lineageos/updater/misc/Utils.java
+diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
+index f3d334b..67ad386 100644
+--- a/app/src/main/java/org/lineageos/updater/misc/Utils.java
++++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java
@@ -46,6 +46,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -395,3 +356,42 @@ index 4ab3a51..805285b 100644
return server + "?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
}
+diff --git a/app/src/main/res/layout/preferences_dialog.xml b/app/src/main/res/layout/preferences_dialog.xml
+index c1b4356..93f1bfc 100644
+--- a/app/src/main/res/layout/preferences_dialog.xml
++++ b/app/src/main/res/layout/preferences_dialog.xml
+@@ -29,6 +29,14 @@
+ android:entries="@array/menu_auto_updates_check_interval_entries" />
+
+
++
++
+ Once a week
+ Once a month
+ Never
++ Perform requests over Tor
+ Delete updates when installed
+ Delete
+ Copy URL
+@@ -87,6 +88,7 @@
+ The download failed. Please check your internet connection and try again later.
+ The update verification failed.
+ Download completed.
++ Orbot is not installed, disabling Tor routing!
+
+ This update can\'t be installed on top of the current build.
+
diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh
index 770830b6..42fe2426 100644
--- a/Scripts/LineageOS-20.0/Patch.sh
+++ b/Scripts/LineageOS-20.0/Patch.sh
@@ -318,7 +318,7 @@ fi;
if enterAndClear "packages/apps/Updater"; then
applyPatch "$DOS_PATCHES/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server (DivestOS)
applyPatch "$DOS_PATCHES/android_packages_apps_Updater/0002-Tor_Support.patch"; #Add Tor support (DivestOS)
-sed -i 's/PROP_BUILD_VERSION_INCREMENTAL);/PROP_BUILD_VERSION_INCREMENTAL).replaceAll("\\\\.", "");/' src/org/lineageos/updater/misc/Utils.java; #Remove periods from incremental version
+sed -i 's/PROP_BUILD_VERSION_INCREMENTAL);/PROP_BUILD_VERSION_INCREMENTAL).replaceAll("\\\\.", "");/' app/src/main/java/org/lineageos/updater/misc/Utils.java; #Remove periods from incremental version
#TODO: Remove changelog
fi;
diff --git a/Scripts/LineageOS-20.0/Rebrand.sh b/Scripts/LineageOS-20.0/Rebrand.sh
index 78ce2869..4f46e564 100644
--- a/Scripts/LineageOS-20.0/Rebrand.sh
+++ b/Scripts/LineageOS-20.0/Rebrand.sh
@@ -77,11 +77,11 @@ sed -i '/.*update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strin
fi;
if enter "packages/apps/Updater"; then
-sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
-sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml;
-sed -i '/.*info_dialog_message/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml;
+sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' app/src/main/res/values*/strings.xml;
+sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml;
+sed -i '/.*info_dialog_message/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml;
fi;
if enter "system/core"; then