forked from distok/cutthecord
10.0.7
Also fix a bug that prevents installation of multiple branches / official client, thanks whovian for pointing it out.
This commit is contained in:
parent
4bc5ffc081
commit
ee77823392
GPG key ID:
398DD7BD03276F6D
40 changed files with 58309 additions and 2 deletions
241
patches/branding/1007.patch
Normal file
241
patches/branding/1007.patch
Normal file
|
|
@ -0,0 +1,241 @@
|
|||
diff -crB com.discord-1007-base/AndroidManifest.xml com.discord-1007/AndroidManifest.xml
|
||||
*** com.discord-1007-base/AndroidManifest.xml 2019-12-15 13:40:47.516522153 +0300
|
||||
--- com.discord-1007/AndroidManifest.xml 2019-12-15 13:43:20.197380493 +0300
|
||||
***************
|
||||
*** 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="1007" platformBuildVersionName="10.0.7">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 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.cutthecord.CTCBRANCH" platformBuildVersionCode="1007CTCBUILD" platformBuildVersionName="10.0.7-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,31 ****
|
||||
<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="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"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<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:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,31 ----
|
||||
<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="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"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<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:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 88,94 ****
|
||||
<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"/>
|
||||
--- 88,94 ----
|
||||
<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"/>
|
||||
***************
|
||||
*** 118,124 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 118,124 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 133,139 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 133,139 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 148,154 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<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">
|
||||
<intent-filter>
|
||||
--- 148,154 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<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">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 158,164 ****
|
||||
<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"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 158,164 ----
|
||||
<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"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 198,206 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 198,206 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB com.discord-1007-base/apktool.yml com.discord-1007/apktool.yml
|
||||
*** com.discord-1007-base/apktool.yml 2019-12-15 13:40:27.489742899 +0300
|
||||
--- com.discord-1007/apktool.yml 2019-12-15 13:41:49.826872449 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1007'
|
||||
! versionName: 10.0.7
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1007CTCBUILD'
|
||||
! versionName: 10.0.7-cutthecord-CTCBUILD
|
||||
diff -crB com.discord-1007-base/res/values/strings.xml com.discord-1007/res/values/strings.xml
|
||||
*** com.discord-1007-base/res/values/strings.xml 2019-12-15 13:40:23.369719738 +0300
|
||||
--- com.discord-1007/res/values/strings.xml 2019-12-15 13:41:49.830205801 +0300
|
||||
***************
|
||||
*** 1325,1331 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1325,1331 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3257,3263 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3257,3263 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4477,4483 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<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>
|
||||
--- 4477,4483 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<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>
|
||||
diff -crB com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:40:24.949728621 +0300
|
||||
--- com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:41:49.830205801 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
||||
|
|
@ -76,4 +76,5 @@ You can use the following line to patch authorities:
|
|||
- 9.9.4
|
||||
- 9.9.6
|
||||
- 10.0.6
|
||||
- 10.0.7
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue