88.3 - Alpha (88203)

README.md

@@ -2,7 +2,7 @@
 
 Modular Client Mod for Discord's Android app.
 
-**Latest supported Discord Android version:** 88.2 - Alpha (88202), released on 2021-08-11.
+**Latest supported Discord Android version:** 88.3 - Alpha (88203), released on 2021-08-12.
 
 New patch development will be done for the latest supported version.
 

patches/betterdmheader/88203.patch

@@ -0,0 +1,68 @@
+diff --color -crB com.discord-base/res/menu/menu_chat_toolbar.xml com.discord/res/menu/menu_chat_toolbar.xml
+*** com.discord-base/res/menu/menu_chat_toolbar.xml	2021-06-03 15:00:13.923995379 +0000
+--- com.discord/res/menu/menu_chat_toolbar.xml	2021-06-03 15:06:45.358117680 +0000
+***************
+*** 1,12 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <menu
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+!     <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
+!     <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
+      <item android:id="@id/menu_chat_thread_browser" android:visible="false" app:actionLayout="@layout/icon_thread_browser_layout" app:showAsAction="ifRoom" />
+!     <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
+! </menu>
+\ No newline at end of file
+--- 1,12 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <menu
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+!     <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
+      <item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
+!     <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
+      <item android:id="@id/menu_chat_thread_browser" android:visible="false" app:actionLayout="@layout/icon_thread_browser_layout" app:showAsAction="ifRoom" />
+!     <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
+      <item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
+! </menu>
+diff -crB com.discord-base/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali com.discord/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
+*** com.discord-base/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2021-06-03 15:00:16.264008075 +0000
+--- com.discord/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2021-06-03 15:12:19.415927487 +0000
+***************
+*** 181,187 ****
+  
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 181,187 ----
+  
+      invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 7
+      invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+***************
+*** 260,266 ****
+  
+      xor-int/2addr v4, v2
+  
+!     invoke-interface {v3, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 13
+      invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 260,266 ----
+  
+      xor-int/2addr v4, v2
+  
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 13
+      invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;

patches/betterdmheader/README.md

@@ -40,3 +40,4 @@ This patch replaces the call button on DM headers with search button. The call b
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patches/branding/88203.patch

@@ -0,0 +1,225 @@
+diff --color -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml
+*** com.discord-base/AndroidManifest.xml	2021-06-01 20:30:56.781349523 +0000
+--- com.discord/AndroidManifest.xml	2021-06-01 20:38:49.344651420 +0000
+***************
+*** 1,4 ****
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+      <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="30" android:compileSdkVersionCodename="11" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="88203" platformBuildVersionName="88.3">
+      <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"/>
+***************
+*** 22,28 ****
+      <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+      <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+      <uses-permission android:name="android.permission.READ_CONTACTS"/>
+!     <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-feature android:name="android.hardware.camera.any" android:required="false"/>
+      <queries>
+          <package android:name="com.samsung.android.game.gametools"/>
+--- 22,28 ----
+      <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+      <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+      <uses-permission android:name="android.permission.READ_CONTACTS"/>
+!     <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-feature android:name="android.hardware.camera.any" android:required="false"/>
+      <queries>
+          <package android:name="com.samsung.android.game.gametools"/>
+***************
+*** 35,41 ****
+      <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"/>
+!     <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <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">
+--- 35,41 ----
+      <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"/>
+!     <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square_canary" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:supportsRtl="true" android:theme="@style/AppTheme.Dark">
+          <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">
+***************
+*** 143,149 ****
+                  <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"/>
+--- 143,149 ----
+                  <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.CTCBRANCH.permission.CONNECT">
+              <intent-filter>
+                  <action android:name="com.discord.intent.action.CONNECT"/>
+                  <data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
+***************
+*** 166,172 ****
+              </intent-filter>
+          </receiver>
+          <service android:foregroundServiceType="mediaProjection" 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"/>
+--- 166,172 ----
+              </intent-filter>
+          </receiver>
+          <service android:foregroundServiceType="mediaProjection" 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"/>
+***************
+*** 210,218 ****
+          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
+          <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"/>
+!         <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <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"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
+--- 210,218 ----
+          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
+          <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"/>
+!         <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <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"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
+***************
+*** 267,270 ****
+          <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:exported="false" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
+      </application>
+! </manifest>
+\ No newline at end of file
+--- 267,270 ----
+          <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:exported="false" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
+      </application>
+! </manifest>
+diff --color -crB com.discord-base/apktool.yml com.discord/apktool.yml
+*** com.discord-base/apktool.yml	2021-06-01 17:16:48.545258394 +0000
+--- com.discord/apktool.yml	2021-06-01 21:07:32.119096655 +0000
+***************
+*** 1,5 ****
+  !!brut.androlib.meta.MetaInfo
+! apkFileName: com.discord-88203.apk
+  compressionType: false
+  doNotCompress:
+  - resources.arsc
+--- 1,5 ----
+  !!brut.androlib.meta.MetaInfo
+! apkFileName: com.cutthecord.CTCBRANCH-88203.apk
+  compressionType: false
+  doNotCompress:
+  - resources.arsc
+diff --color -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml
+*** com.discord-base/res/values/strings.xml	2021-06-01 17:16:48.953260531 +0000
+--- com.discord/res/values/strings.xml	2021-06-01 21:46:44.631007562 +0000
+***************
+*** 2133,2139 ****
+      <string name="disconnect_other">Disconnect</string>
+      <string name="disconnect_self">Disconnect</string>
+      <string name="disconnect_user_success">User has been disconnected from voice.</string>
+!     <string name="discord">Discord-Canary</string>
+      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
+      <string name="discord_desc_short">Imagine a place</string>
+      <string name="discord_gg">discord.gg/</string>
+--- 2133,2139 ----
+      <string name="disconnect_other">Disconnect</string>
+      <string name="disconnect_self">Disconnect</string>
+      <string name="disconnect_user_success">User has been disconnected from voice.</string>
+!     <string name="discord">CTCNAME</string>
+      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
+      <string name="discord_desc_short">Imagine a place</string>
+      <string name="discord_gg">discord.gg/</string>
+***************
+*** 5899,5905 ****
+      <string name="notification_reply_failed">Failed to reply to {recipient}</string>
+      <string name="notification_reply_success">Replied to {recipient}</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">Discord</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="notifications_muted">Notifications, muted</string>
+--- 5899,5905 ----
+      <string name="notification_reply_failed">Failed to reply to {recipient}</string>
+      <string name="notification_reply_success">Replied to {recipient}</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">CTCNAME</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="notifications_muted">Notifications, muted</string>
+***************
+*** 8158,8164 ****
+      <string name="suggested_friends_list_header">Suggested Friends</string>
+      <string name="suggested_languages">Suggested languages</string>
+!     <string name="suggestions">Suggestions</string>
+      <string name="summary_collapsed_preference_list">%1$s, %2$s</string>
+      <string name="support">Support</string>
+      <string name="suppress_all_embeds">Remove all embeds</string>
+      <string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
+--- 8158,8164 ----
+      <string name="suggested_friends_list_header">Suggested Friends</string>
+      <string name="suggested_languages">Suggested languages</string>
+!     <string name="suggestions">Gitlab Repo</string>
+      <string name="summary_collapsed_preference_list">%1$s, %2$s</string>
+      <string name="support">Support</string>
+      <string name="suppress_all_embeds">Remove all embeds</string>
+      <string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
+diff --color -crB com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
+*** com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2021-06-01 17:16:49.173261683 +0000
+--- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2021-06-01 21:50:33.255916346 +0000
+***************
+*** 104,110 ****
+      .line 3
+      new-instance v0, Landroid/content/Intent;
+  
+!     const-string v1, "https://discord.com/app"
+  
+      .line 4
+      invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+--- 104,110 ----
+      .line 3
+      new-instance v0, Landroid/content/Intent;
+  
+!     const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
+  
+      .line 4
+      invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+diff --color -crB com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali
+*** com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali	2021-06-01 17:16:49.461263192 +0000
+--- com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali	2021-06-01 21:59:39.038419446 +0000
+***************
+*** 89,95 ****
+  
+      invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     const-string v2, "https://support.discord.com"
+  
+      const/4 v3, 0x0
+  
+--- 89,95 ----
+  
+      invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     const-string v2, "https://git.46620.moe/femboy-apps/discord/cutthecord"
+  
+      const/4 v3, 0x0
+  

patches/branding/README.md

@@ -54,3 +54,4 @@ You can use the following line to patch authorities:
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patches/customversion/88203.patch

@@ -0,0 +1,20 @@
+diff --color -crB com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali	2021-06-03 15:00:16.364008616 +0000
+--- com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali	2021-06-03 15:14:42.460701540 +0000
+***************
+*** 785,791 ****
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v1, " - 88.3 - Alpha (88203)"
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 785,791 ----
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v1, " - 99.99.99 (88203 - Alpha), made with love"
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  

patches/customversion/README.md

@@ -40,3 +40,4 @@ This patch replaces version string and adds mention of cutthecord in the user se
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patches/disable-mobileindicator/88203.patch

@@ -0,0 +1,92 @@
+diff --color -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2021-06-01 17:16:49.169261662 +0000
+--- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2021-06-01 22:16:21.775478972 +0000
+***************
+*** 444,514 ****
+  .end method
+  
+  .method private final setSuperProperties(Ljava/util/Map;)V
+!     .locals 3
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+! 
+!     sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
+! 
+!     sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+! 
+!     const/4 v2, 0x0
+! 
+!     aget-object v1, v1, v2
+! 
+!     invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+  
+      return-void
+  .end method
+  
+  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
+!     .locals 1
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+! 
+!     monitor-enter p0
+! 
+!     .line 1
+!     :try_start_0
+!     invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
+! 
+!     move-result-object v0
+! 
+!     invoke-static {v0, p1}, Ld0/t/h0;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+! 
+!     move-result-object p1
+! 
+!     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
+!     :try_end_0
+!     .catchall {:try_start_0 .. :try_end_0} :catchall_0
+! 
+!     .line 2
+!     monitor-exit p0
+  
+      return-void
+- 
+-     :catchall_0
+-     move-exception p1
+- 
+-     monitor-exit p0
+- 
+-     throw p1
+  .end method
+  
+  
+--- 444,458 ----
+  .end method
+  
+  .method private final setSuperProperties(Ljava/util/Map;)V
+!     .locals 0
+  
+      return-void
+  .end method
+  
+  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
+!     .locals 0
+  
+      return-void
+  .end method
+  
+  

patches/disable-mobileindicator/README.md

@@ -25,3 +25,4 @@ Between 8.3.0 and 33.1: This patch replaces the browser name from "Discord Andro
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patches/noblocked/88203.patch

@@ -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

patches/noblocked/README.md

@@ -38,3 +38,4 @@ This patch completely hides the "# Blocked Message(s)" thing.
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patches/squareavatars/88203.patch

@@ -0,0 +1,42 @@
+diff --color -crB com.discord-base/res/values/dimens.xml com.discord-mod/res/values/dimens.xml
+*** com.discord-base/res/values/dimens.xml	2021-06-01 17:16:48.949260510 +0000
+--- com.discord/res/values/dimens.xml	2021-06-01 22:31:55.552836411 +0000
+***************
+*** 262,268 ****
+      <dimen name="folder_guild_outer_margin">6.0dip</dimen>
+      <dimen name="folder_guild_size">16.0dip</dimen>
+      <dimen name="grid_item_padding">4.0dip</dimen>
+!     <dimen name="guild_icon_radius">12.0dip</dimen>
+      <dimen name="guild_item_size">54.0dip</dimen>
+      <dimen name="guild_item_spacing">6.0dip</dimen>
+      <dimen name="guild_list_size">72.0dip</dimen>
+--- 262,268 ----
+      <dimen name="folder_guild_outer_margin">6.0dip</dimen>
+      <dimen name="folder_guild_size">16.0dip</dimen>
+      <dimen name="grid_item_padding">4.0dip</dimen>
+!     <dimen name="guild_icon_radius">0.0dip</dimen>
+      <dimen name="guild_item_size">54.0dip</dimen>
+      <dimen name="guild_item_spacing">6.0dip</dimen>
+      <dimen name="guild_list_size">72.0dip</dimen>
+diff --color -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml
+*** com.discord-base/res/values/styles.xml	2021-06-01 17:16:48.953260531 +0000
+--- com.discord/res/values/styles.xml	2021-06-01 22:36:04.570193047 +0000
+***************
+*** 1135,1141 ****
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">?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>
+--- 1135,1142 ----
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">?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>
+

patches/squareavatars/README.md

@@ -40,3 +40,4 @@ A very small amount of rounding is applied to make it look a little better.
 - 87.2 - Alpha
 - 87.3 - Alpha
 - 88.2 - Alpha
+- 88.3 - Alpha

patchport-state.json

@@ -1 +1 @@
-{"versionname": "88.2 - Alpha", "versioncode": "88202"}
+{"versionname": "88.3 - Alpha", "versioncode": "88203"}