9.4.3 :)
This commit is contained in:
parent
cfec47a7d8
commit
2b9884e2b9
42 changed files with 9834 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:** 9.4.2-SA (942), released on 2019-08-17.
|
**Latest supported Discord Android version:** 9.4.3-SA (943), released on 2019-08-20.
|
||||||
|
|
||||||
New patch development will be done for the latest supported version.
|
New patch development will be done for the latest supported version.
|
||||||
|
|
||||||
|
|
233
patches/branding/943.patch
Normal file
233
patches/branding/943.patch
Normal file
|
@ -0,0 +1,233 @@
|
||||||
|
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
|
*** from/AndroidManifest.xml 2019-08-20 10:24:04.931816520 +0300
|
||||||
|
--- to/AndroidManifest.xml 2019-08-20 10:24:06.478490969 +0300
|
||||||
|
***************
|
||||||
|
*** 1,4 ****
|
||||||
|
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="943" platformBuildVersionName="9.4.3-SA">
|
||||||
|
<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="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="943CTCBUILD" platformBuildVersionName="9.4.3-SA-cutthecord-CTCBUILD">
|
||||||
|
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||||
|
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||||
|
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||||
|
***************
|
||||||
|
*** 19,29 ****
|
||||||
|
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
|
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||||
|
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||||
|
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||||
|
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||||
|
! <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: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.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||||
|
--- 19,29 ----
|
||||||
|
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
|
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||||
|
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||||
|
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||||
|
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||||
|
! <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.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||||
|
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||||
|
***************
|
||||||
|
*** 78,84 ****
|
||||||
|
<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"/>
|
||||||
|
--- 78,84 ----
|
||||||
|
<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"/>
|
||||||
|
***************
|
||||||
|
*** 108,121 ****
|
||||||
|
</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"/>
|
||||||
|
<meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
|
||||||
|
<meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
|
||||||
|
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
||||||
|
! <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"/>
|
||||||
|
--- 108,121 ----
|
||||||
|
</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"/>
|
||||||
|
<meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
|
||||||
|
<meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
|
||||||
|
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
||||||
|
! <provider android:authorities="top.distok.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"/>
|
||||||
|
***************
|
||||||
|
*** 178,184 ****
|
||||||
|
<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
|
||||||
|
</intent-filter>
|
||||||
|
</receiver>
|
||||||
|
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||||
|
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||||
|
<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">
|
||||||
|
--- 178,184 ----
|
||||||
|
<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
|
||||||
|
</intent-filter>
|
||||||
|
</receiver>
|
||||||
|
! <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||||
|
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||||
|
<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">
|
||||||
|
***************
|
||||||
|
*** 189,196 ****
|
||||||
|
<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.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||||
|
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||||
|
<meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||||
|
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||||
|
</application>
|
||||||
|
--- 189,196 ----
|
||||||
|
<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="top.distok.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||||
|
! <provider android:authorities="top.distok.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="true"/>
|
||||||
|
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||||
|
</application>
|
||||||
|
diff -crB from/apktool.yml to/apktool.yml
|
||||||
|
*** from/apktool.yml 2019-08-20 10:21:49.984491568 +0300
|
||||||
|
--- to/apktool.yml 2019-08-20 10:24:06.478490969 +0300
|
||||||
|
***************
|
||||||
|
*** 181,185 ****
|
||||||
|
tag: null
|
||||||
|
version: 2.4.1-75e4c6-SNAPSHOT
|
||||||
|
versionInfo:
|
||||||
|
! versionCode: '943'
|
||||||
|
! versionName: 9.4.3-SA
|
||||||
|
--- 181,185 ----
|
||||||
|
tag: null
|
||||||
|
version: 2.4.1-75e4c6-SNAPSHOT
|
||||||
|
versionInfo:
|
||||||
|
! versionCode: '943CTCBUILD'
|
||||||
|
! versionName: 9.4.3-SA-cutthecord-CTCBUILD
|
||||||
|
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||||
|
*** from/res/values/strings.xml 2019-08-20 10:21:46.367807928 +0300
|
||||||
|
--- to/res/values/strings.xml 2019-08-20 10:24:06.478490969 +0300
|
||||||
|
***************
|
||||||
|
*** 1292,1298 ****
|
||||||
|
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||||
|
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||||
|
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||||
|
! <string name="discord">Discord</string>
|
||||||
|
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||||
|
<string name="discord_desc_short">Team voice & text chat</string>
|
||||||
|
<string name="discord_gg">discord.gg/</string>
|
||||||
|
--- 1292,1298 ----
|
||||||
|
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||||
|
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||||
|
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||||
|
! <string name="discord">CTCNAME</string>
|
||||||
|
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||||
|
<string name="discord_desc_short">Team voice & text chat</string>
|
||||||
|
<string name="discord_gg">discord.gg/</string>
|
||||||
|
***************
|
||||||
|
*** 3116,3122 ****
|
||||||
|
<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="notification_voice_status_body">Join them: %1$s</string>
|
||||||
|
<string name="notification_voice_status_body_no_status">Join the party!</string>
|
||||||
|
--- 3116,3122 ----
|
||||||
|
<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="notification_voice_status_body">Join them: %1$s</string>
|
||||||
|
<string name="notification_voice_status_body_no_status">Join the party!</string>
|
||||||
|
***************
|
||||||
|
*** 4270,4276 ****
|
||||||
|
<string name="sub_enabled_servers">Sub Enabled Servers</string>
|
||||||
|
<string name="subscriber_information">Subscriber Information</string>
|
||||||
|
<string name="suggestions">Suggestions</string>
|
||||||
|
! <string name="support">Support</string>
|
||||||
|
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||||
|
<string name="suppressed">Suppressed</string>
|
||||||
|
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||||
|
--- 4270,4276 ----
|
||||||
|
<string name="sub_enabled_servers">Sub Enabled Servers</string>
|
||||||
|
<string name="subscriber_information">Subscriber Information</string>
|
||||||
|
<string name="suggestions">Suggestions</string>
|
||||||
|
! <string name="support">CutTheCord Repo</string>
|
||||||
|
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||||
|
<string name="suppressed">Suppressed</string>
|
||||||
|
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||||
|
diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali
|
||||||
|
*** from/smali/com/discord/app/e.smali 2019-08-20 10:21:47.807814686 +0300
|
||||||
|
--- to/smali/com/discord/app/e.smali 2019-08-20 10:24:06.478490969 +0300
|
||||||
|
***************
|
||||||
|
*** 56,62 ****
|
||||||
|
.line 15
|
||||||
|
sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String;
|
||||||
|
|
||||||
|
! const-string v0, "https://support.discordapp.com"
|
||||||
|
|
||||||
|
.line 16
|
||||||
|
sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String;
|
||||||
|
--- 56,62 ----
|
||||||
|
.line 15
|
||||||
|
sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String;
|
||||||
|
|
||||||
|
! const-string v0, "https://gitdab.com/distok/cutthecord"
|
||||||
|
|
||||||
|
.line 16
|
||||||
|
sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String;
|
||||||
|
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||||
|
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-08-20 10:21:48.081149302 +0300
|
||||||
|
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-08-20 10:24:06.478490969 +0300
|
||||||
|
***************
|
||||||
|
*** 77,83 ****
|
||||||
|
|
||||||
|
new-instance v0, Landroid/content/Intent;
|
||||||
|
|
||||||
|
! const-string v1, "https://discordapp.com/app"
|
||||||
|
|
||||||
|
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||||
|
|
||||||
|
--- 77,83 ----
|
||||||
|
|
||||||
|
new-instance v0, Landroid/content/Intent;
|
||||||
|
|
||||||
|
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||||
|
|
||||||
|
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||||
|
|
|
@ -55,4 +55,5 @@ You can use the following line to patch authorities:
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
78
patches/compact/943.patch
Normal file
78
patches/compact/943.patch
Normal file
|
@ -0,0 +1,78 @@
|
||||||
|
diff -crB from/res/layout/widget_chat_list_adapter_item_text.xml to/res/layout/widget_chat_list_adapter_item_text.xml
|
||||||
|
*** from/res/layout/widget_chat_list_adapter_item_text.xml 2019-08-12 17:12:52.667032201 +0300
|
||||||
|
--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +0300
|
||||||
|
***************
|
||||||
|
*** 2,12 ****
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
|
||||||
|
- <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
|
||||||
|
<TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||||
|
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
|
||||||
|
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
- <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 2,11 ----
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
|
||||||
|
<TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||||
|
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
|
||||||
|
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
|
||||||
|
+ <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
diff -crB from/res/layout-v17/widget_chat_list_adapter_item_text.xml to/res/layout-v17/widget_chat_list_adapter_item_text.xml
|
||||||
|
*** from/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-08-12 17:12:51.407023798 +0300
|
||||||
|
--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +0300
|
||||||
|
***************
|
||||||
|
*** 2,12 ****
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
|
||||||
|
- <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
|
||||||
|
<TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||||
|
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
|
||||||
|
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
- <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 2,11 ----
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
|
||||||
|
<TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||||
|
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
|
||||||
|
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
|
||||||
|
+ <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
\ No newline at end of file
|
||||||
|
diff -crB from/res/values/dimens.xml to/res/values/dimens.xml
|
||||||
|
*** from/res/values/dimens.xml 2019-08-12 17:12:52.937034002 +0300
|
||||||
|
--- to/res/values/dimens.xml 2019-08-12 17:13:38.650669506 +0300
|
||||||
|
***************
|
||||||
|
*** 334,340 ****
|
||||||
|
<dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
|
||||||
|
<dimen name="uikit_btn_stroke_width">1.0dip</dimen>
|
||||||
|
<dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
|
||||||
|
! <dimen name="uikit_guideline_chat">58.0dip</dimen>
|
||||||
|
<dimen name="uikit_guideline_item_row">48.0dip</dimen>
|
||||||
|
<dimen name="uikit_guideline_sheet">72.0dip</dimen>
|
||||||
|
<dimen name="uikit_image_border_size">3.0dip</dimen>
|
||||||
|
--- 334,340 ----
|
||||||
|
<dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
|
||||||
|
<dimen name="uikit_btn_stroke_width">1.0dip</dimen>
|
||||||
|
<dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
|
||||||
|
! <dimen name="uikit_guideline_chat">20.0dip</dimen>
|
||||||
|
<dimen name="uikit_guideline_item_row">48.0dip</dimen>
|
||||||
|
<dimen name="uikit_guideline_sheet">72.0dip</dimen>
|
||||||
|
<dimen name="uikit_image_border_size">3.0dip</dimen>
|
|
@ -39,4 +39,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
81
patches/customdefaultemoji/943.patch
Normal file
81
patches/customdefaultemoji/943.patch
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
diff -crB com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali com.discord-896/smali/com/discord/stores/StoreEmoji.smali
|
||||||
|
*** com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:13:46.831159818 +0300
|
||||||
|
--- com.discord-896/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:18:56.659462281 +0300
|
||||||
|
***************
|
||||||
|
*** 101,137 ****
|
||||||
|
|
||||||
|
const/4 v1, 0x0
|
||||||
|
|
||||||
|
! const-string v2, "thinking"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x1
|
||||||
|
|
||||||
|
! const-string v2, "ok_hand"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x2
|
||||||
|
|
||||||
|
! const-string v2, "eyes"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x3
|
||||||
|
|
||||||
|
! const-string v2, "sweat_drops"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x4
|
||||||
|
|
||||||
|
! const-string v2, "joy"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x5
|
||||||
|
|
||||||
|
! const-string v2, "pig"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
--- 101,137 ----
|
||||||
|
|
||||||
|
const/4 v1, 0x0
|
||||||
|
|
||||||
|
! const-string v2, "star"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x1
|
||||||
|
|
||||||
|
! const-string v2, "thinking"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x2
|
||||||
|
|
||||||
|
! const-string v2, "ok_hand"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x3
|
||||||
|
|
||||||
|
! const-string v2, "eyes"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x4
|
||||||
|
|
||||||
|
! const-string v2, "sweat_drops"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
const/4 v1, 0x5
|
||||||
|
|
||||||
|
! const-string v2, "joy"
|
||||||
|
|
||||||
|
aput-object v2, v0, v1
|
||||||
|
|
||||||
|
|
|
@ -21,4 +21,5 @@ This patch changes default list of custom emojis.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
265
patches/customtheme/943.patch
Normal file
265
patches/customtheme/943.patch
Normal file
|
@ -0,0 +1,265 @@
|
||||||
|
diff -crB from/res/values/colors.xml to/res/values/colors.xml
|
||||||
|
*** from/res/values/colors.xml 2019-08-20 10:21:46.544475423 +0300
|
||||||
|
--- to/res/values/colors.xml 2019-08-20 10:24:10.795179358 +0300
|
||||||
|
***************
|
||||||
|
*** 50,56 ****
|
||||||
|
<color name="cardview_shadow_start_color">#37000000</color>
|
||||||
|
<color name="code">#ff657b83</color>
|
||||||
|
<color name="colorPrimary">#ff333333</color>
|
||||||
|
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_disabled">#1f000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_focused">@android:color/black</color>
|
||||||
|
--- 50,56 ----
|
||||||
|
<color name="cardview_shadow_start_color">#37000000</color>
|
||||||
|
<color name="code">#ff657b83</color>
|
||||||
|
<color name="colorPrimary">#ff333333</color>
|
||||||
|
! <color name="colorPrimaryDark">#ff000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_disabled">#1f000000</color>
|
||||||
|
<color name="common_google_signin_btn_text_dark_focused">@android:color/black</color>
|
||||||
|
***************
|
||||||
|
*** 59,66 ****
|
||||||
|
<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_default_color_primary">#ff3f51b5</color>
|
||||||
|
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||||
|
--- 59,66 ----
|
||||||
|
<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_default_color_primary">#ff3f51b5</color>
|
||||||
|
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||||
|
***************
|
||||||
|
*** 94,102 ****
|
||||||
|
<color name="grey_6">#ff4f545c</color>
|
||||||
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||||
|
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||||
|
! <color name="grey_account">#ff282b30</color>
|
||||||
|
! <color name="grey_channels">#ff2e3136</color>
|
||||||
|
! <color name="grey_guilds">#ff1e2124</color>
|
||||||
|
<color name="grey_unread">#ff8a8e94</color>
|
||||||
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||||
|
<color name="highlighted_text_material_light">#66009688</color>
|
||||||
|
--- 94,102 ----
|
||||||
|
<color name="grey_6">#ff4f545c</color>
|
||||||
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||||
|
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||||
|
! <color name="grey_account">#ff000000</color>
|
||||||
|
! <color name="grey_channels">#ff000000</color>
|
||||||
|
! <color name="grey_guilds">#ff000000</color>
|
||||||
|
<color name="grey_unread">#ff8a8e94</color>
|
||||||
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||||
|
<color name="highlighted_text_material_light">#66009688</color>
|
||||||
|
***************
|
||||||
|
*** 104,118 ****
|
||||||
|
<color name="hypesquad_house2">#fff47b67</color>
|
||||||
|
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||||
|
<color name="league_of_legends">#ff021f25</color>
|
||||||
|
! <color name="link_100">#fff2fbfe</color>
|
||||||
|
! <color name="link_200">#ffcceffd</color>
|
||||||
|
! <color name="link_300">#ff99dffb</color>
|
||||||
|
! <color name="link_400">#ff33c0f6</color>
|
||||||
|
! <color name="link_500">#ff00b0f4</color>
|
||||||
|
! <color name="link_600">#ff0078a6</color>
|
||||||
|
! <color name="link_700">#ff004662</color>
|
||||||
|
! <color name="link_800">#ff003549</color>
|
||||||
|
! <color name="link_900">#ff00090c</color>
|
||||||
|
<color name="material_blue_grey_800">#ff37474f</color>
|
||||||
|
<color name="material_blue_grey_900">#ff263238</color>
|
||||||
|
<color name="material_blue_grey_950">#ff21272b</color>
|
||||||
|
--- 104,118 ----
|
||||||
|
<color name="hypesquad_house2">#fff47b67</color>
|
||||||
|
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||||
|
<color name="league_of_legends">#ff021f25</color>
|
||||||
|
! <color name="link_100">#ff8cf687</color>
|
||||||
|
! <color name="link_200">#ff7df577</color>
|
||||||
|
! <color name="link_300">#ff6ef368</color>
|
||||||
|
! <color name="link_400">#ff5ff258</color>
|
||||||
|
! <color name="link_500">#ff50f148</color>
|
||||||
|
! <color name="link_600">#ff41f038</color>
|
||||||
|
! <color name="link_700">#ff32ef28</color>
|
||||||
|
! <color name="link_800">#ff23ed19</color>
|
||||||
|
! <color name="link_900">#ff1be411</color>
|
||||||
|
<color name="material_blue_grey_800">#ff37474f</color>
|
||||||
|
<color name="material_blue_grey_900">#ff263238</color>
|
||||||
|
<color name="material_blue_grey_950">#ff21272b</color>
|
||||||
|
***************
|
||||||
|
*** 151,165 ****
|
||||||
|
<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_30">#4d4f545c</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>
|
||||||
|
--- 151,165 ----
|
||||||
|
<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">#ff0f0f0f</color>
|
||||||
|
! <color name="primary_500_alpha_30">#4d0f0f0f</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">#ff292b2f</color>
|
||||||
|
<color name="primary_700">#ff202225</color>
|
||||||
|
<color name="primary_700_alpha_60">#99202225</color>
|
||||||
|
***************
|
||||||
|
*** 192,200 ****
|
||||||
|
<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>
|
||||||
|
--- 192,200 ----
|
||||||
|
<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>
|
||||||
|
diff -crB from/res/values/styles.xml to/res/values/styles.xml
|
||||||
|
*** from/res/values/styles.xml 2019-08-20 10:21:46.531142027 +0300
|
||||||
|
--- to/res/values/styles.xml 2019-08-20 10:24:10.795179358 +0300
|
||||||
|
***************
|
||||||
|
*** 114,120 ****
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
<item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
|
||||||
|
<item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
|
||||||
|
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||||
|
<item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
|
||||||
|
<item name="colorPrimaryTabs">@color/black_alpha_05</item>
|
||||||
|
<item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
|
||||||
|
--- 114,120 ----
|
||||||
|
<item name="colorPrimary">@color/primary_600</item>
|
||||||
|
<item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
|
||||||
|
<item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
|
||||||
|
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||||
|
<item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
|
||||||
|
<item name="colorPrimaryTabs">@color/black_alpha_05</item>
|
||||||
|
<item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
|
||||||
|
***************
|
||||||
|
*** 330,336 ****
|
||||||
|
<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/grey_channels</item>
|
||||||
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||||
|
--- 330,336 ----
|
||||||
|
<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/grey_channels</item>
|
||||||
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||||
|
***************
|
||||||
|
*** 344,355 ****
|
||||||
|
<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_input_text">@color/white_alpha_70</item>
|
||||||
|
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||||
|
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||||
|
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||||
|
<item name="theme_chat_name">@color/white</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>
|
||||||
|
--- 344,355 ----
|
||||||
|
<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_input_text">@color/white_alpha_70</item>
|
||||||
|
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</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_name">@color/white</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>
|
||||||
|
***************
|
||||||
|
*** 415,421 ****
|
||||||
|
<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>
|
||||||
|
--- 415,421 ----
|
||||||
|
<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>
|
||||||
|
***************
|
||||||
|
*** 441,447 ****
|
||||||
|
<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.Button.Red.Fit</item>
|
||||||
|
--- 441,447 ----
|
||||||
|
<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.Button.Red.Fit</item>
|
||||||
|
diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/app/AppActivity$d.smali
|
||||||
|
*** from/smali/com/discord/app/AppActivity$d.smali 2019-08-20 10:21:47.801147988 +0300
|
||||||
|
--- to/smali/com/discord/app/AppActivity$d.smali 2019-08-20 10:24:10.795179358 +0300
|
||||||
|
***************
|
||||||
|
*** 113,119 ****
|
||||||
|
|
||||||
|
check-cast v0, Landroid/app/Activity;
|
||||||
|
|
||||||
|
! const v1, 0x7f060136
|
||||||
|
|
||||||
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||||
|
|
||||||
|
--- 113,119 ----
|
||||||
|
|
||||||
|
check-cast v0, Landroid/app/Activity;
|
||||||
|
|
||||||
|
! const v1, 0x7f060021
|
||||||
|
|
||||||
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||||
|
|
|
@ -49,6 +49,7 @@ Self note: Top bar color is set by `setStatusBarColorResourceId`
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
#### Value reference
|
#### Value reference
|
||||||
|
|
||||||
|
|
22
patches/customversion/943.patch
Normal file
22
patches/customversion/943.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
diff -crB com.discord-943-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-943/smali/com/discord/widgets/settings/WidgetSettings.smali
|
||||||
|
*** com.discord-943-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-08-12 17:12:55.113715185 +0300
|
||||||
|
--- com.discord-943/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-08-12 19:58:08.291217836 +0300
|
||||||
|
***************
|
||||||
|
*** 1625,1631 ****
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, " - 9.4.3-SA (943)"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 1625,1631 ----
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, " - 9.4.3-SA (943), with Cutthecord patches"
|
||||||
|
|
||||||
|
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
Only in com.discord-943/smali/com/discord/widgets/settings: WidgetSettings.smali.orig
|
||||||
|
Only in com.discord-943/smali/com/discord/widgets/settings: WidgetSettings.smali.rej
|
|
@ -42,4 +42,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
20
patches/disable-mobileindicator/943.patch
Normal file
20
patches/disable-mobileindicator/943.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 2019-05-12 12:13:46.907829452 +0300
|
||||||
|
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2019-05-12 12:15:28.840480063 +0300
|
||||||
|
***************
|
||||||
|
*** 180,186 ****
|
||||||
|
|
||||||
|
const-string v1, "browser"
|
||||||
|
|
||||||
|
! const-string v2, "Discord Android"
|
||||||
|
|
||||||
|
.line 64
|
||||||
|
invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
|
||||||
|
--- 180,186 ----
|
||||||
|
|
||||||
|
const-string v1, "browser"
|
||||||
|
|
||||||
|
! const-string v2, "Discord Client"
|
||||||
|
|
||||||
|
.line 64
|
||||||
|
invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
|
|
@ -43,4 +43,5 @@ However, this causes some issues. See the `Bugs / Side effects` list below.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
182
patches/experiments/943.patch
Normal file
182
patches/experiments/943.patch
Normal file
|
@ -0,0 +1,182 @@
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-939/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-08-16 21:39:30.562937403 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-08-17 00:13:15.896483413 +0300
|
||||||
|
***************
|
||||||
|
*** 80,108 ****
|
||||||
|
|
||||||
|
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||||
|
.locals 1
|
||||||
|
-
|
||||||
|
- const-string v0, "meUser"
|
||||||
|
-
|
||||||
|
- .line 98
|
||||||
|
- invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(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
|
||||||
|
-
|
||||||
|
- return p1
|
||||||
|
-
|
||||||
|
- :cond_1
|
||||||
|
- :goto_0
|
||||||
|
const/4 p1, 0x1
|
||||||
|
|
||||||
|
return p1
|
||||||
|
--- 80,85 ----
|
||||||
|
Only in com.discord-939/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
|
||||||
|
Only in com.discord-939/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/stores/StoreExperiments.smali com.discord-939/smali/com/discord/stores/StoreExperiments.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/stores/StoreExperiments.smali 2019-08-16 21:39:30.566270755 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/stores/StoreExperiments.smali 2019-08-17 00:13:30.536572396 +0300
|
||||||
|
***************
|
||||||
|
*** 1236,1296 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isExperimentalAlpha()Z
|
||||||
|
! .locals 4
|
||||||
|
!
|
||||||
|
! .line 91
|
||||||
|
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||||
|
!
|
||||||
|
! const/4 v1, 0x1
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
|
||||||
|
!
|
||||||
|
! if-eqz v0, :cond_0
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result v0
|
||||||
|
!
|
||||||
|
! if-eq v0, v1, :cond_1
|
||||||
|
!
|
||||||
|
! :cond_0
|
||||||
|
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! iget-object v0, v0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
|
||||||
|
!
|
||||||
|
! const-string v2, "stream.guilds.guilds"
|
||||||
|
!
|
||||||
|
! invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! 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_2
|
||||||
|
!
|
||||||
|
! :cond_1
|
||||||
|
! return v1
|
||||||
|
!
|
||||||
|
! :cond_2
|
||||||
|
! const/4 v0, 0x0
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
--- 1236,1243 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public final isExperimentalAlpha()Z
|
||||||
|
! .locals 1
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
Only in com.discord-939/smali/com/discord/stores: StoreExperiments.smali.orig
|
||||||
|
Only in com.discord-939/smali/com/discord/stores: StoreExperiments.smali.rej
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-939/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-08-16 21:39:30.952939553 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-08-17 00:12:49.739657765 +0300
|
||||||
|
***************
|
||||||
|
*** 77,87 ****
|
||||||
|
const-string v0, "meUser"
|
||||||
|
|
||||||
|
.line 186
|
||||||
|
! invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result v2
|
||||||
|
|
||||||
|
const-string v1, "fontScale"
|
||||||
|
|
||||||
|
--- 77,83 ----
|
||||||
|
const-string v0, "meUser"
|
||||||
|
|
||||||
|
.line 186
|
||||||
|
! const/4 v2, 0x1
|
||||||
|
|
||||||
|
const-string v1, "fontScale"
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 95,105 ****
|
||||||
|
const-string p3, "isAlphaTesterOrStaff"
|
||||||
|
|
||||||
|
.line 188
|
||||||
|
! invoke-static {p4, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
|
||||||
|
!
|
||||||
|
! move-result v4
|
||||||
|
|
||||||
|
.line 189
|
||||||
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
--- 91,97 ----
|
||||||
|
const-string p3, "isAlphaTesterOrStaff"
|
||||||
|
|
||||||
|
.line 188
|
||||||
|
! const/4 v4, 0x1
|
||||||
|
|
||||||
|
.line 189
|
||||||
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-939/smali/com/discord/widgets/settings/WidgetSettings.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-08-16 21:39:30.956272904 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-08-17 00:12:49.739657765 +0300
|
||||||
|
***************
|
||||||
|
*** 888,896 ****
|
||||||
|
if-eqz p1, :cond_1
|
||||||
|
|
||||||
|
.line 118
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result v2
|
||||||
|
|
||||||
|
if-eq v2, v0, :cond_0
|
||||||
|
|
||||||
|
--- 888,894 ----
|
||||||
|
if-eqz p1, :cond_1
|
||||||
|
|
||||||
|
.line 118
|
||||||
|
! const/4 v2, 0x1
|
||||||
|
|
||||||
|
if-eq v2, v0, :cond_0
|
||||||
|
|
||||||
|
|
|
@ -46,4 +46,5 @@ This patch enables developer options (empty), mobile experiments (of which there
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
294
patches/litecord/943.patch
Normal file
294
patches/litecord/943.patch
Normal file
|
@ -0,0 +1,294 @@
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/app/App.smali com.discord-939/smali/com/discord/app/App.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/app/App.smali 2019-08-16 21:39:30.392936467 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/app/App.smali 2019-08-17 00:14:43.040346403 +0300
|
||||||
|
***************
|
||||||
|
*** 217,223 ****
|
||||||
|
|
||||||
|
invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 74
|
||||||
|
invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
|
||||||
|
--- 217,223 ----
|
||||||
|
|
||||||
|
invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 74
|
||||||
|
invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
|
||||||
|
Only in com.discord-939/smali/com/discord/app: App.smali.orig
|
||||||
|
Only in com.discord-939/smali/com/discord/app: App.smali.rej
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/BuildConfig.smali com.discord-939/smali/com/discord/BuildConfig.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/BuildConfig.smali 2019-08-16 21:39:30.389603115 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/BuildConfig.smali 2019-08-17 00:14:19.146867850 +0300
|
||||||
|
***************
|
||||||
|
*** 18,32 ****
|
||||||
|
|
||||||
|
.field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
|
||||||
|
|
||||||
|
! .field public static final HOST:Ljava/lang/String; = "https://discordapp.com"
|
||||||
|
|
||||||
|
! .field public static final HOST_API:Ljava/lang/String; = "https://discordapp.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_INVITE:Ljava/lang/String; = "https://discord.gg"
|
||||||
|
|
||||||
|
.field public static final LOCAL_IP:Ljava/lang/String; = ""
|
||||||
|
|
||||||
|
--- 18,32 ----
|
||||||
|
|
||||||
|
.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_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://discord.gift"
|
||||||
|
|
||||||
|
! .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-939/smali/com/discord: BuildConfig.smali.orig
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-939/smali/com/discord/gateway/GatewaySocket.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/gateway/GatewaySocket.smali 2019-08-16 21:39:30.419603280 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/gateway/GatewaySocket.smali 2019-08-17 00:14:19.150201204 +0300
|
||||||
|
***************
|
||||||
|
*** 42,48 ****
|
||||||
|
.end annotation
|
||||||
|
.end field
|
||||||
|
|
||||||
|
! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = "zlib-stream"
|
||||||
|
|
||||||
|
.field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
|
||||||
|
|
||||||
|
--- 42,48 ----
|
||||||
|
.end annotation
|
||||||
|
.end field
|
||||||
|
|
||||||
|
! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = ""
|
||||||
|
|
||||||
|
.field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1050,1056 ****
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 1050,1056 ----
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6"
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-939/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-08-16 21:39:30.422936632 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-08-17 00:14:19.150201204 +0300
|
||||||
|
***************
|
||||||
|
*** 59,64 ****
|
||||||
|
--- 59,66 ----
|
||||||
|
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
+ const/4 p3, 0x0
|
||||||
|
+
|
||||||
|
.line 27
|
||||||
|
invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||||
|
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-939/smali/com/discord/stores/StoreGatewayConnection.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/stores/StoreGatewayConnection.smali 2019-08-16 21:39:30.569604107 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/stores/StoreGatewayConnection.smali 2019-08-17 00:14:19.150201204 +0300
|
||||||
|
***************
|
||||||
|
*** 1337,1343 ****
|
||||||
|
|
||||||
|
check-cast v2, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
|
||||||
|
|
||||||
|
! const-string v3, "https://discordapp.com/api/"
|
||||||
|
|
||||||
|
invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
|
||||||
|
|
||||||
|
--- 1337,1343 ----
|
||||||
|
|
||||||
|
check-cast v2, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
|
||||||
|
|
||||||
|
! const-string v3, "https://dev.litecord.top/api/"
|
||||||
|
|
||||||
|
invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
|
||||||
|
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-939/smali/com/discord/utilities/icon/IconUtils.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/utilities/icon/IconUtils.smali 2019-08-16 21:39:30.666271306 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/utilities/icon/IconUtils.smali 2019-08-17 00:14:19.156867911 +0300
|
||||||
|
***************
|
||||||
|
*** 377,383 ****
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
:cond_1
|
||||||
|
! const-string p3, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 111
|
||||||
|
check-cast p3, Ljava/lang/CharSequence;
|
||||||
|
--- 377,383 ----
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
:cond_1
|
||||||
|
! const-string p3, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 111
|
||||||
|
check-cast p3, Ljava/lang/CharSequence;
|
||||||
|
***************
|
||||||
|
*** 425,431 ****
|
||||||
|
:cond_3
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com/channel-icons/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
--- 425,431 ----
|
||||||
|
:cond_3
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top/channel-icons/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 713,719 ****
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
:cond_0
|
||||||
|
! const-string p2, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 144
|
||||||
|
check-cast p2, Ljava/lang/CharSequence;
|
||||||
|
--- 713,719 ----
|
||||||
|
goto :goto_2
|
||||||
|
|
||||||
|
:cond_0
|
||||||
|
! const-string p2, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 144
|
||||||
|
check-cast p2, Ljava/lang/CharSequence;
|
||||||
|
***************
|
||||||
|
*** 790,796 ****
|
||||||
|
:goto_1
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com/icons/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
--- 790,796 ----
|
||||||
|
:goto_1
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top/icons/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1009,1015 ****
|
||||||
|
:cond_0
|
||||||
|
if-eqz p1, :cond_4
|
||||||
|
|
||||||
|
! const-string p2, "https://cdn.discordapp.com"
|
||||||
|
|
||||||
|
.line 90
|
||||||
|
check-cast p2, Ljava/lang/CharSequence;
|
||||||
|
--- 1009,1015 ----
|
||||||
|
:cond_0
|
||||||
|
if-eqz p1, :cond_4
|
||||||
|
|
||||||
|
! const-string p2, "https://dev.litecord.top"
|
||||||
|
|
||||||
|
.line 90
|
||||||
|
check-cast p2, Ljava/lang/CharSequence;
|
||||||
|
***************
|
||||||
|
*** 1076,1082 ****
|
||||||
|
:goto_1
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://cdn.discordapp.com/avatars/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
--- 1076,1082 ----
|
||||||
|
:goto_1
|
||||||
|
new-instance p3, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v0, "https://dev.litecord.top/avatars/"
|
||||||
|
|
||||||
|
invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2034,2040 ****
|
||||||
|
.line 186
|
||||||
|
new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v1, "https://cdn.discordapp.com/app-assets/"
|
||||||
|
|
||||||
|
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
--- 2034,2040 ----
|
||||||
|
.line 186
|
||||||
|
new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v1, "https://dev.litecord.top/app-assets/"
|
||||||
|
|
||||||
|
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
Only in com.discord-939/smali/com/discord/utilities/icon: IconUtils.smali.orig
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-939/smali/com/discord/utilities/rest/RestAPI$Companion.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-08-16 21:39:30.686271417 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-08-17 00:14:19.156867911 +0300
|
||||||
|
***************
|
||||||
|
*** 296,302 ****
|
||||||
|
|
||||||
|
check-cast v6, Lokhttp3/m;
|
||||||
|
|
||||||
|
! const-string v9, "https://discordapp.com/api/"
|
||||||
|
|
||||||
|
invoke-direct {v0, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
|
||||||
|
|
||||||
|
--- 296,302 ----
|
||||||
|
|
||||||
|
check-cast v6, Lokhttp3/m;
|
||||||
|
|
||||||
|
! const-string v9, "https://dev.litecord.top/api/"
|
||||||
|
|
||||||
|
invoke-direct {v0, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
|
||||||
|
|
||||||
|
diff -crB com.discord-939-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali com.discord-939/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
|
||||||
|
*** com.discord-939-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-08-16 21:39:30.822938836 +0300
|
||||||
|
--- com.discord-939/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-08-17 00:14:19.156867911 +0300
|
||||||
|
***************
|
||||||
|
*** 606,612 ****
|
||||||
|
.line 106
|
||||||
|
new-instance v1, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v6, "https://cdn.discordapp.com/app-icons/"
|
||||||
|
|
||||||
|
invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
--- 606,612 ----
|
||||||
|
.line 106
|
||||||
|
new-instance v1, Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string v6, "https://dev.litecord.top/app-icons/"
|
||||||
|
|
||||||
|
invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
|
||||||
|
|
|
@ -46,4 +46,5 @@ Please keep in mind that litecord is free (gratis and libre) software, provided
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
1907
patches/mutant/943.patch
Normal file
1907
patches/mutant/943.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -54,6 +54,7 @@ Various scripts are provided to help building of custom patches easier.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
#### Disclaimer
|
#### Disclaimer
|
||||||
|
|
||||||
|
|
14
patches/necessary/943.patch
Normal file
14
patches/necessary/943.patch
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
|
*** from/AndroidManifest.xml 2019-08-20 10:21:44.481132406 +0300
|
||||||
|
--- to/AndroidManifest.xml 2019-08-20 10:24:04.288479949 +0300
|
||||||
|
***************
|
||||||
|
*** 1,4 ****
|
||||||
|
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="28" platformBuildVersionName="9">
|
||||||
|
<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="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="943" platformBuildVersionName="9.4.3-SA">
|
||||||
|
<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/943.patch
Normal file
18
patches/noblocked/943.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
|
|
@ -37,4 +37,5 @@ This patch completely hides the "# Blocked Message(s)" thing.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
102
patches/nonearby/943.patch
Normal file
102
patches/nonearby/943.patch
Normal file
|
@ -0,0 +1,102 @@
|
||||||
|
diff -crB com.discord-912-base/smali/com/discord/widgets/friends/NearbyManager.smali com.discord-912/smali/com/discord/widgets/friends/NearbyManager.smali
|
||||||
|
*** com.discord-912-base/smali/com/discord/widgets/friends/NearbyManager.smali 2019-07-11 00:34:16.933041803 +0300
|
||||||
|
--- com.discord-912/smali/com/discord/widgets/friends/NearbyManager.smali 2019-07-11 14:23:20.195414030 +0300
|
||||||
|
***************
|
||||||
|
*** 438,509 ****
|
||||||
|
|
||||||
|
# virtual methods
|
||||||
|
.method public final activateNearby()V
|
||||||
|
! .locals 9
|
||||||
|
!
|
||||||
|
! .line 58
|
||||||
|
! iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
|
||||||
|
!
|
||||||
|
! if-nez v0, :cond_0
|
||||||
|
!
|
||||||
|
! return-void
|
||||||
|
!
|
||||||
|
! .line 59
|
||||||
|
! :cond_0
|
||||||
|
! iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
|
||||||
|
!
|
||||||
|
! if-nez v1, :cond_1
|
||||||
|
!
|
||||||
|
! return-void
|
||||||
|
!
|
||||||
|
! .line 60
|
||||||
|
! :cond_1
|
||||||
|
! iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
|
||||||
|
!
|
||||||
|
! if-nez v2, :cond_2
|
||||||
|
!
|
||||||
|
! return-void
|
||||||
|
!
|
||||||
|
! .line 61
|
||||||
|
! :cond_2
|
||||||
|
! iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
|
||||||
|
!
|
||||||
|
! if-nez v3, :cond_3
|
||||||
|
!
|
||||||
|
! return-void
|
||||||
|
!
|
||||||
|
! .line 62
|
||||||
|
! :cond_3
|
||||||
|
! iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
|
||||||
|
!
|
||||||
|
! if-nez v4, :cond_4
|
||||||
|
!
|
||||||
|
! return-void
|
||||||
|
!
|
||||||
|
! .line 64
|
||||||
|
! :cond_4
|
||||||
|
! 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;
|
||||||
|
!
|
||||||
|
! check-cast v8, Ljava/util/Collection;
|
||||||
|
!
|
||||||
|
! invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
||||||
|
!
|
||||||
|
! check-cast v7, Ljava/util/Set;
|
||||||
|
!
|
||||||
|
! 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 66
|
||||||
|
! 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 67
|
||||||
|
! 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;
|
||||||
|
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
--- 438,444 ----
|
||||||
|
|
||||||
|
# virtual methods
|
||||||
|
.method public final activateNearby()V
|
||||||
|
! .locals 0
|
||||||
|
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
***************
|
||||||
|
*** 603,614 ****
|
||||||
|
|
||||||
|
.method public final initialize(J)V
|
||||||
|
.locals 0
|
||||||
|
-
|
||||||
|
- .line 34
|
||||||
|
- invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V
|
||||||
|
-
|
||||||
|
- .line 35
|
||||||
|
- invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V
|
||||||
|
-
|
||||||
|
return-void
|
||||||
|
.end method
|
||||||
|
--- 538,542 ----
|
||||||
|
Only in com.discord-912/smali/com/discord/widgets/friends: NearbyManager.smali.orig
|
||||||
|
Only in com.discord-912/smali/com/discord/widgets/friends: NearbyManager.smali.rej
|
|
@ -40,4 +40,5 @@ This patch nulls a bunch of nearby friends features for privacy.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
55
patches/noprofilestrip/943.patch
Normal file
55
patches/noprofilestrip/943.patch
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
|
||||||
|
*** com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:39:18.242542912 +0300
|
||||||
|
--- com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:44:50.891235106 +0300
|
||||||
|
***************
|
||||||
|
*** 440,454 ****
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/widgets/user/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
|
||||||
|
!
|
||||||
|
! check-cast v4, Ljava/lang/CharSequence;
|
||||||
|
|
||||||
|
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
--- 440,446 ----
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! const-string v4, ""
|
||||||
|
|
||||||
|
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 457,471 ****
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/widgets/user/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
|
||||||
|
!
|
||||||
|
! check-cast p1, Ljava/lang/CharSequence;
|
||||||
|
|
||||||
|
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
--- 449,455 ----
|
||||||
|
|
||||||
|
move-result-object v2
|
||||||
|
|
||||||
|
! const-string p1, ""
|
||||||
|
|
||||||
|
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
|
||||||
|
|
||||||
|
Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.orig
|
||||||
|
Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.rej
|
|
@ -35,4 +35,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
64
patches/nospoiler/943.patch
Normal file
64
patches/nospoiler/943.patch
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
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 2019-08-12 17:12:54.490377695 +0300
|
||||||
|
--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2019-08-12 17:13:36.353988001 +0300
|
||||||
|
***************
|
||||||
|
*** 1904,1933 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public isSpoilerAttachment()Z
|
||||||
|
! .locals 2
|
||||||
|
!
|
||||||
|
! .line 135
|
||||||
|
! 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
|
||||||
|
!
|
||||||
|
! return v0
|
||||||
|
!
|
||||||
|
! :cond_0
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
return v0
|
||||||
|
--- 1904,1910 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public isSpoilerAttachment()Z
|
||||||
|
! .locals 0
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
return v0
|
||||||
|
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 2019-08-12 17:12:54.843713385 +0300
|
||||||
|
--- to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2019-08-12 17:13:36.353988001 +0300
|
||||||
|
***************
|
||||||
|
*** 205,212 ****
|
||||||
|
.method public final isRevealed()Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! .line 23
|
||||||
|
! iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
||||||
|
--- 205,211 ----
|
||||||
|
.method public final isRevealed()Z
|
||||||
|
.locals 1
|
||||||
|
|
||||||
|
! const/4 v0, 0x1
|
||||||
|
|
||||||
|
return v0
|
||||||
|
.end method
|
|
@ -37,4 +37,5 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
3036
patches/notrack/943.patch
Normal file
3036
patches/notrack/943.patch
Normal file
File diff suppressed because it is too large
Load diff
34
patches/nozlib/943.patch
Normal file
34
patches/nozlib/943.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 2019-03-08 15:11:35.438157262 +0300
|
||||||
|
--- to/smali/com/discord/gateway/GatewaySocket.smali 2019-03-08 16:16:06.511701594 +0300
|
||||||
|
***************
|
||||||
|
*** 1050,1056 ****
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
--- 1050,1056 ----
|
||||||
|
|
||||||
|
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
|
||||||
|
! const-string p1, "/?encoding=json&v=6"
|
||||||
|
|
||||||
|
invoke-virtual {v1, 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 2019-03-08 15:11:35.438157262 +0300
|
||||||
|
--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-03-08 16:16:06.511701594 +0300
|
||||||
|
***************
|
||||||
|
*** 59,64 ****
|
||||||
|
--- 59,66 ----
|
||||||
|
|
||||||
|
const/4 v0, 0x0
|
||||||
|
|
||||||
|
+ const/4 p3, 0x0
|
||||||
|
+
|
||||||
|
.line 27
|
||||||
|
invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||||
|
|
|
@ -40,4 +40,5 @@ This patch disables zlib-stream field on wss, making it easier to parse it.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
45
patches/pureevil/943.patch
Normal file
45
patches/pureevil/943.patch
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
diff -crB com.discord-938-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-938/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||||
|
*** com.discord-938-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-08-12 17:12:55.110381830 +0300
|
||||||
|
--- com.discord-938/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-08-12 19:09:49.705585102 +0300
|
||||||
|
***************
|
||||||
|
*** 77,87 ****
|
||||||
|
const-string v0, "meUser"
|
||||||
|
|
||||||
|
.line 186
|
||||||
|
! invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||||
|
!
|
||||||
|
! move-result v2
|
||||||
|
|
||||||
|
const-string v1, "fontScale"
|
||||||
|
|
||||||
|
--- 77,83 ----
|
||||||
|
const-string v0, "meUser"
|
||||||
|
|
||||||
|
.line 186
|
||||||
|
! const/4 v2, 0x1
|
||||||
|
|
||||||
|
const-string v1, "fontScale"
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 95,105 ****
|
||||||
|
const-string p3, "isAlphaTesterOrStaff"
|
||||||
|
|
||||||
|
.line 188
|
||||||
|
! invoke-static {p4, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
!
|
||||||
|
! invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
|
||||||
|
!
|
||||||
|
! move-result v4
|
||||||
|
|
||||||
|
.line 189
|
||||||
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
||||||
|
--- 91,97 ----
|
||||||
|
const-string p3, "isAlphaTesterOrStaff"
|
||||||
|
|
||||||
|
.line 188
|
||||||
|
! const/4 v4, 0x1
|
||||||
|
|
||||||
|
.line 189
|
||||||
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
|
|
@ -46,4 +46,5 @@ This patch enables the secret AMOLED theme (which is shit).
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
3119
patches/slashcommands/943.patch
Normal file
3119
patches/slashcommands/943.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -49,4 +49,5 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
190
patches/smalltime/943.patch
Normal file
190
patches/smalltime/943.patch
Normal file
|
@ -0,0 +1,190 @@
|
||||||
|
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||||
|
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||||
|
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||||
|
***************
|
||||||
|
*** 239,411 ****
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||||
|
! .locals 6
|
||||||
|
!
|
||||||
|
! .line 126
|
||||||
|
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||||
|
!
|
||||||
|
! move-result-wide v0
|
||||||
|
!
|
||||||
|
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||||
|
!
|
||||||
|
! move-result-object v0
|
||||||
|
!
|
||||||
|
! const/4 v1, 0x0
|
||||||
|
!
|
||||||
|
! const/16 v2, 0xb
|
||||||
|
!
|
||||||
|
! .line 128
|
||||||
|
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||||
|
!
|
||||||
|
! const/16 v2, 0xc
|
||||||
|
!
|
||||||
|
! .line 129
|
||||||
|
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||||
|
!
|
||||||
|
! const/16 v2, 0xd
|
||||||
|
!
|
||||||
|
! .line 130
|
||||||
|
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||||
|
!
|
||||||
|
! const/16 v2, 0xe
|
||||||
|
!
|
||||||
|
! .line 131
|
||||||
|
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||||
|
!
|
||||||
|
! .line 133
|
||||||
|
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||||
|
!
|
||||||
|
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||||
|
!
|
||||||
|
! move-result-object v1
|
||||||
|
!
|
||||||
|
! const-string v2, "en"
|
||||||
|
!
|
||||||
|
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||||
|
!
|
||||||
|
! move-result v1
|
||||||
|
!
|
||||||
|
! if-nez v1, :cond_1
|
||||||
|
!
|
||||||
|
! .line 136
|
||||||
|
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||||
|
!
|
||||||
|
! move-result-wide v1
|
||||||
|
!
|
||||||
|
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||||
|
!
|
||||||
|
! move-result-wide v3
|
||||||
|
!
|
||||||
|
! cmp-long v0, v1, v3
|
||||||
|
!
|
||||||
|
! if-lez v0, :cond_0
|
||||||
|
!
|
||||||
|
! .line 137
|
||||||
|
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- return-object p1
|
||||||
|
-
|
||||||
|
- .line 139
|
||||||
|
- :cond_0
|
||||||
|
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- return-object p1
|
||||||
|
-
|
||||||
|
- .line 143
|
||||||
|
- :cond_1
|
||||||
|
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||||
|
-
|
||||||
|
- move-result-wide v1
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||||
|
-
|
||||||
|
- move-result-wide v3
|
||||||
|
-
|
||||||
|
- cmp-long v5, v1, v3
|
||||||
|
-
|
||||||
|
- if-lez v5, :cond_2
|
||||||
|
-
|
||||||
|
- .line 144
|
||||||
|
- new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
-
|
||||||
|
- const-string v1, "Today at "
|
||||||
|
-
|
||||||
|
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
-
|
||||||
|
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- return-object p1
|
||||||
|
-
|
||||||
|
- :cond_2
|
||||||
|
- const/4 v1, 0x5
|
||||||
|
-
|
||||||
|
- const/4 v2, -0x1
|
||||||
|
-
|
||||||
|
- .line 147
|
||||||
|
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||||
|
-
|
||||||
|
- .line 149
|
||||||
|
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||||
|
-
|
||||||
|
- move-result-wide v1
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||||
|
-
|
||||||
|
- move-result-wide v3
|
||||||
|
-
|
||||||
|
- cmp-long v0, v1, v3
|
||||||
|
-
|
||||||
|
- if-lez v0, :cond_3
|
||||||
|
-
|
||||||
|
- .line 150
|
||||||
|
- new-instance v0, Ljava/lang/StringBuilder;
|
||||||
|
-
|
||||||
|
- const-string v1, "Yesterday at "
|
||||||
|
-
|
||||||
|
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||||
|
-
|
||||||
|
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||||
|
-
|
||||||
|
- move-result-object p1
|
||||||
|
-
|
||||||
|
- return-object p1
|
||||||
|
-
|
||||||
|
- .line 153
|
||||||
|
- :cond_3
|
||||||
|
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||||
|
-
|
||||||
|
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
-
|
||||||
|
move-result-object p1
|
||||||
|
|
||||||
|
return-object p1
|
||||||
|
--- 239,249 ----
|
||||||
|
.end method
|
||||||
|
|
||||||
|
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||||
|
! .locals 1
|
||||||
|
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||||
|
|
||||||
|
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||||
|
|
||||||
|
move-result-object p1
|
||||||
|
|
||||||
|
return-object p1
|
|
@ -37,4 +37,5 @@ This patch replaces the long time string with just a simple time string. This is
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
21
patches/squareavatars/943.patch
Normal file
21
patches/squareavatars/943.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
diff -crB from/res/values/styles.xml to/res/values/styles.xml
|
||||||
|
*** from/res/values/styles.xml 2019-08-20 10:21:46.531142027 +0300
|
||||||
|
--- to/res/values/styles.xml 2019-08-20 10:24:08.648501889 +0300
|
||||||
|
***************
|
||||||
|
*** 834,840 ****
|
||||||
|
<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>
|
||||||
|
--- 834,841 ----
|
||||||
|
<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>
|
|
@ -39,4 +39,5 @@ A very small amount of rounding is applied to make it look a little better.
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
||||||
|
|
33
patches/tokenlogin/943.patch
Normal file
33
patches/tokenlogin/943.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 2019-08-16 21:39:30.752938450 +0300
|
||||||
|
--- to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2019-08-16 21:39:57.229751022 +0300
|
||||||
|
***************
|
||||||
|
*** 943,948 ****
|
||||||
|
--- 943,969 ----
|
||||||
|
|
||||||
|
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
|
|
@ -16,3 +16,4 @@ This patch relies on some stuff I added with slashcommands, so please use that p
|
||||||
- 9.3.9
|
- 9.3.9
|
||||||
- 9.4.0
|
- 9.4.0
|
||||||
- 9.4.2-SA
|
- 9.4.2-SA
|
||||||
|
- 9.4.3-SA
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{"versionname": "9.4.2-SA", "versioncode": "942"}
|
{"versionname": "9.4.3-SA", "versioncode": "943"}
|
Reference in a new issue