From 8eeafdd09fcfbd94ba7dc5d146e82b7b0233b018 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 10 Jun 2018 19:00:02 -0400 Subject: [PATCH] Changes for trust_interface and other misc tweaks --- .gitignore | 1 + .../0001-Remove_Analytics-Pre_Trust.patch | 128 ------------------ .../0001-Remove_Analytics.patch | 26 ++-- .../0002-Remove_Analytics.patch | 28 ---- Scripts/Generate_Signing_Keys.sh | 3 +- Scripts/LineageOS-14.1/Patch.sh | 4 +- Scripts/LineageOS-15.1/Functions.sh | 1 - Scripts/LineageOS-15.1/Patch.sh | 7 +- TODO | 4 +- 9 files changed, 24 insertions(+), 178 deletions(-) delete mode 100644 Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch delete mode 100644 Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch diff --git a/.gitignore b/.gitignore index ecd73e6b..dac34a05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Signing_Keys/ +Signing_Keys-New/ Signing_Keys-Old/ Builds/ Build/ diff --git a/Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch b/Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch deleted file mode 100644 index 50cbd31f..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 192de0fd289b2d22f4258745370fd13d68107b71 Mon Sep 17 00:00:00 2001 -From: Tad -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" /> - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -- -- https://stats.lineageos.org/api/v1/stats -- - - true - -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 @@ - Total commits: %2$s

- Last update: %3$s]]> - -- -- -- LineageOS statistics -- Help make LineageOS better by opting into anonymous statistics reporting -- About -- 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. -- Enable reporting -- Preview data -- View stats -- Learn more -- -- -- Unique ID -- Device -- Version -- Country -- Carrier -- Stats collection -- Allow installation metrics and device statistics to be collected -- - - Auto-rotate screen - Rotation settings -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" /> - -- -- - 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 true 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 @@ Total commits: %2$s

Last update: %3$s]]> @@ -109,7 +109,7 @@ index 0a3e654..8d744ac 100644 Auto-rotate screen Rotation settings 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 @@ - - - +- + -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"/> - -- -- -- - - - --- -2.16.3 - diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh index ebcb2b57..f217cdd5 100644 --- a/Scripts/Generate_Signing_Keys.sh +++ b/Scripts/Generate_Signing_Keys.sh @@ -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"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 198f35cb..41277d54 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -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"; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 52f01b34..b1f12505 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -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; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index fd4e3f8c..46b09d85 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -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 diff --git a/TODO b/TODO index 58a6b3d0..36d4739f 100644 --- a/TODO +++ b/TODO @@ -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