Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-24 06:59:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changes for trust_interface and other misc tweaks

Browse Source
This commit is contained in:
Tad 2018-06-10 19:00:02 -04:00
parent 3ea4b55e70
commit 8eeafdd09f
9 changed files with 24 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
Signing_Keys/
Signing_Keys-New/
Signing_Keys-Old/
Builds/
Build/

128
Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch
View File

@ -1,128 +0,0 @@
From 192de0fd289b2d22f4258745370fd13d68107b71 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 12 Feb 2018 03:10:11 -0500
Subject: [PATCH] Remove analytics
Change-Id: I9d1bcd4a6afa492bfc1e7a9e6f13875fda4353d2
---
AndroidManifest.xml | 25 -------------------------
proguard.flags | 1 -
res/values/config.xml | 3 ---
res/values/strings.xml | 22 ----------------------
res/xml/parts_catalog.xml | 5 -----
5 files changed, 56 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e2cd9b..e4a0d26 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,31 +207,6 @@
android:resource="@string/style_summary" />
</activity-alias>
- <!-- Anonymous Statistics -->
- <receiver android:name=".lineagestats.ReportingServiceManager"
- android:enabled="true"
- android:exported="false"
- android:label="ReportingServiceManager">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
- <action android:name="org.lineageos.lineageparts.action.TRIGGER_REPORT_METRICS" />
- </intent-filter>
- </receiver>
-
- <service android:label="ReportingService"
- android:enabled="true"
- android:exported="false"
- android:name=".lineagestats.ReportingService">
- </service>
-
- <service android:name=".lineagestats.StatsUploadJobService"
- android:permission="android.permission.BIND_JOB_SERVICE" />
-
- <service android:name=".lineagestats.ReportingService"
- android:label="ReportingService"
- android:enabled="true"
- android:exported="false" />
-
<!-- Weather settings -->
<activity-alias
android:name=".weather.WeatherServiceSettings"
diff --git a/proguard.flags b/proguard.flags
index 85e774a..db3507c 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -3,7 +3,6 @@
-keep class org.lineageos.lineageparts.*Picker
-keep class org.lineageos.lineageparts.*Settings
--keep class org.lineageos.lineageparts.lineagestats.*
-keep class org.lineageos.lineageparts.contributors.*
-keep class org.lineageos.lineageparts.hardware.*
-keep class org.lineageos.lineageparts.input.*
diff --git a/res/values/config.xml b/res/values/config.xml
index d49bab4..e510fdf 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,9 +17,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Metrics server endpoint -->
- <string name="stats_lineage_url">https://stats.lineageos.org/api/v1/stats</string>
-
<!-- When true, weather options will be displayed in settings dashboard -->
<bool name="config_showWeatherMenu">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f5b47b..173c133 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -537,28 +537,6 @@
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
<b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
- <!-- Anonymous Statistics #Lineage -->
- <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
- <string name="anonymous_statistics_title">LineageOS statistics</string>
- <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
- <string name="anonymous_statistics_warning_title">About</string>
- <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
- developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
- which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
- <string name="enable_reporting_title">Enable reporting</string>
- <string name="preview_data_title">Preview data</string>
- <string name="view_stats_title">View stats</string>
- <string name="anonymous_learn_more">Learn more</string>
-
- <!-- Anonymous Statistics - Preview -->
- <string name="preview_id_title">Unique ID</string>
- <string name="preview_device_title">Device</string>
- <string name="preview_version_title">Version</string>
- <string name="preview_country_title">Country</string>
- <string name="preview_carrier_title">Carrier</string>
- <string name="stats_collection_title">Stats collection</string>
- <string name="stats_collection_summary">Allow installation metrics and device statistics to be collected</string>
-
<!-- Display : Rotation -->
<string name="accelerometer_title">Auto-rotate screen</string>
<string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index db18231..440e1aa 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -74,11 +74,6 @@
android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
lineage:xmlRes="@xml/status_bar_settings" />
- <part android:key="lineagestats"
- android:title="@string/anonymous_statistics_title"
- android:fragment="org.lineageos.lineageparts.lineagestats.AnonymousStats"
- lineage:xmlRes="@xml/anonymous_stats" />
-
<part android:key="power_menu"
android:title="@string/power_menu_title"
android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
--
2.16.1

26
Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
View File

@ -1,4 +1,4 @@
From 0539b51319f6e28f5cc9b14f6477a8cb0a9e15b5 Mon Sep 17 00:00:00 2001
From 1112cabae9ee20b0b1386bc6c3bf0d1614ce8a6e Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 19 Apr 2018 20:46:02 -0400
Subject: [PATCH] Remove analytics
@ -10,8 +10,8 @@ Change-Id: Idcc15bfeda4805b305423534663429942abd1bcf
res/values/config.xml | 3 ---
res/values/strings.xml | 22 ----------------------
res/xml/parts_catalog.xml | 5 -----
res/xml/trust_preferences.xml | 2 --
6 files changed, 58 deletions(-)
res/xml/trust_preferences.xml | 3 ---
6 files changed, 59 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 237db74..26d4a34 100644
@ -62,7 +62,7 @@ index 85e774a..db3507c 100644
-keep class org.lineageos.lineageparts.hardware.*
-keep class org.lineageos.lineageparts.input.*
diff --git a/res/values/config.xml b/res/values/config.xml
index d49bab4..e510fdf 100644
index 4236b27..eed044a 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,9 +17,6 @@
@ -76,10 +76,10 @@ index d49bab4..e510fdf 100644
<bool name="config_showWeatherMenu">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a3e654..8d744ac 100644
index 3070c83..f3e27ed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -535,28 +535,6 @@
@@ -537,28 +537,6 @@
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
<b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
@ -109,7 +109,7 @@ index 0a3e654..8d744ac 100644
<string name="accelerometer_title">Auto-rotate screen</string>
<string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 5e2a106..d33e345 100644
index 66a3116..7721ed5 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -74,11 +74,6 @@
@ -125,17 +125,19 @@ index 5e2a106..d33e345 100644
android:title="@string/power_menu_title"
android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
index 2e4e0a6..ee58ae4 100644
index 2afae69..9c363a9 100644
--- a/res/xml/trust_preferences.xml
+++ b/res/xml/trust_preferences.xml
@@ -44,7 +44,5 @@
@@ -46,9 +46,6 @@
<org.lineageos.internal.lineageparts.LineagePartsPreference
android:key="privacy_guard_manager" />
- <org.lineageos.internal.lineageparts.LineagePartsPreference
- android:key="lineagestats" />
</PreferenceCategory>
</PreferenceScreen>
-
<ListPreference
android:key="sms_security_check_limit"
android:defaultValue="30"
--
2.17.0
2.17.1

