update 18.0.0 (#686)

* merge changes * update ids * finish rebase
bttv-android · Aug 27, 2024 · d767b27 · d767b27
1 parent c85fd60
commit d767b27
Show file tree

Hide file tree

Showing 12 changed files with 116 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ A mod of the Twitch Android Mobile<sup><a href="#no-tv">1</a></sup> App adding B
 
 # Build it yourself
 
-> This patch is meant to be applied to version **17.9.0** of the official twitch app
+> This patch is meant to be applied to version **18.0.0** of the official twitch app
 > Make sure you use this version before you create an issue!
 
 ## Easy way: Docker
@@ -128,7 +128,7 @@ Made with ♥️ by [@FoseFx](https://github.com/FoseFx) and contributors. MIT L
 [license-badge]: https://img.shields.io/github/license/bttv-android/bttv?style=flat-square
 [license-file]: ./LICENSE
 [bttv-version]: https://img.shields.io/github/v/release/bttv-android/bttv?style=flat-square
-[base-version]: https://img.shields.io/badge/build%20on-v17.9.0-blueviolet?style=flat-square
+[base-version]: https://img.shields.io/badge/build%20on-v18.0.0-blueviolet?style=flat-square
 [downloads-latest]: https://img.shields.io/github/downloads/bttv-android/bttv/latest/total?color=yellow&style=flat-square
 [downloads-total]: https://img.shields.io/github/downloads/bttv-android/bttv/total?color=yellowgreen&label=downloads%20total&style=flat-square
 [latest-release]: https://github.com/bttv-android/bttv/releases/latest

diff --git a/patches/AndroidManifest.xml.patch b/patches/AndroidManifest.xml.patch
@@ -65,10 +65,10 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
          <uses-library android:name="androidx.window.extensions" android:required="false"/>
          <uses-library android:name="androidx.window.sidecar" android:required="false"/>
-@@ -353,5 +365,18 @@
-                 <action android:name="com.amazon.dcp.sso.action.session.users.changed"/>
+@@ -354,5 +366,18 @@
              </intent-filter>
          </receiver>
+         <service android:exported="true" android:name="com.amazonaws.ivs.player.AnalyticsService" android:permission="android.permission.BIND_JOB_SERVICE"/>
 +        <activity android:name="bttv.updater.UpdaterActivity" />
 +        <provider
 +            android:name="androidx.core.content.FileProvider"

diff --git a/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch b/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch
@@ -19,7 +19,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
 
  .field private final chatDialogRouter:Ltv/twitch/android/shared/chat/pub/ChatDialogRouter;
 
-@@ -1561,6 +1561,10 @@
+@@ -1563,6 +1563,10 @@
 
      iput-object v1, v0, Ltv/twitch/android/shared/chat/ChatViewPresenter;->messageInputListener:Ltv/twitch/android/shared/chat/ChatViewPresenter$messageInputListener$1;
 
@@ -30,7 +30,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
      return-void
  .end method
 
-@@ -2153,6 +2157,13 @@
+@@ -2173,6 +2177,13 @@
      :cond_0
      return-void
  .end method

diff --git a/...s/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch b/...s/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali b/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
-@@ -267,7 +267,7 @@
+@@ -279,7 +279,7 @@
 
  .field private viewer:Ltv/twitch/android/models/UserModel;
 
@@ -10,7 +10,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnec
 
 
  # direct methods
-@@ -1374,6 +1374,11 @@
+@@ -1438,6 +1438,11 @@
 
      iget v1, p0, Ltv/twitch/android/shared/chat/observables/ChatConnectionController;->viewerId:I
 
@@ -22,7 +22,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnec
      iget-object v2, p0, Ltv/twitch/android/shared/chat/observables/ChatConnectionController;->screenName:Ljava/lang/String;
 
      invoke-virtual {v0, v1, p1, v2}, Ltv/twitch/android/sdk/ChatController;->connect(IILjava/lang/String;)V
-@@ -1716,6 +1721,14 @@
+@@ -2104,6 +2109,14 @@
      return-object v0
  .end method
 

diff --git a/...v.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch b/...v.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch
@@ -2,7 +2,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$
 --- a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali
 +++ b/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali
 @@ -67,6 +67,12 @@
-     .line 537
+     .line 516
      iget-object v0, p0, Ltv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2;->this$0:Ltv/twitch/android/shared/bits/BitsSpendingPresenter;
 
 +    # BTTV

diff --git a/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch b/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch
@@ -10,7 +10,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter.
 
  .field private final availabilityTracker:Ltv/twitch/android/shared/analytics/availability/AvailabilityTracker;
 
-@@ -1105,7 +1105,9 @@
+@@ -933,7 +933,9 @@
 
      const/4 v1, 0x1
 

diff --git a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
-@@ -1338,6 +1338,19 @@
+@@ -1496,6 +1496,19 @@
 
      invoke-static {v14, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 

diff --git a/...otes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch b/...otes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch
@@ -1,8 +1,8 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
-@@ -318,6 +318,11 @@
-     .line 62
+@@ -470,6 +470,11 @@
+     .line 65
      iget-object v4, v1, Ltv/twitch/chat/ChatSubscriptionNotice;->userMessage:Ltv/twitch/chat/ChatMessageInfo;
 
 +    # BTTV

diff --git a/patches/res.values.ids.xml.patch b/patches/res.values.ids.xml.patch
@@ -1,7 +1,7 @@
 diff --git a/res/values/ids.xml b/res/values/ids.xml
 --- a/res/values/ids.xml
 +++ b/res/values/ids.xml
-@@ -4618,4 +4618,8 @@
+@@ -4606,4 +4606,8 @@
      <item type="id" name="wrapper_states" />
      <item type="id" name="ximg" />
      <item type="id" name="year_published" />