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

Add 9.8.0 support

Browse source 
Untested, slashcommands miiight break.
This commit is contained in:
ave 2019-10-31 11:33:05 +03:00
parent 0c773d4daf
commit 0481c2149e
No known key found for this signature in database
GPG key ID: 09356ABAA42C842B
42 changed files with 9958 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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.7.0 (970), released on 2019-10-10. **Latest supported Discord Android version:** 9.8.0 (980), released on 2019-10-31.
New patch development will be done for the latest supported version. New patch development will be done for the latest supported version.

242
patches/branding/980.patch Normal file
View file

@ -0,0 +1,242 @@
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml 2019-10-31 11:16:39.576244857 +0300
--- to/AndroidManifest.xml 2019-10-31 11:16:41.239586999 +0300
***************
*** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="980" platformBuildVersionName="9.8.0">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- 1,4 ----
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="980CTCBUILD" platformBuildVersionName="9.8.0-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,30 ****
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
--- 19,30 ----
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
***************
*** 85,91 ****
<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"/>
--- 85,91 ----
<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"/>
***************
*** 115,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"/>
--- 115,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"/>
***************
*** 146,152 ****
<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">
--- 146,152 ----
<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">
***************
*** 157,163 ****
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
--- 157,163 ----
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
***************
*** 197,205 ****
</intent-filter>
</receiver>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
</manifest>
\ No newline at end of file
--- 197,205 ----
</intent-filter>
</receiver>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
</manifest>
\ No newline at end of file
diff -crB from/apktool.yml to/apktool.yml
*** from/apktool.yml 2019-10-31 11:15:19.115819149 +0300
--- to/apktool.yml 2019-10-31 11:16:41.239586999 +0300
***************
*** 181,185 ****
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
! versionCode: '980'
! versionName: 9.8.0
--- 181,185 ----
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
! versionCode: '980CTCBUILD'
! versionName: 9.8.0-cutthecord-CTCBUILD
diff -crB from/res/values/strings.xml to/res/values/strings.xml
*** from/res/values/strings.xml 2019-10-31 11:15:14.299127045 +0300
--- to/res/values/strings.xml 2019-10-31 11:16:41.239586999 +0300
***************
*** 1371,1377 ****
<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 &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
--- 1371,1377 ----
<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 &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
***************
*** 3300,3306 ****
<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>
--- 3300,3306 ----
<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>
***************
*** 4604,4610 ****
<string name="subscription_payment_legalese_yearly">"Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you yearly until you cancel the subscription. You can cancel anytime from your Settings page, though!"</string>
<string name="subscriptions_title">Subscriptions</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>
--- 4604,4610 ----
<string name="subscription_payment_legalese_yearly">"Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you yearly until you cancel the subscription. You can cancel anytime from your Settings page, though!"</string>
<string name="subscriptions_title">Subscriptions</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-10-31 11:15:16.465805154 +0300
--- to/smali/com/discord/app/e.smali 2019-10-31 11:16:41.239586999 +0300
***************
*** 56,62 ****
.line 17
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
! const-string v0, "https://support.discordapp.com"
.line 18
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
--- 56,62 ----
.line 17
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
! const-string v0, "https://gitdab.com/distok/cutthecord"
.line 18
sput-object v0, Lcom/discord/app/e;->va: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-10-31 11:15:16.829140406 +0300
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-31 11:16:41.239586999 +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;

1
patches/branding/README.md
View file

@ -67,4 +67,5 @@ You can use the following line to patch authorities:
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

78
patches/compact/980.patch Normal file
View 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-10-31 11:15:13.565789839 +0300
--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-31 11:16:43.746266942 +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-10-31 11:15:12.369116853 +0300
--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-31 11:16:43.746266942 +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-10-31 11:15:14.162459657 +0300
--- to/res/values/dimens.xml 2019-10-31 11:16:43.746266942 +0300
***************
*** 334,340 ****
<dimen name="uikit_btn_stroke_width">1.0dip</dimen>
<dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
<dimen name="uikit_elevation_low">4.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_stroke_width">1.0dip</dimen>
<dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
<dimen name="uikit_elevation_low">4.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>

1
patches/compact/README.md
View file

@ -51,4 +51,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

80
patches/customdefaultemoji/980.patch Normal file
View file

