forked from distok/cutthecord
Port to 1148
This commit is contained in:
parent
51dd62b8dd
commit
1ef4aeca93
GPG key ID:
398DD7BD03276F6D
46 changed files with 58912 additions and 2 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Modular Client Mod for Discord's Android app.
|
Modular Client Mod for Discord's Android app.
|
||||||
|
|
||||||
**Latest supported Discord Android version:** 23.0 (1146), released on 2020-05-19.
|
**Latest supported Discord Android version:** 24-alpha2 (1148), released on 2020-05-24.
|
||||||
|
|
||||||
New patch development will be done for the latest supported version.
|
New patch development will be done for the latest supported version.
|
||||||
|
|
||||||
|
|
|
||||||
252
patches/branding/1148.patch
Normal file
252
patches/branding/1148.patch
Normal file
|
|
@ -0,0 +1,252 @@
|
||||||
|
diff -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml
|
||||||
|
*** com.discord-base/AndroidManifest.xml 2020-05-25 02:39:45.000000000 +0300
|
||||||
|
--- com.discord/AndroidManifest.xml 2020-05-25 02:47:06.547660256 +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="1148" platformBuildVersionName="24-alpha2">
|
||||||
|
<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="1148CTCBUILD" platformBuildVersionName="24-alpha2-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"/>
|
||||||
|
***************
|
||||||
|
*** 20,31 ****
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
|
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||||
|
<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"/>
|
||||||
|
! <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">
|
||||||
|
--- 20,31 ----
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
|
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||||
|
<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"/>
|
||||||
|
! <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">
|
||||||
|
***************
|
||||||
|
*** 114,120 ****
|
||||||
|
<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"/>
|
||||||
|
--- 114,120 ----
|
||||||
|
<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"/>
|
||||||
|
***************
|
||||||
|
*** 144,150 ****
|
||||||
|
</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"/>
|
||||||
|
--- 144,150 ----
|
||||||
|
</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"/>
|
||||||
|
***************
|
||||||
|
*** 161,167 ****
|
||||||
|
<meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" 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"/>
|
||||||
|
--- 161,167 ----
|
||||||
|
<meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" 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"/>
|
||||||
|
***************
|
||||||
|
*** 176,182 ****
|
||||||
|
</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>
|
||||||
|
--- 176,182 ----
|
||||||
|
</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>
|
||||||
|
***************
|
||||||
|
*** 186,192 ****
|
||||||
|
<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"/>
|
||||||
|
--- 186,192 ----
|
||||||
|
<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"/>
|
||||||
|
***************
|
||||||
|
*** 226,239 ****
|
||||||
|
</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"/>
|
||||||
|
<service android:exported="false" android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery">
|
||||||
|
<meta-data android:name="backend:com.google.android.datatransport.cct.CctBackendFactory" android:value="cct"/>
|
||||||
|
</service>
|
||||||
|
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||||
|
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||||
|
! <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
|
||||||
|
--- 226,239 ----
|
||||||
|
</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"/>
|
||||||
|
<service android:exported="false" android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery">
|
||||||
|
<meta-data android:name="backend:com.google.android.datatransport.cct.CctBackendFactory" android:value="cct"/>
|
||||||
|
</service>
|
||||||
|
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||||
|
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||||
|
! <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-base/apktool.yml com.discord/apktool.yml
|
||||||
|
*** com.discord-base/apktool.yml 2020-05-25 02:36:27.293542157 +0300
|
||||||
|
--- com.discord/apktool.yml 2020-05-25 02:47:56.457981783 +0300
|
||||||
|
***************
|
||||||
|
*** 190,194 ****
|
||||||
|
tag: null
|
||||||
|
version: 2.4.2-83a459-SNAPSHOT
|
||||||
|
versionInfo:
|
||||||
|
! versionCode: '1148'
|
||||||
|
! versionName: 24-alpha2
|
||||||
|
--- 190,194 ----
|
||||||
|
tag: null
|
||||||
|
version: 2.4.2-83a459-SNAPSHOT
|
||||||
|
versionInfo:
|
||||||
|
! versionCode: '1148CTCBUILD'
|
||||||
|
! versionName: 24-alpha2-cutthecord-CTCBUILD
|
||||||
|
Only in com.discord: apktool.yml.orig
|
||||||
|
Only in com.discord: apktool.yml.rej
|
||||||
|
diff -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml
|
||||||
|
*** com.discord-base/res/values/strings.xml 2020-05-25 02:36:22.140175625 +0300
|
||||||
|
--- com.discord/res/values/strings.xml 2020-05-25 02:47:06.550993611 +0300
|
||||||
|
***************
|
||||||
|
*** 1406,1412 ****
|
||||||
|
<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">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
|
||||||
|
<string name="discord_desc_short">Team voice & text chat</string>
|
||||||
|
<string name="discord_gg">discord.gg/</string>
|
||||||
|
--- 1406,1412 ----
|
||||||
|
<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">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
|
||||||
|
<string name="discord_desc_short">Team voice & text chat</string>
|
||||||
|
<string name="discord_gg">discord.gg/</string>
|
||||||
|
***************
|
||||||
|
*** 3814,3820 ****
|
||||||
|
<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>
|
||||||
|
--- 3814,3820 ----
|
||||||
|
<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>
|
||||||
|
***************
|
||||||
|
*** 5147,5153 ****
|
||||||
|
<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="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||||
|
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||||
|
--- 5147,5153 ----
|
||||||
|
<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="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||||
|
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||||
|
Only in com.discord/res/values: strings.xml.orig
|
||||||
|
diff -crB com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||||
|
*** com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-25 02:36:24.293522830 +0300
|
||||||
|
--- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-25 02:47:06.550993611 +0300
|
||||||
|
***************
|
||||||
|
*** 76,82 ****
|
||||||
|
.line 3
|
||||||
|
new-instance v0, Landroid/content/Intent;
|
||||||
|
|
||||||
|
! const-string v1, "https://discord.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;
|
||||||
|
|
||||||
|
|
@ -175,4 +175,5 @@ You can use the following line to patch authorities:
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
347
patches/customtheme/1148.patch
Normal file
347
patches/customtheme/1148.patch
Normal file
|
|
@ -0,0 +1,347 @@
|
||||||
|
diff -crB com.discord-base/res/drawable/drawable_bg_corners_20dp.xml com.discord/res/drawable/drawable_bg_corners_20dp.xml
|
||||||
|
*** com.discord-base/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:36:21.146835892 +0300
|
||||||
|
--- com.discord/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:49:23.685210370 +0300
|
||||||
|
***************
|
||||||
|
*** 1,6 ****
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <solid android:color="@color/white" />
|
||||||
|
<corners android:radius="20.0dip" />
|
||||||
|
</shape>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 1,6 ----
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <solid android:color="@android:color/transparent" />
|
||||||
|
<corners android:radius="20.0dip" />
|
||||||
|
</shape>
|
||||||
|
\ No newline at end of file
|
||||||
|
diff -crB com.discord-base/res/drawable/drawable_circle_black.xml com.discord/res/drawable/drawable_circle_black.xml
|
||||||
|
*** com.discord-base/res/drawable/drawable_circle_black.xml 2020-05-25 02:36:19.926828033 +0300
|
||||||
|
--- com.discord/res/drawable/drawable_circle_black.xml 2020-05-25 02:49:23.685210370 +0300
|
||||||
|
***************
|
||||||
|
*** 1,5 ****
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape android:shape="oval"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <solid android:color="@color/black" />
|
||||||
|
</shape>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 1,5 ----
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape android:shape="oval"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <solid android:color="@android:color/transparent" />
|
||||||
|
</shape>
|
||||||
|
\ No newline at end of file
|
||||||
|
diff -crB com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||||
|
*** com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-05-25 02:36:20.423497899 +0300
|
||||||
|
--- com.discord/res/drawable/drawable_overlay_channels_active_dark.xml 2020-05-25 02:49:23.685210370 +0300
|
||||||
|
***************
|
||||||
|
*** 3,9 ****
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:left="8.0dip" android:right="8.0dip">
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
! <solid android:color="#ff42464d" />
|
||||||
|
<corners android:radius="4.0dip" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
--- 3,9 ----
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:left="8.0dip" android:right="8.0dip">
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
! <solid android:color="@color/primary_500" />
|
||||||
|
<corners android:radius="4.0dip" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
diff -crB com.discord-base/res/values/colors.xml com.discord/res/values/colors.xml
|
||||||
|
*** com.discord-base/res/values/colors.xml 2020-05-25 02:36:22.246842979 +0300
|
||||||
|
--- com.discord/res/values/colors.xml 2020-05-25 02:49:23.685210370 +0300
|
||||||
|
***************
|
||||||
|
*** 103,112 ****
|
||||||
|
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||||
|
! <color name="dark_grey_2">#ff36393e</color>
|
||||||
|
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||||
|
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||||
|
! <color name="design_dark_default_color_background">#ff121212</color>
|
||||||
|
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||||
|
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||||
|
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||||
|
--- 103,112 ----
|
||||||
|
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||||
|
! <color name="dark_grey_2">#ff000000</color>
|
||||||
|
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||||
|
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||||
|
! <color name="design_dark_default_color_background">#ff000000</color>
|
||||||
|
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||||
|
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||||
|
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||||
|
***************
|
||||||
|
*** 118,124 ****
|
||||||
|
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||||
|
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||||
|
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||||
|
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||||
|
<color name="design_default_color_background">#ffffffff</color>
|
||||||
|
<color name="design_default_color_error">#ffb00020</color>
|
||||||
|
<color name="design_default_color_on_background">#ff000000</color>
|
||||||
|
--- 118,124 ----
|
||||||
|
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||||
|
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||||
|
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||||
|
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||||
|
<color name="design_default_color_background">#ffffffff</color>
|
||||||
|
<color name="design_default_color_error">#ffb00020</color>
|
||||||
|
<color name="design_default_color_on_background">#ff000000</color>
|
||||||
|
***************
|
||||||
|
*** 163,170 ****
|
||||||
|
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||||
|
<color name="grey_4">#ff949494</color>
|
||||||
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||||
|
! <color name="grey_account">#ff282b30</color>
|
||||||
|
! <color name="grey_unread">#ff8a8e94</color>
|
||||||
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||||
|
<color name="highlighted_text_material_light">#66009688</color>
|
||||||
|
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||||||
|
--- 163,170 ----
|
||||||
|
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||||
|
<color name="grey_4">#ff949494</color>
|
||||||
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||||
|
! <color name="grey_account">#ff000000</color>
|
||||||
|
! <color name="grey_unread">#ff000000</color>
|
||||||
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||||
|
<color name="highlighted_text_material_light">#66009688</color>
|
||||||
|
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||||||
|
***************
|
||||||
|
*** 174,180 ****
|
||||||
|
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||||||
|
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||||||
|
<color name="league_of_legends">#ff021f25</color>
|
||||||
|
! <color name="link">#ff00b0f4</color>
|
||||||
|
<color name="link_100">#fff2fbfe</color>
|
||||||
|
<color name="link_130">#ffe8f8fe</color>
|
||||||
|
<color name="link_160">#ffdaf4fd</color>
|
||||||
|
--- 174,180 ----
|
||||||
|
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||||||
|
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||||||
|
<color name="league_of_legends">#ff021f25</color>
|
||||||
|
! <color name="link">#ff50f148</color>
|
||||||
|
<color name="link_100">#fff2fbfe</color>
|
||||||
|
<color name="link_130">#ffe8f8fe</color>
|
||||||
|
<color name="link_160">#ffdaf4fd</color>
|
||||||
|
***************
|
||||||
|
*** 262,281 ****
|
||||||
|
<color name="primary_400">#ff72767d</color>
|
||||||
|
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||||
|
<color name="primary_400_alpha_60">#9972767d</color>
|
||||||
|
! <color name="primary_500">#ff4f545c</color>
|
||||||
|
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||||
|
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||||
|
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||||
|
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||||
|
<color name="primary_560">#ff40444b</color>
|
||||||
|
! <color name="primary_600">#ff36393f</color>
|
||||||
|
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||||
|
! <color name="primary_630">#ff2f3136</color>
|
||||||
|
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||||
|
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||||
|
! <color name="primary_660">#ff292b2f</color>
|
||||||
|
! <color name="primary_700">#ff202225</color>
|
||||||
|
! <color name="primary_700_alpha_60">#99202225</color>
|
||||||
|
<color name="primary_800">#ff18191c</color>
|
||||||
|
<color name="primary_800_alpha_60">#9918191c</color>
|
||||||
|
<color name="primary_800_alpha_90">#e618191c</color>
|
||||||
|
--- 262,281 ----
|
||||||
|
<color name="primary_400">#ff72767d</color>
|
||||||
|
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||||
|
<color name="primary_400_alpha_60">#9972767d</color>
|
||||||
|
! <color name="primary_500">#ff333333</color>
|
||||||
|
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||||
|
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||||
|
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||||
|
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||||
|
<color name="primary_560">#ff40444b</color>
|
||||||
|
! <color name="primary_600">#ff000000</color>
|
||||||
|
! <color name="primary_600_alpha_60">#99000000</color>
|
||||||
|
! <color name="primary_630">#ff000000</color>
|
||||||
|
! <color name="primary_630_alpha_60">#99000000</color>
|
||||||
|
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||||
|
! <color name="primary_660">#ff000000</color>
|
||||||
|
! <color name="primary_700">#ff000000</color>
|
||||||
|
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||||
|
<color name="primary_800">#ff18191c</color>
|
||||||
|
<color name="primary_800_alpha_60">#9918191c</color>
|
||||||
|
<color name="primary_800_alpha_90">#e618191c</color>
|
||||||
|
***************
|
||||||
|
*** 299,308 ****
|
||||||
|
<color name="primary_dark_500">#ff4f545c</color>
|
||||||
|
<color name="primary_dark_530">#ff484c54</color>
|
||||||
|
<color name="primary_dark_560">#ff40444b</color>
|
||||||
|
! <color name="primary_dark_600">#ff36393f</color>
|
||||||
|
! <color name="primary_dark_630">#ff2f3136</color>
|
||||||
|
<color name="primary_dark_660">#ff292b2f</color>
|
||||||
|
! <color name="primary_dark_700">#ff202225</color>
|
||||||
|
<color name="primary_dark_730">#ff1e1f22</color>
|
||||||
|
<color name="primary_dark_760">#ff1b1d20</color>
|
||||||
|
<color name="primary_dark_800">#ff18191c</color>
|
||||||
|
--- 299,308 ----
|
||||||
|
<color name="primary_dark_500">#ff4f545c</color>
|
||||||
|
<color name="primary_dark_530">#ff484c54</color>
|
||||||
|
<color name="primary_dark_560">#ff40444b</color>
|
||||||
|
! <color name="primary_dark_600">#ff000000</color>
|
||||||
|
! <color name="primary_dark_630">#ff000000</color>
|
||||||
|
<color name="primary_dark_660">#ff292b2f</color>
|
||||||
|
! <color name="primary_dark_700">#ff000000</color>
|
||||||
|
<color name="primary_dark_730">#ff1e1f22</color>
|
||||||
|
<color name="primary_dark_760">#ff1b1d20</color>
|
||||||
|
<color name="primary_dark_800">#ff18191c</color>
|
||||||
|
***************
|
||||||
|
*** 347,355 ****
|
||||||
|
<color name="primary_text_default_material_light">#de000000</color>
|
||||||
|
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||||
|
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||||
|
! <color name="purple_brand">#ff738bd7</color>
|
||||||
|
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||||
|
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||||
|
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||||
|
<color name="purple_brand_notification">#ff5161ff</color>
|
||||||
|
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||||
|
--- 347,355 ----
|
||||||
|
<color name="primary_text_default_material_light">#de000000</color>
|
||||||
|
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||||
|
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||||
|
! <color name="purple_brand">#ff9c4249</color>
|
||||||
|
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||||
|
! <color name="purple_brand_dark">#ff000000</color>
|
||||||
|
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||||
|
<color name="purple_brand_notification">#ff5161ff</color>
|
||||||
|
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||||
|
***************
|
||||||
|
*** 488,494 ****
|
||||||
|
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||||
|
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||||
|
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||||
|
! <color name="tooltip_background_dark">#e6616161</color>
|
||||||
|
<color name="tooltip_background_light">#e6ffffff</color>
|
||||||
|
<color name="transparent">@android:color/transparent</color>
|
||||||
|
<color name="twitch">#ff593695</color>
|
||||||
|
--- 488,494 ----
|
||||||
|
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||||
|
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||||
|
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||||
|
! <color name="tooltip_background_dark">#e6000000</color>
|
||||||
|
<color name="tooltip_background_light">#e6ffffff</color>
|
||||||
|
<color name="transparent">@android:color/transparent</color>
|
||||||
|
<color name="twitch">#ff593695</color>
|
||||||
|
diff -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml
|
||||||
|
*** com.discord-base/res/values/styles.xml 2020-05-25 02:36:21.716839564 +0300
|
||||||
|
--- com.discord/res/values/styles.xml 2020-05-25 02:49:23.685210370 +0300
|
||||||
|
***************
|
||||||
|
*** 385,391 ****
|
||||||
|
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||||
|
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||||
|
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||||
|
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||||
|
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||||
|
<item name="theme_chat_code">@color/primary_630</item>
|
||||||
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||||
|
--- 385,391 ----
|
||||||
|
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||||
|
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||||
|
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||||
|
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||||
|
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||||
|
<item name="theme_chat_code">@color/primary_630</item>
|
||||||
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||||
|
***************
|
||||||
|
*** 397,409 ****
|
||||||
|
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||||
|
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||||
|
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||||
|
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||||
|
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||||
|
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||||
|
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||||
|
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||||
|
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||||
|
! <item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||||
|
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
|
||||||
|
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
|
||||||
|
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||||
|
--- 397,409 ----
|
||||||
|
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||||
|
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||||
|
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||||
|
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||||
|
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||||
|
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||||
|
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||||
|
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||||
|
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||||
|
! <item name="theme_chat_spoiler_bg">@color/primary_500</item>
|
||||||
|
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
|
||||||
|
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
|
||||||
|
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||||
|
***************
|
||||||
|
*** 812,818 ****
|
||||||
|
<item name="colorControlActivated">@color/brand_500</item>
|
||||||
|
<item name="colorControlNormal">@color/primary_100</item>
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||||
|
</style>
|
||||||
|
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||||
|
<item name="colorAccent">@color/brand_600</item>
|
||||||
|
--- 812,818 ----
|
||||||
|
<item name="colorControlActivated">@color/brand_500</item>
|
||||||
|
<item name="colorControlNormal">@color/primary_100</item>
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||||
|
</style>
|
||||||
|
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||||
|
<item name="colorAccent">@color/brand_600</item>
|
||||||
|
***************
|
||||||
|
*** 842,848 ****
|
||||||
|
<item name="colorControlActivated">@color/brand_500</item>
|
||||||
|
<item name="colorControlNormal">@color/primary_100</item>
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||||
|
</style>
|
||||||
|
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||||
|
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||||
|
--- 842,848 ----
|
||||||
|
<item name="colorControlActivated">@color/brand_500</item>
|
||||||
|
<item name="colorControlNormal">@color/primary_100</item>
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||||
|
</style>
|
||||||
|
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||||
|
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||||
|
Only in com.discord/smali/com/discord/app: AppActivity$d.smali.orig
|
||||||
|
Only in com.discord/smali/com/discord/app: AppActivity$d.smali.rej
|
||||||
|
diff -crB com.discord-base/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||||
|
*** com.discord-base/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-05-25 02:36:25.640198172 +0300
|
||||||
|
--- com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-05-25 02:52:48.406529503 +0300
|
||||||
|
***************
|
||||||
|
*** 78,84 ****
|
||||||
|
.line 3
|
||||||
|
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||||
|
|
||||||
|
! const v1, 0x7f060248
|
||||||
|
|
||||||
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||||
|
|
||||||
|
--- 78,84 ----
|
||||||
|
.line 3
|
||||||
|
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||||
|
|
||||||
|
! const v1, 0x7f060022
|
||||||
|
|
||||||
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -168,6 +168,7 @@ Self note: Top bar color is set by `setStatusBarColorResourceId`
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
#### Value reference
|
#### Value reference
|
||||||
|
|
||||||
|
|
|
||||||
20
patches/customversion/1148.patch
Normal file
20
patches/customversion/1148.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
|
||||||
|
*** from/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-05-25 02:36:24.893526696 +0300
|
||||||
|
--- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-05-25 02:39:46.921494846 +0300
|
||||||
|
***************
|
||||||
|
*** 2062,2068 ****
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, " - 24-alpha2 (1148)"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 2062,2068 ----
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, " - 24-alpha2 (1148), with Cutthecord patches"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
|
@ -162,4 +162,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
20
patches/disable-mobileindicator/1148.patch
Normal file
20
patches/disable-mobileindicator/1148.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||||
|
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-03-28 04:48:20.568638298 +0300
|
||||||
|
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-03-28 05:12:25.241750554 +0300
|
||||||
|
***************
|
||||||
|
*** 182,188 ****
|
||||||
|
|
||||||
|
const-string v2, "browser"
|
||||||
|
|
||||||
|
! const-string v3, "Discord Android"
|
||||||
|
|
||||||
|
invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
|
||||||
|
|
||||||
|
--- 182,188 ----
|
||||||
|
|
||||||
|
const-string v2, "browser"
|
||||||
|
|
||||||
|
! const-string v3, "Discord Client"
|
||||||
|
|
||||||
|
invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
|
||||||
|
|
||||||
|
|
@ -164,4 +164,5 @@ However, this causes some issues. See the `Bugs / Side effects` list below.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
261
patches/experiments/1148.patch
Normal file
261
patches/experiments/1148.patch
Normal file
|
|
@ -0,0 +1,261 @@
|
||||||
|
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||||
|
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-05-11 20:39:41.184361819 +0100
|
||||||
|
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-05-11 20:40:36.193773056 +0100
|
||||||
|
***************
|
||||||
|
*** 81,110 ****
|
||||||
|
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! const-string v0, "meUser"
|
||||||
|
|
||||||
|
! .line 2
|
||||||
|
! invoke-static {p1, v0}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result p1
|
||||||
|
!
|
||||||
|
! if-nez p1, :cond_1
|
||||||
|
!
|
||||||
|
! if-eqz p2, :cond_0
|
||||||
|
!
|
||||||
|
! goto :goto_0
|
||||||
|
!
|
||||||
|
! :cond_0
|
||||||
|
! const/4 p1, 0x0
|
||||||
|
!
|
||||||
|
! goto :goto_1
|
||||||
|
!
|
||||||
|
! :cond_1
|
||||||
|
! :goto_0
|
||||||
|
! const/4 p1, 0x1
|
||||||
|
!
|
||||||
|
! :goto_1
|
||||||
|
! return p1
|
||||||
|
.end method
|
||||||
|
--- 81,87 ----
|
||||||
|
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
! return v0
|
||||||
|
.end method
|
||||||
|
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||||
|
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-05-11 20:39:41.186361798 +0100
|
||||||
|
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-05-11 20:40:10.608046899 +0100
|
||||||
|
***************
|
||||||
|
*** 1318,1375 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||||
|
! .locals 4
|
||||||
|
|
||||||
|
! .line 1
|
||||||
|
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||||
|
|
||||||
|
! const/4 v1, 0x1
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! .line 2
|
||||||
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result v0
|
||||||
|
!
|
||||||
|
! if-eq v0, v1, :cond_2
|
||||||
|
!
|
||||||
|
! .line 3
|
||||||
|
! :cond_0
|
||||||
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! const-wide v2, 0x2bc056ab0800006L
|
||||||
|
!
|
||||||
|
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||||
|
!
|
||||||
|
! move-result-object v2
|
||||||
|
!
|
||||||
|
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||||
|
!
|
||||||
|
! move-result v0
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_1
|
||||||
|
!
|
||||||
|
! goto :goto_0
|
||||||
|
!
|
||||||
|
! :cond_1
|
||||||
|
! const/4 v1, 0x0
|
||||||
|
!
|
||||||
|
! :cond_2
|
||||||
|
! :goto_0
|
||||||
|
! return v1
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isInitialized()Lrx/Observable;
|
||||||
|
--- 1318,1328 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||||
|
! .locals 1
|
||||||
|
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
! return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isInitialized()Lrx/Observable;
|
||||||
|
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||||
|
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-05-11 20:39:42.096352058 +0100
|
||||||
|
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-05-11 20:41:04.033475089 +0100
|
||||||
|
***************
|
||||||
|
*** 87,97 ****
|
||||||
|
|
||||||
|
if-nez p4, :cond_1
|
||||||
|
|
||||||
|
! invoke-static {p1, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result p4
|
||||||
|
|
||||||
|
if-eqz p4, :cond_0
|
||||||
|
|
||||||
|
--- 87,93 ----
|
||||||
|
|
||||||
|
if-nez p4, :cond_1
|
||||||
|
|
||||||
|
! const/4 p4, 0x1
|
||||||
|
|
||||||
|
if-eqz p4, :cond_0
|
||||||
|
|
||||||
|
diff -crB from/smali_classes2/com/discord/widgets/tabs/TabsFeatureFlag.smali to/smali_classes2/com/discord/widgets/tabs/TabsFeatureFlag.smali
|
||||||
|
*** from/smali_classes2/com/discord/widgets/tabs/TabsFeatureFlag.smali 2020-05-11 20:39:42.696345636 +0100
|
||||||
|
--- to/smali_classes2/com/discord/widgets/tabs/TabsFeatureFlag.smali 2020-05-11 20:40:10.608046899 +0100
|
||||||
|
***************
|
||||||
|
*** 79,85 ****
|
||||||
|
.line 3
|
||||||
|
iget-object p1, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->sharedPreferences:Landroid/content/SharedPreferences;
|
||||||
|
|
||||||
|
! const/4 v0, -0x1
|
||||||
|
|
||||||
|
const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
|
||||||
|
|
||||||
|
--- 79,85 ----
|
||||||
|
.line 3
|
||||||
|
iget-object p1, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->sharedPreferences:Landroid/content/SharedPreferences;
|
||||||
|
|
||||||
|
! const/4 v0, 0x2
|
||||||
|
|
||||||
|
const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 280,288 ****
|
||||||
|
move-result-object v0
|
||||||
|
|
||||||
|
.line 2
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
|
||||||
|
!
|
||||||
|
! move-result p1
|
||||||
|
|
||||||
|
const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
|
||||||
|
|
||||||
|
--- 280,286 ----
|
||||||
|
move-result-object v0
|
||||||
|
|
||||||
|
.line 2
|
||||||
|
! const/4 p1, 0x2
|
||||||
|
|
||||||
|
const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 341,362 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isEnabled()Z
|
||||||
|
! .locals 2
|
||||||
|
!
|
||||||
|
! .line 1
|
||||||
|
! iget v0, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->experimentBucket:I
|
||||||
|
!
|
||||||
|
! const/4 v1, 0x1
|
||||||
|
!
|
||||||
|
! if-lt v0, v1, :cond_0
|
||||||
|
!
|
||||||
|
! goto :goto_0
|
||||||
|
|
||||||
|
! :cond_0
|
||||||
|
! const/4 v1, 0x0
|
||||||
|
|
||||||
|
! :goto_0
|
||||||
|
! return v1
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final prefetchExperimentBeforeRegistration(Lcom/discord/stores/StoreExperiments;)V
|
||||||
|
--- 339,349 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isEnabled()Z
|
||||||
|
! .locals 1
|
||||||
|
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
! return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final prefetchExperimentBeforeRegistration(Lcom/discord/stores/StoreExperiments;)V
|
||||||
|
***************
|
||||||
|
*** 404,434 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final useOverlappingPanels()Z
|
||||||
|
! .locals 2
|
||||||
|
!
|
||||||
|
! .line 1
|
||||||
|
! iget v0, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->experimentBucket:I
|
||||||
|
!
|
||||||
|
! const/4 v1, 0x2
|
||||||
|
!
|
||||||
|
! if-eq v0, v1, :cond_1
|
||||||
|
!
|
||||||
|
! const/4 v1, 0x3
|
||||||
|
!
|
||||||
|
! if-ne v0, v1, :cond_0
|
||||||
|
!
|
||||||
|
! goto :goto_0
|
||||||
|
!
|
||||||
|
! :cond_0
|
||||||
|
! const/4 v0, 0x0
|
||||||
|
!
|
||||||
|
! goto :goto_1
|
||||||
|
|
||||||
|
- :cond_1
|
||||||
|
- :goto_0
|
||||||
|
const/4 v0, 0x1
|
||||||
|
|
||||||
|
- :goto_1
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
--- 391,400 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final useOverlappingPanels()Z
|
||||||
|
! .locals 1
|
||||||
|
|
||||||
|
const/4 v0, 0x1
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
|
@ -166,4 +166,5 @@ This patch enables developer options (empty), mobile experiments (of which there
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
20
patches/hqavatars/1148.patch
Normal file
20
patches/hqavatars/1148.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
|
||||||
|
*** from/smali/com/discord/utilities/icon/IconUtils.smali 2020-04-30 01:36:39.987338080 +0100
|
||||||
|
--- to/smali/com/discord/utilities/icon/IconUtils.smali 2020-04-30 01:36:52.607266611 +0100
|
||||||
|
***************
|
||||||
|
*** 1402,1407 ****
|
||||||
|
--- 1402,1415 ----
|
||||||
|
|
||||||
|
invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
+ # Set avatar image size to 256
|
||||||
|
+
|
||||||
|
+ const-string v0, "?size=256"
|
||||||
|
+
|
||||||
|
+ invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ const-string v0, "https://cdn.discordapp.com/avatars/"
|
||||||
|
+
|
||||||
|
invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
|
||||||
|
move-result-object p3
|
||||||
|
|
@ -54,4 +54,5 @@ Changes avatars from 128x128 to 256x256 variants.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
267
patches/litecord/1148.patch
Normal file
267
patches/litecord/1148.patch
Normal file
|
|
@ -0,0 +1,267 @@
|
||||||
|
diff -crB com.discord-1144-base/smali/com/discord/app/App.smali com.discord-1144/smali/com/discord/app/App.smali
|
||||||
|
*** com.discord-1144-base/smali/com/discord/app/App.smali 2020-05-17 16:19:01.958076299 +0300
|
||||||
|
--- com.discord-1144/smali/com/discord/app/App.smali 2020-05-17 16:31:35.399385411 +0300
|
||||||
|
***************
|
||||||
|
*** 184,190 ****
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 23
|
||||||
|
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
|
||||||
|
--- 184,190 ----
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 23
|
||||||
|
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
|
||||||
|
diff -crB com.discord-1144-base/smali/com/discord/BuildConfig.smali com.discord-1144/smali/com/discord/BuildConfig.smali
|
||||||
|
*** com.discord-1144-base/smali/com/discord/BuildConfig.smali 2020-05-17 16:19:01.954742945 +0300
|
||||||
|
--- com.discord-1144/smali/com/discord/BuildConfig.smali 2020-05-17 16:33:53.810241517 +0300
|
||||||
|
***************
|
||||||
|
*** 18,36 ****
|
||||||
|
|
||||||
|
.field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
|
||||||
|
|
||||||
|
! .field public static final HOST:Ljava/lang/String; = "https://discord.com"
|
||||||
|
|
||||||
|
! .field public static final HOST_ALTERNATE:Ljava/lang/String; = "https://discordapp.com"
|
||||||
|
|
||||||
|
! .field public static final HOST_API:Ljava/lang/String; = "https://discord.com/api/"
|
||||||
|
|
||||||
|
! .field public static final HOST_CDN:Ljava/lang/String; = "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
! .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
|
||||||
|
|
||||||
|
! .field public static final HOST_GUILD_TEMPLATE:Ljava/lang/String; = "https://discord.new"
|
||||||
|
|
||||||
|
! .field public static final HOST_INVITE:Ljava/lang/String; = "https://discord.gg"
|
||||||
|
|
||||||
|
.field public static final LOCAL_IP:Ljava/lang/String; = ""
|
||||||
|
|
||||||
|
--- 18,36 ----
|
||||||
|
|
||||||
|
.field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
|
||||||
|
|
||||||
|
! .field public static final HOST:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
! .field public static final HOST_ALTERNATE:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
! .field public static final HOST_API:Ljava/lang/String; = "https://dev.litecord.top/api/"
|
||||||
|
|
||||||
|
! .field public static final HOST_CDN:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
! .field public static final HOST_GIFT:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
! .field public static final HOST_GUILD_TEMPLATE:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
! .field public static final HOST_INVITE:Ljava/lang/String; = "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.field public static final LOCAL_IP:Ljava/lang/String; = ""
|
||||||
|
|
||||||
|
Only in com.discord-1144/smali/com/discord: BuildConfig.smali.orig
|
||||||
|
Only in com.discord-1144/smali/com/discord: BuildConfig.smali.rej
|
||||||
|
diff -crB com.discord-1144-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-1144/smali/com/discord/stores/StoreGatewayConnection.smali
|
||||||
|
*** com.discord-1144-base/smali/com/discord/stores/StoreGatewayConnection.smali 2020-05-17 16:19:02.121410637 +0300
|
||||||
|
--- com.discord-1144/smali/com/discord/stores/StoreGatewayConnection.smali 2020-05-17 16:34:10.067008736 +0300
|
||||||
|
***************
|
||||||
|
*** 1374,1380 ****
|
||||||
|
|
||||||
|
sget-object v2, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
|
||||||
|
|
||||||
|
! const-string v6, "https://discord.com/api/"
|
||||||
|
|
||||||
|
invoke-direct {v5, v6, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
|
||||||
|
|
||||||
|
--- 1374,1380 ----
|
||||||
|
|
||||||
|
sget-object v2, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
|
||||||
|
|
||||||
|
! const-string v6, "https://dev.litecord.top/api/"
|
||||||
|
|
||||||
|
invoke-direct {v5, v6, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
|
||||||
|
|
||||||
|
Only in com.discord-1144/smali/com/discord/stores: StoreGatewayConnection.smali.orig
|
||||||
|
Only in com.discord-1144/smali/com/discord/stores: StoreGatewayConnection.smali.rej
|
||||||
|
diff -crB com.discord-1144-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-1144/smali/com/discord/utilities/icon/IconUtils.smali
|
||||||
|
*** com.discord-1144-base/smali/com/discord/utilities/icon/IconUtils.smali 2020-05-17 16:19:02.241411376 +0300
|
||||||
|
--- com.discord-1144/smali/com/discord/utilities/icon/IconUtils.smali 2020-05-17 16:31:35.402718765 +0300
|
||||||
|
***************
|
||||||
|
*** 459,465 ****
|
||||||
|
goto :goto_3
|
||||||
|
|
||||||
|
:cond_1
|
||||||
|
! const-string p3, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 2
|
||||||
|
invoke-interface {p3}, Ljava/lang/CharSequence;->length()I
|
||||||
|
--- 459,465 ----
|
||||||
|
goto :goto_3
|
||||||
|
|
||||||
|
:cond_1
|
||||||
|
! const-string p3, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 2
|
||||||
|
invoke-interface {p3}, Ljava/lang/CharSequence;->length()I
|
||||||
|
***************
|
||||||
|
*** 509,515 ****
|
||||||
|
|
||||||
|
invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com/channel-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 509,515 ----
|
||||||
|
|
||||||
|
invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top/channel-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 918,924 ****
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
|
||||||
|
|
||||||
|
--- 918,924 ----
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 999,1005 ****
|
||||||
|
|
||||||
|
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v2, "https://cdn.discordapp.com/icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 999,1005 ----
|
||||||
|
|
||||||
|
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v2, "https://dev.litecord.top/icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1310,1316 ****
|
||||||
|
:cond_0
|
||||||
|
if-eqz p1, :cond_6
|
||||||
|
|
||||||
|
! const-string p2, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 6
|
||||||
|
invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
|
||||||
|
--- 1310,1316 ----
|
||||||
|
:cond_0
|
||||||
|
if-eqz p1, :cond_6
|
||||||
|
|
||||||
|
! const-string p2, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 6
|
||||||
|
invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
|
||||||
|
***************
|
||||||
|
*** 1417,1423 ****
|
||||||
|
|
||||||
|
invoke-direct {p4}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com/avatars/"
|
||||||
|
|
||||||
|
invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 1417,1423 ----
|
||||||
|
|
||||||
|
invoke-direct {p4}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top/avatars/"
|
||||||
|
|
||||||
|
invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2626,2632 ****
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com/app-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 2626,2632 ----
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top/app-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2743,2749 ****
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com/app-assets/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 2743,2749 ----
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top/app-assets/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 3090,3096 ****
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com/app-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 3090,3096 ----
|
||||||
|
|
||||||
|
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top/app-icons/"
|
||||||
|
|
||||||
|
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
diff -crB com.discord-1144-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-1144/smali/com/discord/utilities/rest/RestAPI$Companion.smali
|
||||||
|
*** com.discord-1144-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2020-05-17 16:19:02.271411561 +0300
|
||||||
|
--- com.discord-1144/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2020-05-17 16:34:20.350405675 +0300
|
||||||
|
***************
|
||||||
|
*** 302,308 ****
|
||||||
|
.line 9
|
||||||
|
new-instance v1, Lcom/discord/restapi/RestAPIBuilder;
|
||||||
|
|
||||||
|
! const-string v9, "https://discord.com/api/"
|
||||||
|
|
||||||
|
invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lc0/n;)V
|
||||||
|
|
||||||
|
--- 302,308 ----
|
||||||
|
.line 9
|
||||||
|
new-instance v1, Lcom/discord/restapi/RestAPIBuilder;
|
||||||
|
|
||||||
|
! const-string v9, "https://dev.litecord.top/api/"
|
||||||
|
|
||||||
|
invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lc0/n;)V
|
||||||
|
|
||||||
|
Only in com.discord-1144/smali/com/discord/utilities/rest: RestAPI$Companion.smali.orig
|
||||||
|
Only in com.discord-1144/smali/com/discord/utilities/rest: RestAPI$Companion.smali.rej
|
||||||
|
|
||||||
|
|
@ -166,4 +166,5 @@ Please keep in mind that litecord is free (gratis and libre) software, provided
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
52096
patches/mutant/1148.patch
Normal file
52096
patches/mutant/1148.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -174,6 +174,7 @@ Various scripts are provided to help building of custom patches easier.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
#### Disclaimer
|
#### Disclaimer
|
||||||
|
|
||||||
|
|
|
||||||
14
patches/necessary/1148.patch
Normal file
14
patches/necessary/1148.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
|
*** from/AndroidManifest.xml 2020-05-25 02:36:19.233490234 +0300
|
||||||
|
--- to/AndroidManifest.xml 2020-05-25 02:39:44.511479320 +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="29" platformBuildVersionName="10">
|
||||||
|
<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.discord" platformBuildVersionCode="1148" platformBuildVersionName="24-alpha2">
|
||||||
|
<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"/>
|
||||||
18
patches/noblocked/1148.patch
Normal file
18
patches/noblocked/1148.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
diff -crB -x dist -x build com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml
|
||||||
|
*** com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-25 10:57:34.359248256 +0300
|
||||||
|
--- com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-27 00:08:22.929085528 +0300
|
||||||
|
***************
|
||||||
|
*** 1,5 ****
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <TextView android:textSize="11.0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="7.5dip" android:paddingBottom="7.5dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
|
||||||
|
</RelativeLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 1,5 ----
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="0px" android:paddingTop="0px" android:paddingRight="0px" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="0px" android:layout_height="0px" android:layout_marginLeft="0px" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
! <TextView android:textSize="0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="0dip" android:paddingBottom="0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
|
||||||
|
</RelativeLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
|
@ -157,4 +157,5 @@ This patch completely hides the "# Blocked Message(s)" thing.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
90
patches/nocamerabutton/1148.patch
Normal file
90
patches/nocamerabutton/1148.patch
Normal file
|
|
@ -0,0 +1,90 @@
|
||||||
|
Binary files com.discord-1144-base/build/apk/classes2.dex and com.discord-1144/build/apk/classes2.dex differ
|
||||||
|
Binary files com.discord-1144-base/build/apk/res/layout/flex_input_widget.xml and com.discord-1144/build/apk/res/layout/flex_input_widget.xml differ
|
||||||
|
Binary files com.discord-1144-base/dist/com.discord-1144.apk and com.discord-1144/dist/com.discord-1144.apk differ
|
||||||
|
diff -crB com.discord-1144-base/res/layout/flex_input_widget.xml com.discord-1144/res/layout/flex_input_widget.xml
|
||||||
|
*** com.discord-1144-base/res/layout/flex_input_widget.xml 2020-05-17 16:38:23.695244181 +0300
|
||||||
|
--- com.discord-1144/res/layout/flex_input_widget.xml 2020-05-17 18:35:31.125235116 +0300
|
||||||
|
***************
|
||||||
|
*** 8,14 ****
|
||||||
|
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
|
||||||
|
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||||
|
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
|
||||||
|
! <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
|
||||||
|
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
|
||||||
|
</LinearLayout>
|
||||||
|
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||||
|
--- 8,14 ----
|
||||||
|
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
|
||||||
|
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||||
|
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
|
||||||
|
! <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:visibility="gone" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
|
||||||
|
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
|
||||||
|
</LinearLayout>
|
||||||
|
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||||
|
***************
|
||||||
|
*** 21,24 ****
|
||||||
|
<TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
|
||||||
|
</RelativeLayout>
|
||||||
|
<FrameLayout android:orientation="vertical" android:id="@id/flex_input_emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
|
||||||
|
! </LinearLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 21,24 ----
|
||||||
|
<TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
|
||||||
|
</RelativeLayout>
|
||||||
|
<FrameLayout android:orientation="vertical" android:id="@id/flex_input_emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
|
||||||
|
! </LinearLayout>
|
||||||
|
diff -crB com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
|
||||||
|
*** com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-05-17 16:38:28.831942620 +0300
|
||||||
|
--- com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-05-17 18:39:05.170080075 +0300
|
||||||
|
***************
|
||||||
|
*** 793,799 ****
|
||||||
|
|
||||||
|
if-nez v4, :cond_4
|
||||||
|
|
||||||
|
! const/4 v10, 0x0
|
||||||
|
|
||||||
|
goto :goto_1
|
||||||
|
|
||||||
|
--- 793,799 ----
|
||||||
|
|
||||||
|
if-nez v4, :cond_4
|
||||||
|
|
||||||
|
! const/16 v10, 0x8
|
||||||
|
|
||||||
|
goto :goto_1
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 810,816 ****
|
||||||
|
|
||||||
|
if-eqz v4, :cond_5
|
||||||
|
|
||||||
|
! const/4 v10, 0x0
|
||||||
|
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
--- 810,816 ----
|
||||||
|
|
||||||
|
if-eqz v4, :cond_5
|
||||||
|
|
||||||
|
! const/16 v10, 0x8
|
||||||
|
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 832,838 ****
|
||||||
|
goto :goto_3
|
||||||
|
|
||||||
|
:cond_6
|
||||||
|
! const/16 v4, 0x8
|
||||||
|
|
||||||
|
:goto_3
|
||||||
|
invoke-virtual {v5, v4}, Landroid/view/View;->setVisibility(I)V
|
||||||
|
--- 832,838 ----
|
||||||
|
goto :goto_3
|
||||||
|
|
||||||
|
:cond_6
|
||||||
|
! const/16 v4, 0x0
|
||||||
|
|
||||||
|
:goto_3
|
||||||
|
invoke-virtual {v5, v4}, Landroid/view/View;->setVisibility(I)V
|
||||||
|
|
||||||
|
|
@ -64,4 +64,5 @@ to
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
24
patches/noemojibutton/1148.patch
Normal file
24
patches/noemojibutton/1148.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
Only in com.discord-1144: build
|
||||||
|
Only in com.discord-1144: dist
|
||||||
|
diff -crB com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
|
||||||
|
*** com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-05-17 16:38:28.831942620 +0300
|
||||||
|
--- com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali 2020-05-17 16:58:44.766148240 +0300
|
||||||
|
***************
|
||||||
|
*** 365,371 ****
|
||||||
|
|
||||||
|
if-eqz p1, :cond_1
|
||||||
|
|
||||||
|
! const/4 v0, 0x0
|
||||||
|
|
||||||
|
invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
|
||||||
|
|
||||||
|
--- 365,371 ----
|
||||||
|
|
||||||
|
if-eqz p1, :cond_1
|
||||||
|
|
||||||
|
! const/16 v0, 0x8
|
||||||
|
|
||||||
|
invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
|
||||||
|
|
||||||
|
Only in com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment: FlexInputFragment.smali.orig
|
||||||
|
|
||||||
|
|
@ -89,4 +89,5 @@ Self explanatory.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
99
patches/nonearby/1148.patch
Normal file
99
patches/nonearby/1148.patch
Normal file
|
|
@ -0,0 +1,99 @@
|
||||||
|
diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali
|
||||||
|
*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-03-31 01:08:53.575019356 +0100
|
||||||
|
--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-03-31 01:10:34.976038743 +0100
|
||||||
|
***************
|
||||||
|
*** 450,504 ****
|
||||||
|
|
||||||
|
# virtual methods
|
||||||
|
.method public final activateNearby()V
|
||||||
|
! .locals 9
|
||||||
|
|
||||||
|
- .line 1
|
||||||
|
- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
|
||||||
|
-
|
||||||
|
- if-eqz v0, :cond_0
|
||||||
|
-
|
||||||
|
- .line 2
|
||||||
|
- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
|
||||||
|
-
|
||||||
|
- if-eqz v1, :cond_0
|
||||||
|
-
|
||||||
|
- .line 3
|
||||||
|
- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
|
||||||
|
-
|
||||||
|
- if-eqz v2, :cond_0
|
||||||
|
-
|
||||||
|
- .line 4
|
||||||
|
- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
|
||||||
|
-
|
||||||
|
- if-eqz v3, :cond_0
|
||||||
|
-
|
||||||
|
- .line 5
|
||||||
|
- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
|
||||||
|
-
|
||||||
|
- if-eqz v4, :cond_0
|
||||||
|
-
|
||||||
|
- .line 6
|
||||||
|
- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject;
|
||||||
|
-
|
||||||
|
- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
|
||||||
|
-
|
||||||
|
- new-instance v7, Ljava/util/HashSet;
|
||||||
|
-
|
||||||
|
- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet;
|
||||||
|
-
|
||||||
|
- invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
||||||
|
-
|
||||||
|
- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
|
||||||
|
-
|
||||||
|
- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
|
||||||
|
-
|
||||||
|
- .line 7
|
||||||
|
- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task;
|
||||||
|
-
|
||||||
|
- .line 8
|
||||||
|
- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task;
|
||||||
|
-
|
||||||
|
- :cond_0
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
||||||
|
--- 450,457 ----
|
||||||
|
|
||||||
|
# virtual methods
|
||||||
|
.method public final activateNearby()V
|
||||||
|
! .locals 0
|
||||||
|
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 594,613 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final initialize(J)V
|
||||||
|
! .locals 1
|
||||||
|
!
|
||||||
|
! .line 1
|
||||||
|
! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long;
|
||||||
|
!
|
||||||
|
! .line 2
|
||||||
|
! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V
|
||||||
|
!
|
||||||
|
! .line 3
|
||||||
|
! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V
|
||||||
|
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
--- 547,553 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final initialize(J)V
|
||||||
|
! .locals 0
|
||||||
|
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
@ -160,4 +160,5 @@ This patch nulls a bunch of nearby friends features for privacy.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
49
patches/noprofilestrip/1148.patch
Normal file
49
patches/noprofilestrip/1148.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
|
||||||
|
*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000
|
||||||
|
--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000
|
||||||
|
***************
|
||||||
|
*** 430,442 ****
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
|
||||||
|
!
|
||||||
|
! move-result-object v4
|
||||||
|
!
|
||||||
|
! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
|
||||||
|
!
|
||||||
|
! move-result-object v4
|
||||||
|
|
||||||
|
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
--- 430,436 ----
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! const-string v4, ""
|
||||||
|
|
||||||
|
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 445,457 ****
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
|
||||||
|
!
|
||||||
|
! move-result-object p1
|
||||||
|
!
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
|
||||||
|
!
|
||||||
|
! move-result-object p1
|
||||||
|
|
||||||
|
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
--- 439,445 ----
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! const-string p1, ""
|
||||||
|
|
||||||
|
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
|
@ -154,4 +154,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
69
patches/nospoiler/1148.patch
Normal file
69
patches/nospoiler/1148.patch
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
diff -crB from/smali/com/discord/models/domain/ModelMessageEmbed.smali to/smali/com/discord/models/domain/ModelMessageEmbed.smali
|
||||||
|
*** from/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-05-08 14:20:52.607624355 +0100
|
||||||
|
--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-05-08 14:21:10.135443400 +0100
|
||||||
|
***************
|
||||||
|
*** 1923,1955 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public isSpoilerAttachment()Z
|
||||||
|
! .locals 2
|
||||||
|
!
|
||||||
|
! .line 1
|
||||||
|
! invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessageEmbed;->isAttachment()Z
|
||||||
|
!
|
||||||
|
! move-result v0
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! iget-object v0, p0, Lcom/discord/models/domain/ModelMessageEmbed;->title:Ljava/lang/String;
|
||||||
|
!
|
||||||
|
! const-string v1, "SPOILER_"
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
|
||||||
|
!
|
||||||
|
! move-result v0
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
!
|
||||||
|
! goto :goto_0
|
||||||
|
!
|
||||||
|
! :cond_0
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
- :goto_0
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
--- 1923,1931 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public isSpoilerAttachment()Z
|
||||||
|
! .locals 1
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
|
||||||
|
*** from/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2020-05-08 14:20:53.099619294 +0100
|
||||||
|
--- to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2020-05-08 14:21:10.135443400 +0100
|
||||||
|
***************
|
||||||
|
*** 209,216 ****
|
||||||
|
.method public isRevealed()Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! .line 1
|
||||||
|
! iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
--- 209,215 ----
|
||||||
|
.method public isRevealed()Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
|
@ -157,4 +157,5 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
3
patches/notrack/1148-post.sh
Normal file
3
patches/notrack/1148-post.sh
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/bash
|
||||||
|
mv smali/com/crashlytics smali_classes2/com/
|
||||||
|
mv smali/com/airbnb smali_classes2/com/
|
||||||
1283
patches/notrack/1148.patch
Normal file
1283
patches/notrack/1148.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -164,3 +164,4 @@ Fuck telemetry.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
|
||||||
34
patches/nozlib/1148.patch
Normal file
34
patches/nozlib/1148.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
|
||||||
|
*** from/smali/com/discord/gateway/GatewaySocket.smali 2020-05-19 03:35:25.282670342 +0100
|
||||||
|
--- to/smali/com/discord/gateway/GatewaySocket.smali 2020-05-19 03:35:50.638429407 +0100
|
||||||
|
***************
|
||||||
|
*** 1093,1099 ****
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 1093,1099 ----
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6"
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
|
||||||
|
*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2020-05-19 03:35:25.286670304 +0100
|
||||||
|
--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2020-05-19 03:35:50.638429407 +0100
|
||||||
|
***************
|
||||||
|
*** 64,69 ****
|
||||||
|
--- 64,71 ----
|
||||||
|
|
||||||
|
iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->large_threshold:I
|
||||||
|
|
||||||
|
+ const/4 p3, 0x0
|
||||||
|
+
|
||||||
|
iput-boolean p3, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->compress:Z
|
||||||
|
|
||||||
|
iput-wide p4, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->capabilities:J
|
||||||
|
|
@ -157,4 +157,5 @@ This patch disables zlib-stream field on wss, making it easier to parse it.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
65
patches/profilemention/1148.patch
Normal file
65
patches/profilemention/1148.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
|
||||||
|
*** from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali 2020-05-25 02:36:24.593524763 +0300
|
||||||
|
--- to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali 2020-05-25 02:39:49.331510371 +0300
|
||||||
|
***************
|
||||||
|
*** 242,300 ****
|
||||||
|
.end annotation
|
||||||
|
.end param
|
||||||
|
|
||||||
|
- .line 1
|
||||||
|
- invoke-static {p1}, Lcom/discord/utilities/guilds/PublicGuildUtils;->isPublicGuildSystemMessage(Lcom/discord/models/domain/ModelMessage;)Z
|
||||||
|
-
|
||||||
|
- move-result v0
|
||||||
|
-
|
||||||
|
- if-nez v0, :cond_1
|
||||||
|
-
|
||||||
|
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMessageReference()Lcom/discord/models/domain/ModelMessage$MessageReference;
|
||||||
|
-
|
||||||
|
- move-result-object v0
|
||||||
|
-
|
||||||
|
- if-eqz v0, :cond_0
|
||||||
|
-
|
||||||
|
- goto :goto_0
|
||||||
|
-
|
||||||
|
- .line 2
|
||||||
|
- :cond_0
|
||||||
|
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
|
||||||
|
-
|
||||||
|
- move-result-object v0
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
|
||||||
|
-
|
||||||
|
- move-result-wide v0
|
||||||
|
-
|
||||||
|
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
|
||||||
|
-
|
||||||
|
- move-result-wide v2
|
||||||
|
-
|
||||||
|
- invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
|
||||||
|
-
|
||||||
|
- move-result-object v2
|
||||||
|
-
|
||||||
|
- invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||||
|
-
|
||||||
|
- move-result-object p2
|
||||||
|
-
|
||||||
|
- invoke-static {v0, v1, p1, v2, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
|
||||||
|
-
|
||||||
|
- goto :goto_1
|
||||||
|
-
|
||||||
|
- .line 3
|
||||||
|
- :cond_1
|
||||||
|
- :goto_0
|
||||||
|
invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatList$1;->onMessageAuthorNameClicked(Lcom/discord/models/domain/ModelMessage;J)V
|
||||||
|
|
||||||
|
- :goto_1
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
||||||
|
--- 242,249 ----
|
||||||
|
|
@ -6,4 +6,5 @@ This patch restores the behavior where tapping a user's profile picture adds the
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
3382
patches/slashcommands/1148.patch
Normal file
3382
patches/slashcommands/1148.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -167,4 +167,5 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
21
patches/squareavatars/1148.patch
Normal file
21
patches/squareavatars/1148.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
diff -crB from/res/values/styles.xml to/res/values/styles.xml
|
||||||
|
*** from/res/values/styles.xml 2020-05-19 03:35:24.264680015 +0100
|
||||||
|
--- to/res/values/styles.xml 2020-05-19 03:35:42.574506035 +0100
|
||||||
|
***************
|
||||||
|
*** 1021,1027 ****
|
||||||
|
<item name="actualImageScaleType">fitCenter</item>
|
||||||
|
<item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
|
||||||
|
<item name="placeholderImageScaleType">fitCenter</item>
|
||||||
|
! <item name="roundAsCircle">true</item>
|
||||||
|
</style>
|
||||||
|
<style name="Avatar.Chat" parent="@style/Avatar.Large">
|
||||||
|
<item name="android:layout_width">@dimen/avatar_size_chat</item>
|
||||||
|
--- 1021,1028 ----
|
||||||
|
<item name="actualImageScaleType">fitCenter</item>
|
||||||
|
<item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
|
||||||
|
<item name="placeholderImageScaleType">fitCenter</item>
|
||||||
|
! <item name="roundAsCircle">false</item>
|
||||||
|
! <item name="roundedCornerRadius">3dp</item>
|
||||||
|
</style>
|
||||||
|
<style name="Avatar.Chat" parent="@style/Avatar.Large">
|
||||||
|
<item name="android:layout_width">@dimen/avatar_size_chat</item>
|
||||||
|
|
@ -159,4 +159,5 @@ A very small amount of rounding is applied to make it look a little better.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
422
patches/supplemental/1148.patch
Normal file
422
patches/supplemental/1148.patch
Normal file
|
|
@ -0,0 +1,422 @@
|
||||||
|
diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/discord/gateway/io/IncomingParser.smali
|
||||||
|
*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-04-19 17:04:55.390315299 +0100
|
||||||
|
--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-04-19 17:05:29.650181703 +0100
|
||||||
|
***************
|
||||||
|
*** 728,733 ****
|
||||||
|
--- 728,744 ----
|
||||||
|
|
||||||
|
.line 55
|
||||||
|
:goto_2
|
||||||
|
+
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getNoDelete()Z
|
||||||
|
+
|
||||||
|
+ move-result v4
|
||||||
|
+
|
||||||
|
+ if-nez v4, :cond_b
|
||||||
|
+
|
||||||
|
new-instance v0, Lcom/discord/models/domain/ModelMessageDelete;
|
||||||
|
|
||||||
|
invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;-><init>()V
|
||||||
|
diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali
|
||||||
|
*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-04-19 17:04:55.404315245 +0100
|
||||||
|
--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-04-19 17:05:29.650181703 +0100
|
||||||
|
***************
|
||||||
|
*** 2187,2192 ****
|
||||||
|
--- 2187,2202 ----
|
||||||
|
}
|
||||||
|
.end annotation
|
||||||
|
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getLeakChannels()Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ if-eqz v0, :cond_0
|
||||||
|
+
|
||||||
|
.line 1
|
||||||
|
iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map;
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali
|
||||||
|
*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-04-19 17:04:55.624314415 +0100
|
||||||
|
--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-04-19 17:05:29.650181703 +0100
|
||||||
|
***************
|
||||||
|
*** 402,407 ****
|
||||||
|
--- 402,655 ----
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
||||||
|
+ .method public getLeakChannels()Z
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
|
||||||
|
+
|
||||||
|
+ const/4 v2, 0x1
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ return v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public setLeakChannels(Z)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public getImageSpoiler()Z
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
|
||||||
|
+
|
||||||
|
+ const/4 v2, 0x0
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ return v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public setImageSpoiler(Z)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ .method public getNoDelete()Z
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_NO_DELETE"
|
||||||
|
+
|
||||||
|
+ const/4 v2, 0x0
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ return v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public setNoDelete(Z)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_NO_DELETE"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public getShowTyping()Z
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
|
||||||
|
+
|
||||||
|
+ const/4 v2, 0x1
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ return v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public setShowTyping(Z)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ .method public getStoredToken()Ljava/lang/String;
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "none"
|
||||||
|
+
|
||||||
|
+ const-string v2, "STORE_AUTHED_TOKEN"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ return-object v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ .method public setStoredToken(Ljava/lang/String;)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ const-string v1, "STORE_AUTHED_TOKEN"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+ .method public getAccountToken(Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ const-string v2, "STORE_AUTHED_TOKEN_CTC_USER_"
|
||||||
|
+
|
||||||
|
+ invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object v2
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ const-string v1, "none"
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ return-object v0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ .method public setAccountToken(Ljava/lang/String;Ljava/lang/String;)V
|
||||||
|
+ .locals 2
|
||||||
|
+
|
||||||
|
+ const-string v1, "STORE_AUTHED_TOKEN_CTC_USER_"
|
||||||
|
+
|
||||||
|
+ invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object v1
|
||||||
|
+
|
||||||
|
+ iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ invoke-interface {v0, v1, p2}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
.method private getAdjustedTheme(Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
|
||||||
|
*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-04-19 17:04:55.738313984 +0100
|
||||||
|
--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-04-19 17:05:29.650181703 +0100
|
||||||
|
***************
|
||||||
|
*** 46,51 ****
|
||||||
|
--- 46,85 ----
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
|
||||||
|
+ .method public static final interceptFilename(Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
+ .locals 3
|
||||||
|
+
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getImageSpoiler()Z
|
||||||
|
+
|
||||||
|
+ move-result v1
|
||||||
|
+
|
||||||
|
+ if-eqz v1, :cond_1
|
||||||
|
+
|
||||||
|
+ new-instance v2, Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ const-string v1, "SPOILER_"
|
||||||
|
+
|
||||||
|
+ invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object p0
|
||||||
|
+
|
||||||
|
+ # I commented this out and do this in StoreMessages now as this'd only work for a single image
|
||||||
|
+ # const/4 v1, 0x0
|
||||||
|
+
|
||||||
|
+ # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V
|
||||||
|
+
|
||||||
|
+ :cond_1
|
||||||
|
+ return-object p0
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
|
||||||
|
# virtual methods
|
||||||
|
.method public final invoke(Lokhttp3/RequestBody;Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Lcom/discord/utilities/rest/SendUtils$FileUpload;
|
||||||
|
***************
|
||||||
|
*** 77,82 ****
|
||||||
|
--- 111,120 ----
|
||||||
|
|
||||||
|
move-result-object v3
|
||||||
|
|
||||||
|
+ invoke-static {v3}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
+
|
||||||
|
+ move-result-object v3
|
||||||
|
+
|
||||||
|
.line 4
|
||||||
|
sget-object p1, Lokhttp3/MultipartBody$Part;->c:Lokhttp3/MultipartBody$Part$a;
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
|
||||||
|
*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-04-19 17:04:55.892313403 +0100
|
||||||
|
--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-04-19 17:05:29.650181703 +0100
|
||||||
|
***************
|
||||||
|
*** 59,64 ****
|
||||||
|
--- 59,74 ----
|
||||||
|
|
||||||
|
invoke-virtual {v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->saveText()V
|
||||||
|
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
|
||||||
|
+
|
||||||
|
+ move-result-object v0
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getShowTyping()Z
|
||||||
|
+
|
||||||
|
+ move-result v0
|
||||||
|
+
|
||||||
|
+ if-eqz v0, :cond_1
|
||||||
|
+
|
||||||
|
.line 4
|
||||||
|
invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
|
||||||
|
|
||||||
|
diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
|
||||||
|
*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-04-19 17:04:55.898313380 +0100
|
||||||
|
--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-04-19 17:07:25.007675166 +0100
|
||||||
|
***************
|
||||||
|
*** 60,65 ****
|
||||||
|
--- 60,89 ----
|
||||||
|
return p0
|
||||||
|
.end method
|
||||||
|
|
||||||
|
+ .method public static final access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z
|
||||||
|
+ .locals 1
|
||||||
|
+
|
||||||
|
+ .line 147
|
||||||
|
+ invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
+
|
||||||
|
+ .line 148
|
||||||
|
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->clearLastTypingEmission()V
|
||||||
|
+
|
||||||
|
+ .line 151
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChat()Lcom/discord/stores/StoreChat;
|
||||||
|
+
|
||||||
|
+ move-result-object p1
|
||||||
|
+
|
||||||
|
+ const/4 v0, 0x0
|
||||||
|
+
|
||||||
|
+ .line 152
|
||||||
|
+ invoke-virtual {p1, v0}, Lcom/discord/stores/StoreChat;->setEditingMessage(Lcom/discord/stores/StoreChat$EditingMessage;)V
|
||||||
|
+
|
||||||
|
+ const/4 p1, 0x1
|
||||||
|
+
|
||||||
|
+ return p1
|
||||||
|
+ .end method
|
||||||
|
+
|
||||||
|
.method private final clearInput(Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/Boolean;)Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
|
@ -110,4 +110,5 @@ This patch adds various helper functions that were previously part of slashcomma
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
||||||
|
|
|
||||||
33
patches/tokenlogin/1148.patch
Normal file
33
patches/tokenlogin/1148.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
diff -crB from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
|
||||||
|
*** from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2020-04-08 12:56:38.684667995 +0100
|
||||||
|
--- to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2020-04-08 12:56:55.496623211 +0100
|
||||||
|
***************
|
||||||
|
*** 1012,1017 ****
|
||||||
|
--- 1012,1038 ----
|
||||||
|
|
||||||
|
move-result-object v3
|
||||||
|
|
||||||
|
+ # tokenlogin code
|
||||||
|
+
|
||||||
|
+ const-string v6, "tokenlogin"
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v2, v6}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
|
||||||
|
+
|
||||||
|
+ move-result v6
|
||||||
|
+
|
||||||
|
+ if-eqz v6, :cond_2
|
||||||
|
+
|
||||||
|
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
|
||||||
|
+
|
||||||
|
+ move-result-object v6
|
||||||
|
+
|
||||||
|
+ invoke-virtual {v6, v3}, Lcom/discord/stores/StoreUserSettings;->setStoredToken(Ljava/lang/String;)V
|
||||||
|
+
|
||||||
|
+ return-void
|
||||||
|
+
|
||||||
|
+ # end of new code (except conf below, that's also new)
|
||||||
|
+
|
||||||
|
+ :cond_2
|
||||||
|
invoke-virtual {v0, v2, v3, p1, p2}, Lcom/discord/stores/StoreAuthentication;->login(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lrx/Observable;
|
||||||
|
|
||||||
|
move-result-object p1
|
||||||
|
|
@ -136,3 +136,4 @@ This patch relies on supplemental, so please use that patch too.
|
||||||
- 22.4
|
- 22.4
|
||||||
- 22.5
|
- 22.5
|
||||||
- 23.0
|
- 23.0
|
||||||
|
- 24-alpha2
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"versionname": "23.0", "versioncode": "1146"}
|
{"versionname": "24-alpha2", "versioncode": "1148"}
|
||||||
Loading…
Reference in a new issue