28
Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch
View File

@ -1,28 +0,0 @@
From c126761d730a09326ea67bdfbd06023dc96e55cc Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Tue, 3 Apr 2018 08:49:01 -0400
Subject: [PATCH] Remove Lineage stats
Change-Id: I6f0a91e8d64f4b9b4f649d70f8fbc0a5f1250c48
---
res/xml/security_settings_misc.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 1ea99739b4..3dcc597fbf 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -36,10 +36,6 @@
android:title="@string/show_password"
android:summary="@string/show_password_summary"/>
- <!-- Anonymous statistics -->
- <org.lineageos.internal.lineageparts.LineagePartsPreference
- android:key="lineagestats" />
-
</PreferenceCategory>
<PreferenceCategory>
--
2.16.3

3
Scripts/Generate_Signing_Keys.sh
View File

@ -1,4 +1,5 @@
export desc='/O=Divested Computing, Inc./CN=DivestOS/emailAddress=support@divestos.xyz';
#export desc='/O=Divested Computing, Inc./CN=DivestOS/emailAddress=support@divestos.xyz';
export desc='/O=Example/CN=ExampleOS/emailAddress=support@example.com';
export type='rsa'; #Options: rsa, ec
$base/development/tools/make_key extra "$desc" "$type";

4
Scripts/LineageOS-14.1/Patch.sh
View File

@ -125,8 +125,8 @@ sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change
enterAndClear "packages/apps/FDroidPrivilegedExtension";
sed -i 's/43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab/cb1ee2ec40d05ed678f42ae701cdfa29eea79d0e6d633276de230bf3494067c3/' app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java;
sed -i 's/\"org\.fdroid\.fdroid/\"org.fdroid.fdroid_dos/' app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java;
#release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
#test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
#release-key: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
#test-key: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
if [ "$MICROG_INCLUDED" = true ]; then
enterAndClear "packages/apps/GmsCore";

1
Scripts/LineageOS-15.1/Functions.sh
View File

@ -79,7 +79,6 @@ patchWorkspace() {
repopick -f 214824 209584 209585 215010 214300; #g3-common
repopick -f 211404 211405 211406 211407 211408 211409; #d852
repopick -f 211396 214817; #d855
#repopick -t trust_interface;
source $scripts/Patch.sh;
source $scripts/Defaults.sh;

7
Scripts/LineageOS-15.1/Patch.sh
View File

@ -121,8 +121,8 @@ sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change
enterAndClear "packages/apps/FDroidPrivilegedExtension";
sed -i 's/43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab/cb1ee2ec40d05ed678f42ae701cdfa29eea79d0e6d633276de230bf3494067c3/' app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java;
sed -i 's/\"org\.fdroid\.fdroid/\"org.fdroid.fdroid_dos/' app/src/main/java/org/fdroid/fdroid/privileged/ClientWhitelist.java;
#release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
#test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
#release-key: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
#test-key: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
if [ "$MICROG_INCLUDED" = true ]; then
enterAndClear "packages/apps/GmsCore";
@ -137,12 +137,11 @@ fi;
enterAndClear "packages/apps/LineageParts";
rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of the analytics
sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather
patch -p1 < $patches"android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch"; #Remove analytics
patch -p1 < $patches"android_packages_apps_LineageParts/0001-Remove_Analytics.patch"; #Remove analytics
rm AndroidManifest.xml.orig res/values/*.xml.orig;
enterAndClear "packages/apps/Settings";
git revert a96df110e84123fe1273bff54feca3b4ca484dcd; #don't hide oem unlock
patch -p1 < $patches"android_packages_apps_Settings/0002-Remove_Analytics.patch"; #Remove analytics
if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < $patches"android_packages_apps_Settings/Copperhead/0003-Deny_USB.patch"; fi; #Deny USB support (Copperhead CC BY-NC-SA)
patch -p1 < $patches"android_packages_apps_Settings/0004-PDB_Fixes.patch"; #Fix crashes when the PersistentDataBlockManager service isn't available
sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length

4
TODO
View File

@ -1,10 +1,10 @@
Last updated: 2018-06-02
Last updated: 2018-06-10
High Priority (Release blockers)
Build
- Automate incremental update generation
- Switch HOSTS to release variant
- New RSA 4096 signing keys
- New signing keys
- Consider removing microG or instead keeping UnifiedNLP
Project
- Create cryptocurrency addresses