@ -0,0 +1,80 @@
diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali
*** from/smali/com/discord/stores/StoreEmoji.smali 2019-10-01 22:09:20.710656138 +0300
--- to/smali/com/discord/stores/StoreEmoji.smali 2019-10-01 22:10:14.464346867 +0300
***************
*** 100,136 ****
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
--- 100,136 ----
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

1
patches/customdefaultemoji/README.md
View file

@ -33,4 +33,5 @@ This patch changes default list of custom emojis.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

313
patches/customtheme/980.patch Normal file
View file

@ -0,0 +1,313 @@
diff -crB com.discord-980-base/res/drawable/drawable_overlay_channels_active.xml com.discord-980/res/drawable/drawable_overlay_channels_active.xml
*** com.discord-980-base/res/drawable/drawable_overlay_channels_active.xml 2019-10-31 11:15:12.435783871 +0300
--- com.discord-980/res/drawable/drawable_overlay_channels_active.xml 2019-10-31 11:28:16.199908598 +0300
***************
*** 3,9 ****
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="8.0dip" android:right="8.0dip">
<shape android:shape="rectangle">
! <solid android:color="@color/primary_500_alpha_60" />
<corners android:radius="4.0dip" />
</shape>
</item>
--- 3,9 ----
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="8.0dip" android:right="8.0dip">
<shape android:shape="rectangle">
! <solid android:color="@color/primary_700_alpha_60" />
<corners android:radius="4.0dip" />
</shape>
</item>
diff -crB com.discord-980-base/res/values/colors.xml com.discord-980/res/values/colors.xml
*** com.discord-980-base/res/values/colors.xml 2019-10-31 11:15:14.045792374 +0300
--- com.discord-980/res/values/colors.xml 2019-10-31 11:28:16.203241949 +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="color_clicked_darker">#40000000</color>
<color name="color_clicked_lighter">#40ffffff</color>
<color name="common_google_signin_btn_text_dark_default">@android:color/white</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="color_clicked_darker">#40000000</color>
<color name="color_clicked_lighter">#40ffffff</color>
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
***************
*** 61,68 ****
<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>
--- 61,68 ----
<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>
***************
*** 96,104 ****
<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>
--- 96,104 ----
<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>
***************
*** 106,120 ****
<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>
--- 106,120 ----
<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>
***************
*** 152,169 ****
<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>
<color name="primary_800">#ff18191c</color>
<color name="primary_800_alpha_60">#9918191c</color>
<color name="primary_800_alpha_90">#e618191c</color>
--- 152,169 ----
<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">#99404040</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">#ff0f0f0f</color>
! <color name="primary_700_alpha_60">#990f0f0f</color>
<color name="primary_800">#ff18191c</color>
<color name="primary_800_alpha_60">#9918191c</color>
<color name="primary_800_alpha_90">#e618191c</color>
***************
*** 193,201 ****
<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>
--- 193,201 ----
<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>
***************
*** 257,263 ****
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
! <color name="tooltip_background_dark">#e6616161</color>
<color name="tooltip_background_light">#e6ffffff</color>
<color name="transparent">@android:color/transparent</color>
<color name="twitch">#ff593695</color>
--- 257,263 ----
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
! <color name="tooltip_background_dark">#e6000000</color>
<color name="tooltip_background_light">#e6ffffff</color>
<color name="transparent">@android:color/transparent</color>
<color name="twitch">#ff593695</color>
Only in com.discord-980/res/values: colors.xml.orig
diff -crB com.discord-980-base/res/values/styles.xml com.discord-980/res/values/styles.xml
*** com.discord-980-base/res/values/styles.xml 2019-10-31 11:15:14.402460924 +0300
--- com.discord-980/res/values/styles.xml 2019-10-31 11:28:16.206575299 +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>
***************
*** 352,358 ****
<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>
--- 352,358 ----
<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>
***************
*** 366,377 ****
<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>
--- 366,377 ----
<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>
***************
*** 437,443 ****
<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>
--- 437,443 ----
<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>
***************
*** 464,470 ****
<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>
--- 464,470 ----
<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>
Only in com.discord-980/res/values: styles.xml.orig
diff -crB com.discord-980-base/smali/com/discord/app/AppActivity$d.smali com.discord-980/smali/com/discord/app/AppActivity$d.smali
*** com.discord-980-base/smali/com/discord/app/AppActivity$d.smali 2019-10-31 11:15:16.452471750 +0300
--- com.discord-980/smali/com/discord/app/AppActivity$d.smali 2019-10-31 11:28:28.556639362 +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
Only in com.discord-980/smali/com/discord/app: AppActivity$d.smali.orig
Only in com.discord-980/smali/com/discord/app: AppActivity$d.smali.rej

