Fix some issues no 10.1.3

Closes #43
2019-12-21 21:01:40 +03:00 · 2019-12-21 21:01:40 +03:00 · 89a5dd1989
parent 6c67440a91
commit 89a5dd1989
2 changed files with 101 additions and 36 deletions
--- a/patches/branding/1013.patch
+++ b/patches/branding/1013.patch
@ -1,6 +1,6 @@
-diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
-*** from/AndroidManifest.xml	2019-12-21 11:43:26.794043395 +0200
--- to/AndroidManifest.xml	2019-12-21 11:53:12.700539388 +0200
+diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml
+*** com.discord-1013-base/AndroidManifest.xml	2019-12-21 20:51:33.103146237 +0300
+--- com.discord-1013/AndroidManifest.xml	2019-12-21 20:52:20.913415017 +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="1013" platformBuildVersionName="10.1.3">
@ -35,7 +35,7 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
      <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:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
+!     <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">
@ -146,25 +146,26 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
      </application>
 ! </manifest>
-diff -crB from/apktool.yml to/apktool.yml
-*** from/apktool.yml	2019-12-21 11:43:14.743876977 +0200
--- to/apktool.yml	2019-12-21 11:51:35.597080332 +0200
+diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml
+*** com.discord-1013-base/apktool.yml	2019-12-21 20:50:00.862627680 +0300
+--- com.discord-1013/apktool.yml	2019-12-21 20:52:09.236682706 +0300
 ***************
 *** 184,188 ****
    tag: null
-  version: 2.4.2-0143dc-SNAPSHOT
+  version: 2.4.1-197d46-SNAPSHOT
  versionInfo:
 !   versionCode: '1013'
 !   versionName: 10.1.3
 --- 184,188 ----
    tag: null
-  version: 2.4.2-0143dc-SNAPSHOT
+  version: 2.4.1-197d46-SNAPSHOT
  versionInfo:
 !   versionCode: '1013CTCBUILD'
 !   versionName: 10.1.3-cutthecord-CTCBUILD
-diff -crB from/res/values/strings.xml to/res/values/strings.xml
-*** from/res/values/strings.xml	2019-12-21 11:43:10.270473896 +0200
--- to/res/values/strings.xml	2019-12-21 11:51:35.597080332 +0200
+Only in com.discord-1013: apktool.yml.orig
+diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml
+*** com.discord-1013-base/res/values/strings.xml	2019-12-21 20:49:56.712604349 +0300
+--- com.discord-1013/res/values/strings.xml	2019-12-21 20:52:09.240016058 +0300
 ***************
 *** 1347,1353 ****
      <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@ -216,9 +217,9 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml
      <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/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-12-21 11:43:12.487175742 +0200
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 11:51:35.597080332 +0200
+diff -crB com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
+*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 20:49:58.519281172 +0300
+--- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 20:52:09.240016058 +0300
 ***************
 *** 76,82 ****
      .line 3
@ -236,3 +237,4 @@ diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelp
  
      .line 4
      invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
--- a/patches/slashcommands/1013.patch
+++ b/patches/slashcommands/1013.patch
@ -1,9 +1,6 @@
-Only in com.discord-1006: build
-Only in com.discord-1006: dist
-Only in com.discord-1006-base/smali/com: crashlytics
-diff -crB com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali com.discord-1006/smali/com/discord/stores/StoreMessages.smali
-*** com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali	2019-12-13 11:10:57.260791171 +0300
--- com.discord-1006/smali/com/discord/stores/StoreMessages.smali	2019-12-13 11:56:04.105650591 +0300
+diff -crB com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali com.discord-1013/smali/com/discord/stores/StoreMessages.smali
+*** com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:49:58.459280835 +0300
+--- com.discord-1013/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:54:46.217565221 +0300
 ***************
 *** 592,597 ****
 --- 592,601 ----
@ -2776,19 +2773,85 @@ diff -crB com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali com
 +     return-object p0
 + .end method
 \ No newline at end of file
-Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.orig
-Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.rej
-Only in com.discord-1006/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.orig
-Only in com.discord-1006/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.rej
-Only in com.discord-1006-base/smali/com: facebook
-Only in com.discord-1006/smali_classes2/com: crashlytics
-Only in com.discord-1006/smali_classes2/com/facebook: animated
-Only in com.discord-1006/smali_classes2/com/facebook: cache
-Only in com.discord-1006/smali_classes2/com/facebook: common
-Only in com.discord-1006/smali_classes2/com/facebook: datasource
-Only in com.discord-1006/smali_classes2/com/facebook: drawee
-Only in com.discord-1006/smali_classes2/com/facebook: fbcore
-Only in com.discord-1006/smali_classes2/com/facebook: fresco
-Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: animated
-Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: R.smali
+diff -crB com.discord-1013-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-1013/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
+*** com.discord-1013-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:49:58.685948776 +0300
+--- com.discord-1013/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:59:52.242618939 +0300
+***************
+*** 305,310 ****
+--- 305,340 ----
+  
+      move-result-object v10
+  
+     # intercept edit here
+ 
+     const-string v15, "/ctc "
+ 
+     invoke-virtual {v10, v15}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+ 
+     move-result v15
+ 
+     if-eqz v15, :cond_6
+ 
+     invoke-static {v10}, Lcom/discord/stores/StoreMessages;->slashCtc(Ljava/lang/String;)Ljava/lang/String;
+ 
+     move-result-object v10
+ 
+     move-object/from16 v14, p0
+ 
+     move-object/from16 v15, p1
+ 
+     sget-object v15, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend;
+ 
+     iget-object v0, v14, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
+ 
+     invoke-static {v15, v0, v10}, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z
+ 
+     move-result v15
+ 
+     return v15
+ 
+     :cond_6
+ 
+      invoke-static {v10, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+      .line 18
+***************
+*** 353,358 ****
+--- 383,418 ----
+  
+      move-result-object v13
+  
+     # intercept send here
+ 
+     const-string v15, "/ctc "
+ 
+     invoke-virtual {v12, v15}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+ 
+     move-result v15
+ 
+     if-eqz v15, :cond_7
+ 
+     invoke-static {v12}, Lcom/discord/stores/StoreMessages;->slashCtc(Ljava/lang/String;)Ljava/lang/String;
+ 
+     move-result-object v12
+ 
+     move-object/from16 v14, p0
+ 
+     move-object/from16 v15, p1
+ 
+     sget-object v15, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend;
+ 
+     iget-object v0, v14, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
+ 
+     invoke-static {v15, v0, v12}, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z
+ 
+     move-result v15
+ 
+     return v15
+ 
+     :cond_7
+ 
+      invoke-static {v13, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+      .line 27