Update to v12.0.1 (#325)

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: download base
-        run: wget https://www.dropbox.com/s/01ql8gzm5zblto1/twitch-11.9.0.apk\?\dl=1 -O twitch.apk
+        run: wget https://www.dropbox.com/s/nbqmvm45jqx9sqa/twitch-12.0.1.apk\?\dl=1 -O twitch.apk
       - name: create keystore.kjs from secret
         run: echo "${{ secrets.KEYSTORE }}" | base64 -d > keystore.jks
       - name: run build

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# master
+- rebase to v12.0.1
+
 # v0.15.1-beta
 - fix a split-chat related bug
 

disassemble

@@ -93,7 +93,6 @@ sed -i "s/apkFileName: base.apk/apkFileName: twitch.apk/" .tmp/base/apktool.yml
 
 # fix full dex-files
 mkdir .tmp/base/smali_classes8
-mv .tmp/base/smali_classes3/jp .tmp/base/smali_classes8/.
 mkdir -p .tmp/base/smali_classes8/tv/twitch/android
 mv .tmp/base/smali_classes6/tv/twitch/android/player .tmp/base/smali_classes8/tv/twitch/android/player
 

mod/app/src/main/java/bttv/Autocomplete.java

@@ -5,8 +5,8 @@
 
 import bttv.emote.Emote;
 import bttv.emote.Emotes;
-import tv.twitch.android.shared.emotes.models.EmoteSet;
-import tv.twitch.android.models.emotes.EmoteModelAssetType;
+import tv.twitch.android.models.emotes.EmoteModelType;
+import tv.twitch.android.models.emotes.EmoteSet;
 import tv.twitch.android.models.emotes.EmoteModel;
 
 public class Autocomplete {
@@ -28,7 +28,13 @@ public static void addOurEmotes(List<EmoteSet> list) {
             Emote e = Emotes.getEmote(channelId, code);
             if (e == null)
                 continue; // should not happen
-            generics.add(new EmoteModel.Generic("BTTV-" + e.id, e.code, e.getAssetType()));
+            generics.add(
+                new EmoteModel.Generic(
+                    "BTTV-" + e.id,
+                    e.code,
+                    e.getAssetType(),
+                    EmoteModelType.OTHER)
+            );
         }
         EmoteSet set = new EmoteSet.GenericEmoteSet("bttv_emote_set_id", generics);
         list.add(set);

mod/app/src/main/java/bttv/ChommentModelDelegateWrapper.java

@@ -10,7 +10,9 @@
 import kotlin.jvm.internal.BTTVDefaultConstructorMarker;
 import tv.twitch.android.models.chat.MessageToken;
 import tv.twitch.android.models.chomments.ChommentModel;
+import tv.twitch.android.provider.experiments.ExperimentHelper;
 import tv.twitch.android.sdk.SDKServicesController;
+import tv.twitch.android.shared.chat.ChatConnectionManagerWrapper;
 import tv.twitch.android.shared.chat.ChatMessageParser;
 import tv.twitch.android.shared.chat.chomments.ChommentModelDelegate;
 
@@ -21,9 +23,15 @@ public class ChommentModelDelegateWrapper extends ChommentModelDelegate {
     public ChommentModelDelegateWrapper(ChommentModel chommentModel,
                                         SDKServicesController sdkServicesController,
                                         ChatMessageParser chatMessageParser,
-                                        int i,
-                                        BTTVDefaultConstructorMarker BTTVDefaultConstructorMarker) {
-        super(chommentModel, sdkServicesController, chatMessageParser, i, BTTVDefaultConstructorMarker);
+                                        ExperimentHelper experimentHelper,
+                                        ChatConnectionManagerWrapper chatConnectionManagerWrapper) {
+        super(
+            chommentModel,
+            sdkServicesController,
+            chatMessageParser,
+            experimentHelper,
+            chatConnectionManagerWrapper
+        );
     }
 
     @Override

mod/app/src/main/java/bttv/Tokenizer.java

@@ -15,6 +15,8 @@
 import tv.twitch.android.models.chat.MessageToken.TextToken;
 import tv.twitch.android.models.chat.MessageToken;
 import tv.twitch.android.models.chat.MessageToken.EmoticonToken;
+import tv.twitch.android.provider.chat.ChatMessageInterface;
+import tv.twitch.android.shared.chat.ChatMessageDelegate;
 import tv.twitch.chat.AutoModFlags;
 import tv.twitch.chat.ChatEmoticonToken;
 import tv.twitch.chat.ChatMessageInfo;
@@ -82,6 +84,18 @@ public static Pair<List<MessageToken>, Boolean> tokenize(List<MessageToken> orig
         return new Pair<>(newTokens, shouldHighlight);
     }
 
+    public static void retokenizeLiveChatMessage(ChatMessageInterface chatMessageInterface) {
+        if (chatMessageInterface instanceof ChatMessageDelegate) {
+            ChatMessageDelegate delegate = (ChatMessageDelegate) chatMessageInterface;
+            retokenizeLiveChatMessage(delegate.mChatMessage);
+        } else {
+            Log.w(
+                "LBTTV",
+                "retokenizeLiveChatMessage: interface it not a ChatMessageDelegate it's a "
+                + chatMessageInterface.getClass().getName());
+        }
+    }
+
     public static void retokenizeLiveChatMessage(ChatMessageInfo info) {
         Context ctx = Data.ctx;
         int channel = Data.currentBroadcasterId;

mod/app/src/main/java/bttv/api/Autocomplete.java

@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-import tv.twitch.android.shared.emotes.models.EmoteSet;
+import tv.twitch.android.models.emotes.EmoteSet;
 
 public class Autocomplete {
     final static String TAG = "LBTTVAutocomplete";

mod/app/src/main/java/bttv/api/Highlight.java

@@ -1,6 +1,6 @@
 package bttv.api;
 
-import tv.twitch.android.shared.chat.ChatMessageInterface;
+import tv.twitch.android.provider.chat.ChatMessageInterface;
 
 public class Highlight {
     public static Integer replaceNum(ChatMessageInterface chatMessageInterface, boolean z, boolean z2, int i, int i2, Object iClickableUsernameSpanListener, Object twitchUrlSpanClickListener, Object webViewSource, String str, boolean z3, Object chatFiltersSettings, Integer num) {

mod/app/src/main/java/bttv/emote/EmoteCardUtil.java

@@ -6,8 +6,8 @@
 import bttv.Res;
 import bttv.ResUtil;
 import io.reactivex.Single;
-import tv.twitch.android.shared.chat.model.EmoteCardModel;
-import tv.twitch.android.shared.chat.parser.EmoteCardModelParser;
+import tv.twitch.android.provider.chat.model.EmoteCardModelResponse;
+import tv.twitch.android.provider.chat.model.EmoteCardModel;
 import tv.twitch.android.models.emotes.EmoteModelAssetType;
 
 
@@ -59,7 +59,7 @@ public String getEmoteDesc() {
     }
 
     // called in Ltv/twitch/android/shared/chat/api/EmoteCardApi.getEmoteCardModelResponse()
-    public static Single<EmoteCardModelParser.EmoteCardModelResponse> getEmoteResponseOrNull(String emoteId) {
+    public static Single<EmoteCardModelResponse> getEmoteResponseOrNull(String emoteId) {
         if (!emoteId.startsWith("BTTV-")) {
             return null;
         }
@@ -69,21 +69,8 @@ public static Single<EmoteCardModelParser.EmoteCardModelResponse> getEmoteRespon
             return null;
         }
         EmoteCardModel model = new BTTVEmoteCardModel(emoteId, emote.code);
-        EmoteCardModelParser.EmoteCardModelResponse resp = new EmoteCardModelParser.EmoteCardModelResponse.Success(
+        EmoteCardModelResponse resp = new EmoteCardModelResponse.Success(
                 model);
         return Single.just(resp);
     }
-
-    // called in Ltv/twitch/android/shared/chat/emotecard/EmoteCardUiModel.<init>
-    public static String maybeReplaceEmoteCardUiModelEmoteUrl(EmoteCardModel model, String originalUrl) {
-        if (model == null || model.emoteId == null) {
-            return originalUrl;
-        }
-        String bttvId = EmoteUrlUtil.extractBTTVId(model.emoteId);
-        if (bttvId != null) {
-            return EmoteUrlUtil.realIdToUrl(bttvId);
-        } else {
-            return originalUrl;
-        }
-    }
 }

mod/app/src/main/java/bttv/emote/EmotePicker.java

@@ -11,6 +11,7 @@
 import bttv.Data;
 import bttv.Res;
 import bttv.ResUtil;
+import tv.twitch.android.models.emotes.EmoteModelType;
 import tv.twitch.android.shared.emotes.emotepicker.EmotePickerPresenter.ClickedEmote;
 import tv.twitch.android.shared.emotes.emotepicker.models.EmoteHeaderUiModel;
 import tv.twitch.android.shared.emotes.emotepicker.models.EmoteImageDescriptor;
@@ -138,7 +139,7 @@ private static EmoteUiSet getUiSet(Res.strings headerRes, EmotePickerSection sec
 
     private static EmoteUiModel emoteToModel(Emote emote) {
         String id = "BTTV-" + emote.id;
-        EmoteModel model = new EmoteModel.Generic(id, emote.code, emote.getAssetType());
+        EmoteModel model = new EmoteModel.Generic(id, emote.code, emote.getAssetType(), EmoteModelType.OTHER);
 
         EmoteMessageInput input = new EmoteMessageInput(emote.code, id, false);
         ClickedEmote clickedEmote = new ClickedEmote.Unlocked(model, input, null, null, 12, null);

mod/app/src/main/java/bttv/highlight/Highlight.java

@@ -21,7 +21,7 @@
 import bttv.settings.Settings;
 import bttv.settings.UserPreferences;
 import tv.twitch.android.shared.chat.ChatMessageDelegate;
-import tv.twitch.android.shared.chat.ChatMessageInterface;
+import tv.twitch.android.provider.chat.ChatMessageInterface;
 
 public class Highlight {
     private static final String TAG = "LBTTVHighlight";

mod/app/src/main/java/bttv/updater/Updater.java

@@ -19,8 +19,8 @@
 import okhttp3.Callback;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import tv.twitch.android.app.core.navigation.PersistentBannerPresenter;
-import tv.twitch.android.app.core.navigation.PersistentBannerPresenter.PersistentBannerPresenterListener;
+import tv.twitch.android.feature.viewer.main.navigation.PersistentBannerPresenter;
+import tv.twitch.android.feature.viewer.main.navigation.PersistentBannerPresenter.PersistentBannerPresenterListener;
 
 public class Updater {
     private static final String GH_API_HOST = "https://api.github.com";

mod/twitch/src/main/java/tv/twitch/android/adapters/social/MessageRecyclerItem.java

@@ -8,7 +8,7 @@
 
 public class MessageRecyclerItem implements tv.twitch.android.core.adapters.RecyclerAdapterItem {
     public static class ChatMessageViewHolder extends ViewHolder {
-        public ChatMessageViewHolder(@NonNull View itemView) {
+        public ChatMessageViewHolder(@NonNull View itemView, boolean bool) {
             super(itemView);
         }
 

mod/twitch/src/main/java/tv/twitch/android/api/parsers/EmoteCardModelParser.java

@@ -0,0 +1,8 @@
+package tv.twitch.android.api.parsers;
+
+import kotlin.jvm.internal.BTTVDefaultConstructorMarker;
+import tv.twitch.android.provider.chat.model.EmoteCardModel;
+
+public class EmoteCardModelParser {
+
+}

mod/twitch/src/main/java/tv/twitch/android/app/core/navigation/PersistentBannerPresenter.java → mod/twitch/src/main/java/tv/twitch/android/feature/viewer/main/navigation/PersistentBannerPresenter.java

@@ -1,4 +1,4 @@
-package tv.twitch.android.app.core.navigation;
+package tv.twitch.android.feature.viewer.main.navigation;
 
 public class PersistentBannerPresenter {
     public interface PersistentBannerPresenterListener {

mod/twitch/src/main/java/tv/twitch/android/models/emotes/EmoteModel.java

@@ -21,7 +21,7 @@ public String getToken() {
             return "";
         }
 
-        public Generic(String id, String token, EmoteModelAssetType assetType) {
+        public Generic(String id, String token, EmoteModelAssetType assetType, EmoteModelType type) {
         }
     }
 

mod/twitch/src/main/java/tv/twitch/android/models/emotes/EmoteModelType.java

@@ -0,0 +1,9 @@
+package tv.twitch.android.models.emotes;
+
+public enum EmoteModelType {
+  OTHER(3);
+
+  EmoteModelType(int order) {
+
+  }
+}

mod/twitch/src/main/java/tv/twitch/android/shared/emotes/models/EmoteSet.java → mod/twitch/src/main/java/tv/twitch/android/models/emotes/EmoteSet.java

@@ -1,9 +1,7 @@
-package tv.twitch.android.shared.emotes.models;
+package tv.twitch.android.models.emotes;
 
 import java.util.List;
 
-import tv.twitch.android.models.emotes.EmoteModel;
-
 public abstract class EmoteSet {
     public abstract List<EmoteModel> getEmotes();
     public abstract java.lang.String getSetId();

mod/twitch/src/main/java/tv/twitch/android/shared/chat/ChatMessageInterface.java → mod/twitch/src/main/java/tv/twitch/android/provider/chat/ChatMessageInterface.java

@@ -2,7 +2,7 @@
  * This file is a stub, so javac does not throw errors,
  * it is not used in the patches.
  */
-package tv.twitch.android.shared.chat;
+package tv.twitch.android.provider.chat;
 
 public interface ChatMessageInterface {
     java.util.List<tv.twitch.android.models.chat.MessageBadge> getBadges();

mod/twitch/src/main/java/tv/twitch/android/shared/chat/model/EmoteCardModel.java → mod/twitch/src/main/java/tv/twitch/android/provider/chat/model/EmoteCardModel.java

@@ -1,4 +1,4 @@
-package tv.twitch.android.shared.chat.model;
+package tv.twitch.android.provider.chat.model;
 
 import tv.twitch.android.models.emotes.EmoteModelAssetType;
 

mod/twitch/src/main/java/tv/twitch/android/provider/chat/model/EmoteCardModelResponse.java

@@ -0,0 +1,24 @@
+package tv.twitch.android.provider.chat.model;
+
+import kotlin.jvm.internal.BTTVDefaultConstructorMarker;
+
+public abstract class EmoteCardModelResponse {
+
+  public static final class Success extends EmoteCardModelResponse {
+    public Success(EmoteCardModel emoteCardModel) {
+      super(null);
+    }
+
+    public final EmoteCardModel getEmoteCardModel() {
+      return null;
+    }
+  }
+
+  private EmoteCardModelResponse() {
+  }
+
+  public EmoteCardModelResponse(BTTVDefaultConstructorMarker BTTVDefaultConstructorMarker) {
+    this();
+  }
+
+}

mod/twitch/src/main/java/tv/twitch/android/provider/experiments/ExperimentHelper.java

@@ -0,0 +1,4 @@
+package tv.twitch.android.provider.experiments;
+
+public interface ExperimentHelper {
+}

mod/twitch/src/main/java/tv/twitch/android/shared/chat/ChatConnectionManagerWrapper.java

@@ -0,0 +1,4 @@
+package tv.twitch.android.shared.chat;
+
+public class ChatConnectionManagerWrapper {
+}

mod/twitch/src/main/java/tv/twitch/android/shared/chat/ChatMessageDelegate.java

@@ -9,6 +9,7 @@
 
 import tv.twitch.android.models.chat.MessageBadge;
 import tv.twitch.android.models.chat.MessageToken;
+import tv.twitch.android.provider.chat.ChatMessageInterface;
 import tv.twitch.chat.ChatMessageInfo;
 
 public class ChatMessageDelegate implements ChatMessageInterface {

mod/twitch/src/main/java/tv/twitch/android/shared/chat/chomments/ChommentModelDelegate.java

@@ -10,17 +10,19 @@
 import tv.twitch.android.models.chat.MessageBadge;
 import tv.twitch.android.models.chat.MessageToken;
 import tv.twitch.android.models.chomments.ChommentModel;
+import tv.twitch.android.provider.experiments.ExperimentHelper;
 import tv.twitch.android.sdk.SDKServicesController;
-import tv.twitch.android.shared.chat.ChatMessageInterface;
+import tv.twitch.android.provider.chat.ChatMessageInterface;
+import tv.twitch.android.shared.chat.ChatConnectionManagerWrapper;
 import tv.twitch.android.shared.chat.ChatMessageParser;
 
 public class ChommentModelDelegate implements ChatMessageInterface {
 
     public ChommentModelDelegate(ChommentModel chommentModel,
                                  SDKServicesController sdkServicesController,
                                  ChatMessageParser chatMessageParser,
-                                 int i,
-                                 BTTVDefaultConstructorMarker BTTVDefaultConstructorMarker) {
+                                 ExperimentHelper experimentHelper,
+                                 ChatConnectionManagerWrapper chatConnectionManagerWrapper) {
     }
 
     @Override

mod/twitch/src/main/java/tv/twitch/android/shared/chat/emotecard/EmoteCardUiModel.java

@@ -1,6 +1,6 @@
 package tv.twitch.android.shared.chat.emotecard;
 
-import tv.twitch.android.shared.chat.model.EmoteCardModel;
+import tv.twitch.android.provider.chat.model.EmoteCardModel;
 
 public abstract class EmoteCardUiModel {
     public abstract String getEmoteUrl();