1
patches/customtheme/README.md
View file

@ -60,6 +60,7 @@ Self note: Top bar color is set by `setStatusBarColorResourceId`
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0
#### Value reference #### Value reference

20
patches/customversion/980.patch Normal file
View file

@ -0,0 +1,20 @@
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
*** from/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-10-01 22:09:21.347327038 +0300
--- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-10-01 22:10:18.231038578 +0300
***************
*** 1657,1663 ****
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string v0, " - 9.8.0 (980)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 1657,1663 ----
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
! const-string v0, " - 9.8.0 (980), with Cutthecord patches"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

1
patches/customversion/README.md
View file

@ -54,4 +54,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

20
patches/disable-mobileindicator/980.patch Normal file
View 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-10-01 22:09:20.860657135 +0300
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2019-10-01 22:10:06.937630156 +0300
***************
*** 179,185 ****
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;
--- 179,185 ----
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;

1
patches/disable-mobileindicator/README.md
View file

@ -55,4 +55,5 @@ However, this causes some issues. See the `Bugs / Side effects` list below.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

203
patches/experiments/980.patch Normal file
View file

@ -0,0 +1,203 @@
diff -crB com.discord-970-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-970/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** com.discord-970-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-10-10 08:36:54.103717996 +0300
--- com.discord-970/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-10-10 08:41:41.812866892 +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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
-
- move-result p1
-
- if-nez p1, :cond_1
-
- if-eqz p2, :cond_0
-
- goto :goto_0
-
- :cond_0
- const/4 p1, 0x0
-
- return p1
-
- :cond_1
- :goto_0
const/4 p1, 0x1
return p1
--- 80,85 ----
Only in com.discord-970/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
Only in com.discord-970/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
diff -crB com.discord-970-base/smali/com/discord/stores/StoreExperiments.smali com.discord-970/smali/com/discord/stores/StoreExperiments.smali
*** com.discord-970-base/smali/com/discord/stores/StoreExperiments.smali 2019-10-10 08:36:54.103717996 +0300
--- com.discord-970/smali/com/discord/stores/StoreExperiments.smali 2019-10-10 08:40:41.472548302 +0300
***************
*** 1245,1305 ****
.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/l;->checkExpressionValueIsNotNull(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
--- 1245,1252 ----
.end method
.method public final isExperimentalAlpha()Z
! .locals 1
! const/4 v0, 0x1
return v0
.end method
Only in com.discord-970/smali/com/discord/stores: StoreExperiments.smali.orig
Only in com.discord-970/smali/com/discord/stores: StoreExperiments.smali.rej
diff -crB com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:36:54.540387242 +0300
--- com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:41:26.909451124 +0300
***************
*** 77,87 ****
const-string v0, "meUser"
.line 186
! invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig
Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej
diff -crB com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-970/smali/com/discord/widgets/settings/WidgetSettings.smali
*** com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-10-10 08:36:54.547053948 +0300
--- com.discord-970/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-10-10 08:40:24.925796122 +0300
***************
*** 877,885 ****
if-eqz p1, :cond_1
.line 133
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
!
! move-result v2
if-eq v2, v0, :cond_0
--- 877,883 ----
if-eqz p1, :cond_1
.line 133
! const/4 v2, 0x1
if-eq v2, v0, :cond_0
***************
*** 898,906 ****
if-eqz p1, :cond_2
.line 134
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
!
! move-result v3
if-ne v3, v0, :cond_2
--- 896,902 ----
if-eqz p1, :cond_2
.line 134
! const/4 v3, 0x1
if-ne v3, v0, :cond_2

1
patches/experiments/README.md
View file

@ -58,4 +58,5 @@ This patch enables developer options (empty), mobile experiments (of which there
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

330
patches/litecord/980.patch Normal file
View file

@ -0,0 +1,330 @@
diff -crB com.discord-980-base/smali/com/discord/app/App.smali com.discord-980/smali/com/discord/app/App.smali
*** com.discord-980-base/smali/com/discord/app/App.smali 2019-10-31 11:15:16.449138399 +0300
--- com.discord-980/smali/com/discord/app/App.smali 2019-10-31 11:22:19.374711135 +0300
***************
*** 227,233 ****
invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
! const-string v1, "https://cdn.discordapp.com"
.line 75
invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
--- 227,233 ----
invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lcom/discord/utilities/logging/Logger;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
! const-string v1, "https://dev.litecord.top"
.line 75
invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
diff -crB com.discord-980-base/smali/com/discord/BuildConfig.smali com.discord-980/smali/com/discord/BuildConfig.smali
*** com.discord-980-base/smali/com/discord/BuildConfig.smali 2019-10-31 11:15:16.449138399 +0300
--- com.discord-980/smali/com/discord/BuildConfig.smali 2019-10-31 11:22:19.374711135 +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; = ""
diff -crB com.discord-980-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-980/smali/com/discord/gateway/GatewaySocket.smali
*** com.discord-980-base/smali/com/discord/gateway/GatewaySocket.smali 2019-10-31 11:15:16.495805313 +0300
--- com.discord-980/smali/com/discord/gateway/GatewaySocket.smali 2019-10-31 11:22:34.858126471 +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"
***************
*** 1054,1060 ****
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;
--- 1054,1060 ----
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;
Only in com.discord-980/smali/com/discord/gateway: GatewaySocket.smali.orig
Only in com.discord-980/smali/com/discord/gateway: GatewaySocket.smali.rej
diff -crB com.discord-980-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-980/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
*** com.discord-980-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-10-31 11:15:16.505805365 +0300
--- com.discord-980/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-10-31 11:22:19.374711135 +0300
***************
*** 66,71 ****
--- 66,73 ----
iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->large_threshold:I
+ const/4 p3, 0x0
+
iput-boolean p3, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->compress:Z
iput-object p4, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->properties:Ljava/util/Map;
diff -crB com.discord-980-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-980/smali/com/discord/stores/StoreGatewayConnection.smali
*** com.discord-980-base/smali/com/discord/stores/StoreGatewayConnection.smali 2019-10-31 11:15:16.702473070 +0300
--- com.discord-980/smali/com/discord/stores/StoreGatewayConnection.smali 2019-10-31 11:22:19.374711135 +0300
***************
*** 1313,1319 ****
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
--- 1313,1319 ----
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
Only in com.discord-980/smali/com/discord/stores: StoreGatewayConnection.smali.orig
diff -crB com.discord-980-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-980/smali/com/discord/utilities/icon/IconUtils.smali
*** com.discord-980-base/smali/com/discord/utilities/icon/IconUtils.smali 2019-10-31 11:15:16.882474021 +0300
--- com.discord-980/smali/com/discord/utilities/icon/IconUtils.smali 2019-10-31 11:23:17.975021487 +0300
***************
*** 448,454 ****
goto :goto_2
:cond_1
! const-string p3, "https://cdn.discordapp.com"
.line 117
check-cast p3, Ljava/lang/CharSequence;
--- 448,454 ----
goto :goto_2
:cond_1
! const-string p3, "https://dev.litecord.top"
.line 117
check-cast p3, Ljava/lang/CharSequence;
***************
*** 496,502 ****
: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
--- 496,502 ----
: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
***************
*** 816,822 ****
goto :goto_2
:cond_0
! const-string p2, "https://cdn.discordapp.com"
.line 151
check-cast p2, Ljava/lang/CharSequence;
--- 816,822 ----
goto :goto_2
:cond_0
! const-string p2, "https://dev.litecord.top"
.line 151
check-cast p2, Ljava/lang/CharSequence;
***************
*** 896,902 ****
: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
--- 896,902 ----
: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
***************
*** 1115,1121 ****
:cond_0
if-eqz p1, :cond_4
! const-string p2, "https://cdn.discordapp.com"
.line 96
check-cast p2, Ljava/lang/CharSequence;
--- 1115,1121 ----
:cond_0
if-eqz p1, :cond_4
! const-string p2, "https://dev.litecord.top"
.line 96
check-cast p2, Ljava/lang/CharSequence;
***************
*** 1186,1192 ****
: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
--- 1186,1192 ----
: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
***************
*** 1995,2001 ****
.line 215
new-instance v0, Ljava/lang/StringBuilder;
! const-string v1, "https://cdn.discordapp.com/app-icons/"
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
--- 1995,2001 ----
.line 215
new-instance v0, Ljava/lang/StringBuilder;
! const-string v1, "https://dev.litecord.top/app-icons/"
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
***************
*** 2111,2117 ****
.line 194
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
--- 2111,2117 ----
.line 194
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
***************
*** 2520,2526 ****
.line 211
new-instance v0, Ljava/lang/StringBuilder;
! const-string v1, "https://cdn.discordapp.com/app-icons/"
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
--- 2520,2526 ----
.line 211
new-instance v0, Ljava/lang/StringBuilder;
! const-string v1, "https://dev.litecord.top/app-icons/"
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
diff -crB com.discord-980-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-980/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** com.discord-980-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-10-31 11:15:16.919140882 +0300
--- com.discord-980/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-10-31 11:22:19.378044486 +0300
***************
*** 283,289 ****
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
--- 283,289 ----
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
Only in com.discord-980/smali/com/discord/utilities/rest: RestAPI$Companion.smali.orig
diff -crB com.discord-980-base/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali com.discord-980/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
*** com.discord-980-base/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali 2019-10-31 11:15:17.162475500 +0300
--- com.discord-980/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali 2019-10-31 11:23:37.748459542 +0300
***************
*** 749,755 ****
.line 100
new-instance v3, Ljava/lang/StringBuilder;
! const-string v4, "https://cdn.discordapp.com/app-icons/"
invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
--- 749,755 ----
.line 100
new-instance v3, Ljava/lang/StringBuilder;
! const-string v4, "https://dev.litecord.top/app-icons/"
invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
Only in com.discord-980/smali/com/discord/widgets/chat/list: WidgetChatListAdapterItemGameInvite.smali.orig
Only in com.discord-980/smali/com/discord/widgets/chat/list: WidgetChatListAdapterItemGameInvite.smali.rej

1
patches/litecord/README.md
View file

@ -58,4 +58,5 @@ Please keep in mind that litecord is free (gratis and libre) software, provided
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

1909
patches/mutant/980.patch Normal file
View file

File diff suppressed because it is too large Load diff

1
patches/mutant/README.md
View file

@ -66,6 +66,7 @@ Various scripts are provided to help building of custom patches easier.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0
#### Disclaimer #### Disclaimer

14
patches/necessary/980.patch Normal file
View file

@ -0,0 +1,14 @@
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml 2019-10-31 11:15:11.642446348 +0300
--- to/AndroidManifest.xml 2019-10-31 11:16:38.882907852 +0300
***************
*** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="29" platformBuildVersionName="10">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- 1,4 ----
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="980" platformBuildVersionName="9.8.0">
<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/980.patch Normal file
View 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

1
patches/noblocked/README.md
View file

@ -49,4 +49,5 @@ This patch completely hides the "# Blocked Message(s)" thing.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

100
patches/nonearby/980.patch Normal file
View file

@ -0,0 +1,100 @@
diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali
*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2019-10-01 22:09:21.200659396 +0300
--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2019-10-01 22:10:03.627608148 +0300
***************
*** 443,514 ****
# 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
--- 443,449 ----
# virtual methods
.method public final activateNearby()V
! .locals 0
return-void
.end method
***************
*** 608,619 ****
.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
--- 543,547 ----

1
patches/nonearby/README.md
View file

@ -52,4 +52,5 @@ This patch nulls a bunch of nearby friends features for privacy.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

53
patches/noprofilestrip/980.patch Normal file
View file

@ -0,0 +1,53 @@
diff -crB from/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
*** from/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2019-10-31 11:15:17.549144208 +0300
--- to/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2019-10-31 11:16:48.319624496 +0300
***************
*** 422,436 ****
move-result-object v2
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
!
! move-result-object v4
!
! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
!
! move-result-object v4
!
! check-cast v4, Ljava/lang/CharSequence;
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
--- 422,428 ----
move-result-object v2
! const-string v4, ""
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
***************
*** 439,453 ****
move-result-object v2
! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
!
! move-result-object p1
!
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
!
! move-result-object p1
!
! check-cast p1, Ljava/lang/CharSequence;
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
--- 431,437 ----
move-result-object v2
! const-string p1, ""
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V

1
patches/noprofilestrip/README.md
View file

@ -46,4 +46,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

64
patches/nospoiler/980.patch Normal file
View 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-10-01 22:09:20.587321985 +0300
--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2019-10-01 22:10:10.570987647 +0300
***************
*** 1897,1926 ****
.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
--- 1897,1903 ----
.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-10-01 22:09:20.983991289 +0300
--- to/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali 2019-10-01 22:10:10.570987647 +0300
***************
*** 204,211 ****
.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
--- 204,210 ----
.method public final isRevealed()Z
.locals 1
! const/4 v0, 0x1
return v0
.end method

1
patches/nospoiler/README.md
View file

@ -49,4 +49,5 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

2786
patches/notrack/980.patch Normal file
View file

File diff suppressed because it is too large Load diff

37
patches/nozlib/980.patch Normal file
View file

@ -0,0 +1,37 @@
diff -crB com.discord-980-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-980/smali/com/discord/gateway/GatewaySocket.smali
*** com.discord-980-base/smali/com/discord/gateway/GatewaySocket.smali 2019-10-31 11:15:16.495805313 +0300
--- com.discord-980/smali/com/discord/gateway/GatewaySocket.smali 2019-10-31 11:19:01.880331853 +0300
***************
*** 1054,1060 ****
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;
--- 1054,1060 ----
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;
Only in com.discord-980/smali/com/discord/gateway: GatewaySocket.smali.orig
Only in com.discord-980/smali/com/discord/gateway: GatewaySocket.smali.rej
diff -crB com.discord-980-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-980/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
*** com.discord-980-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-10-31 11:15:16.505805365 +0300
--- com.discord-980/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-10-31 11:18:39.126878014 +0300
***************
*** 66,71 ****
--- 66,73 ----
iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->large_threshold:I
+ const/4 p3, 0x0
+
iput-boolean p3, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->compress:Z
iput-object p4, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->properties:Ljava/util/Map;

1
patches/nozlib/README.md
View file

@ -52,4 +52,5 @@ This patch disables zlib-stream field on wss, making it easier to parse it.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

48
patches/pureevil/980.patch Normal file
View file

@ -0,0 +1,48 @@
diff -crB com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:36:54.540387242 +0300
--- com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:53:49.152282087 +0300
***************
*** 77,87 ****
const-string v0, "meUser"
.line 186
! invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig
Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej

1
patches/pureevil/README.md
View file

@ -58,4 +58,5 @@ This patch enables the secret AMOLED theme (which is shit).
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

3378
patches/slashcommands/980.patch Normal file
View file

File diff suppressed because it is too large Load diff

1
patches/slashcommands/README.md
View file

@ -63,4 +63,5 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

190
patches/smalltime/980.patch Normal file
View 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

1
patches/smalltime/README.md
View file

@ -49,4 +49,5 @@ This patch replaces the long time string with just a simple time string. This is
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

21
patches/squareavatars/980.patch Normal file
View file

@ -0,0 +1,21 @@
diff -crB from/res/values/styles.xml to/res/values/styles.xml
*** from/res/values/styles.xml 2019-10-31 11:15:14.402460924 +0300
--- to/res/values/styles.xml 2019-10-31 11:16:45.999612209 +0300
***************
*** 884,890 ****
<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>
--- 884,891 ----
<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>

1
patches/squareavatars/README.md
View file

@ -51,4 +51,5 @@ A very small amount of rounding is applied to make it look a little better.
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

33
patches/tokenlogin/980.patch Normal file
View 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-10-01 22:09:21.033991621 +0300
--- to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali 2019-10-01 22:10:29.801115506 +0300
***************
*** 927,932 ****
--- 927,953 ----
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

1
patches/tokenlogin/README.md
View file

@ -28,3 +28,4 @@ This patch relies on some stuff I added with slashcommands, so please use that p
- 9.6.7 - 9.6.7
- 9.6.8 - 9.6.8
- 9.7.0 - 9.7.0
- 9.8.0

2
patchport-state.json
View file

@ -1 +1 @@
{"versionname": "9.7.0", "versioncode": "970"} {"versionname": "9.8.0", "versioncode": "980"}