Daist/cutthecord
1
0
Fork 0
forked from distok/cutthecord
Code Issues Pull requests Releases Wiki Activity

branding: fix on 9.6.5

Browse source
This commit is contained in:
ave 2019-10-03 10:28:20 +03:00
parent f5bf44fa48
commit 00507bd0e5
No known key found for this signature in database
GPG key ID: 09356ABAA42C842B
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
patches/branding/965.patch
View file

@ -1,6 +1,6 @@
diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManifest.xml diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManifest.xml
*** com.discord-965-base/AndroidManifest.xml 2019-10-03 08:11:33.587135682 +0300 *** com.discord-965-base/AndroidManifest.xml 2019-10-03 08:11:33.587135682 +0300
--- com.discord-965/AndroidManifest.xml 2019-10-03 08:22:45.367231869 +0300 --- com.discord-965/AndroidManifest.xml 2019-10-03 10:26:35.392475515 +0300
*************** ***************
*** 1,4 **** *** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="965" platformBuildVersionName="9.6.5"> ! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="965" platformBuildVersionName="9.6.5">
@ -13,7 +13,12 @@ diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManife
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/> <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
*************** ***************
*** 24,30 **** *** 19,30 ****
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <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="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> <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="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/> <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
@ -21,7 +26,12 @@ diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManife
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/> <activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/> <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"> <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">
--- 24,30 ---- --- 19,30 ----
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> <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="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/> <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
@ -95,7 +105,7 @@ diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManife
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/> <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES"> <receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
*************** ***************
*** 190,197 **** *** 190,198 ****
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/> <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/> <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
@ -104,7 +114,9 @@ diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManife
<meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/> <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/> <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application> </application>
--- 190,197 ---- ! </manifest>
\ No newline at end of file
--- 190,198 ----
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/> <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/> <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
@ -113,11 +125,10 @@ diff -crB com.discord-965-base/AndroidManifest.xml com.discord-965/AndroidManife
<meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/> <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/> <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application> </application>
Only in com.discord-965: AndroidManifest.xml.orig ! </manifest>
Only in com.discord-965: AndroidManifest.xml.rej
diff -crB com.discord-965-base/apktool.yml com.discord-965/apktool.yml diff -crB com.discord-965-base/apktool.yml com.discord-965/apktool.yml
*** com.discord-965-base/apktool.yml 2019-10-03 08:11:21.017081408 +0300 *** com.discord-965-base/apktool.yml 2019-10-03 08:11:21.017081408 +0300
--- com.discord-965/apktool.yml 2019-10-03 08:21:54.563724932 +0300 --- com.discord-965/apktool.yml 2019-10-03 10:19:07.020164614 +0300
*************** ***************
*** 181,185 **** *** 181,185 ****
tag: null tag: null
@ -133,7 +144,7 @@ diff -crB com.discord-965-base/apktool.yml com.discord-965/apktool.yml
! versionName: 9.6.5-cutthecord-CTCBUILD ! versionName: 9.6.5-cutthecord-CTCBUILD
diff -crB com.discord-965-base/res/values/strings.xml com.discord-965/res/values/strings.xml diff -crB com.discord-965-base/res/values/strings.xml com.discord-965/res/values/strings.xml
*** com.discord-965-base/res/values/strings.xml 2019-10-03 08:11:17.503732905 +0300 *** com.discord-965-base/res/values/strings.xml 2019-10-03 08:11:17.503732905 +0300
--- com.discord-965/res/values/strings.xml 2019-10-03 08:21:54.563724932 +0300 --- com.discord-965/res/values/strings.xml 2019-10-03 10:19:07.026831312 +0300
*************** ***************
*** 1308,1314 **** *** 1308,1314 ****
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string> <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@ -185,10 +196,9 @@ diff -crB com.discord-965-base/res/values/strings.xml com.discord-965/res/values
<string name="suppress_all_embeds">Remove all embeds</string> <string name="suppress_all_embeds">Remove all embeds</string>
<string name="suppressed">Suppressed</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> <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-965/res/values: strings.xml.orig
diff -crB com.discord-965-base/smali/com/discord/app/e.smali com.discord-965/smali/com/discord/app/e.smali diff -crB com.discord-965-base/smali/com/discord/app/e.smali com.discord-965/smali/com/discord/app/e.smali
*** com.discord-965-base/smali/com/discord/app/e.smali 2019-10-03 08:11:18.677071304 +0300 *** com.discord-965-base/smali/com/discord/app/e.smali 2019-10-03 08:11:18.677071304 +0300
--- com.discord-965/smali/com/discord/app/e.smali 2019-10-03 08:21:54.563724932 +0300 --- com.discord-965/smali/com/discord/app/e.smali 2019-10-03 10:19:07.026831312 +0300
*************** ***************
*** 56,62 **** *** 56,62 ****
.line 17 .line 17
@ -206,10 +216,9 @@ diff -crB com.discord-965-base/smali/com/discord/app/e.smali com.discord-965/sma
.line 18 .line 18
sput-object v0, Lcom/discord/app/e;->wz:Ljava/lang/String; sput-object v0, Lcom/discord/app/e;->wz:Ljava/lang/String;
Only in com.discord-965/smali/com/discord/app: e.smali.orig
diff -crB com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali diff -crB com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
*** com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 08:11:18.940405774 +0300 *** com.discord-965-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 08:11:18.940405774 +0300
--- com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 08:21:54.567058277 +0300 --- com.discord-965/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-03 10:19:07.030164661 +0300
*************** ***************
*** 77,83 **** *** 77,83 ****