From 4efc74504f56c42c205c48aad0f8e6479bbd8175 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Tue, 25 Jun 2019 15:58:19 +0300
Subject: [PATCH] branding: attempt to unfuck installs

---
 patches/branding/910.patch | 42 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/patches/branding/910.patch b/patches/branding/910.patch
index 8114a09..92971a4 100644
--- a/patches/branding/910.patch
+++ b/patches/branding/910.patch
@@ -1,6 +1,6 @@
 diff -crB com.discord-910-base/AndroidManifest.xml com.discord-910/AndroidManifest.xml
 *** com.discord-910-base/AndroidManifest.xml	2019-06-25 14:39:50.202736617 +0300
---- com.discord-910/AndroidManifest.xml	2019-06-25 14:42:56.787206632 +0300
+--- com.discord-910/AndroidManifest.xml	2019-06-25 15:56:07.584361345 +0300
 ***************
 *** 1,4 ****
 ! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="910" platformBuildVersionName="9.1.0">
@@ -13,7 +13,11 @@ diff -crB com.discord-910-base/AndroidManifest.xml com.discord-910/AndroidManife
       <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
       <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
 ***************
-*** 22,28 ****
+*** 18,28 ****
+      <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+      <uses-permission android:name="android.permission.VIBRATE"/>
+      <uses-permission android:name="android.permission.WAKE_LOCK"/>
+!     <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
       <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
       <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -21,7 +25,11 @@ diff -crB com.discord-910-base/AndroidManifest.xml com.discord-910/AndroidManife
           <activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
           <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
               <intent-filter>
---- 22,28 ----
+--- 18,28 ----
+      <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+      <uses-permission android:name="android.permission.VIBRATE"/>
+      <uses-permission android:name="android.permission.WAKE_LOCK"/>
+!     <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.permission.CONNECT" android:protectionLevel="dangerous"/>
       <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
       <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -30,6 +38,23 @@ diff -crB com.discord-910-base/AndroidManifest.xml com.discord-910/AndroidManife
           <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
               <intent-filter>
 ***************
+*** 76,82 ****
+                  <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+              </intent-filter>
+          </service>
+!         <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
+              <intent-filter>
+                  <action android:name="com.discord.intent.action.CONNECT"/>
+                  <data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
+--- 76,82 ----
+                  <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+              </intent-filter>
+          </service>
+!         <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
+              <intent-filter>
+                  <action android:name="com.discord.intent.action.CONNECT"/>
+                  <data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
+***************
 *** 104,110 ****
           </receiver>
           <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
@@ -102,10 +127,9 @@ diff -crB com.discord-910-base/AndroidManifest.xml com.discord-910/AndroidManife
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
 ! </manifest>
-Only in com.discord-910: AndroidManifest.xml.orig
 diff -crB com.discord-910-base/apktool.yml com.discord-910/apktool.yml
 *** com.discord-910-base/apktool.yml	2019-06-25 14:39:19.485883767 +0300
---- com.discord-910/apktool.yml	2019-06-25 14:42:56.787206632 +0300
+--- com.discord-910/apktool.yml	2019-06-25 15:45:44.557145780 +0300
 ***************
 *** 308,312 ****
     tag: null
@@ -121,7 +145,7 @@ diff -crB com.discord-910-base/apktool.yml com.discord-910/apktool.yml
 !   versionName: 9.1.0-cutthecord-CTCBUILD
 diff -crB com.discord-910-base/res/values/strings.xml com.discord-910/res/values/strings.xml
 *** com.discord-910-base/res/values/strings.xml	2019-06-25 14:39:16.372531599 +0300
---- com.discord-910/res/values/strings.xml	2019-06-25 14:43:27.980730002 +0300
+--- com.discord-910/res/values/strings.xml	2019-06-25 15:45:44.563812489 +0300
 ***************
 *** 1304,1310 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@@ -173,11 +197,9 @@ diff -crB com.discord-910-base/res/values/strings.xml com.discord-910/res/values
       <string name="suppress_all_embeds">Remove all embeds</string>
       <string name="suppressed">Suppressed</string>
       <string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
-Only in com.discord-910/res/values: strings.xml.orig
-Only in com.discord-910/res/values: strings.xml.rej
 diff -crB com.discord-910-base/smali/com/discord/app/e.smali com.discord-910/smali/com/discord/app/e.smali
 *** com.discord-910-base/smali/com/discord/app/e.smali	2019-06-25 14:39:17.615872454 +0300
---- com.discord-910/smali/com/discord/app/e.smali	2019-06-25 14:42:56.787206632 +0300
+--- com.discord-910/smali/com/discord/app/e.smali	2019-06-25 15:45:44.563812489 +0300
 ***************
 *** 53,59 ****
       .line 15
@@ -197,7 +219,7 @@ diff -crB com.discord-910-base/smali/com/discord/app/e.smali com.discord-910/sma
       sput-object v0, Lcom/discord/app/e;->sI:Ljava/lang/String;
 diff -crB com.discord-910-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-910/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
 *** com.discord-910-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-06-25 14:39:17.815873664 +0300
---- com.discord-910/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-06-25 14:42:56.787206632 +0300
+--- com.discord-910/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-06-25 15:45:44.563812489 +0300
 ***************
 *** 77,83 ****