From 9fe0b0eaff5a9b6f705b2be6f01ee80b944eb8d0 Mon Sep 17 00:00:00 2001 From: DisTok Date: Mon, 4 Feb 2019 21:34:48 +0100 Subject: [PATCH] Changes of com.discord v833 --- com.discord/AndroidManifest.xml | 2 +- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27192 -> 27192 bytes com.discord/res/values/strings.xml | 4 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../stores/StoreGifting$fetchGift$1$1.smali | 53 +++++++- .../utilities/analytics/AnalyticsUtils.smali | 6 +- ...lders$deleteConnectionModalBuilder$1.smali | 114 ++++++++++++------ .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../WidgetFriendsAdd$onViewBound$2.smali | 66 +++++++++- ...PopupChannel$onViewBoundOrOnResume$1.smali | 4 - .../notice/WidgetNoticePopupChannel.smali | 104 ++++++++-------- .../widgets/settings/WidgetSettings.smali | 2 +- 16 files changed, 259 insertions(+), 122 deletions(-) diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index f1ea6b34c2..a1f77c05af 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 796127e42d..970936dbb1 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-832.apk +apkFileName: com.discord-833.apk compressionType: false doNotCompress: - arsc @@ -345,5 +345,5 @@ usesFramework: tag: null version: 2.4.0-896569-SNAPSHOT versionInfo: - versionCode: '832' - versionName: 8.3.2 + versionCode: '833' + versionName: 8.3.3 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index f8eccd4a7a..f491357ae7 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Fri Jan 18 23:27:28 UTC 2019 -version_name=8.3.2 +#Tue Jan 22 23:44:10 UTC 2019 +version_name=8.3.3 package_name=com.discord -build_id=158ac3fa-63f9-4e26-9d04-d84f4da398f0 -version_code=832 +build_id=4eeaaee0-1de8-4826-8958-a12f8a696fe8 +version_code=833 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index ce89e82377e8eaec28075ab657f39ca13f8732aa..239d4879f5f94801c20f288f45ae948d40900ee8 100644 GIT binary patch delta 29 lcmdmSg>lCf#tmxhjK-VQ*;BO{9Vho1l`}eSW;Hf82LPSk2|oY; delta 29 lcmdmSg>lCf#tmxhj7FQ)*;BO{9VYi0l`}eQW;Hf82LPS92|NG* diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 89231292b6..bee8fafda7 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -874,7 +874,7 @@ SIDE TO SIDE {progress} Unable to sync cloud saves OR Collapse Category - 158ac3fa-63f9-4e26-9d04-d84f4da398f0 + 4eeaaee0-1de8-4826-8958-a12f8a696fe8 Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! @@ -2974,7 +2974,7 @@ To keep your sub, go to Settings and update your payment." Hey friend! If you want to buy Nitro, you’ll need to claim your account first so you don’t lose your stuff. Verify your email first Hey friend! If you want to buy Nitro, you’ll need to verify your email first. Check your email or request a new one. - Your subscription is past due. Please fix your credit card info. + Your subscription is past due. Please add or update your payment info. Nitro games are only supported on Windows. You now have gained the power of enhanced chat perks. Stop reading this and get to chattin!!! You now have unlimited access to so many awesome games. Stop reading this and go play them!!! diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 0f5a40e12b..1c959cd31f 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -30,11 +30,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/832" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/833" -.field public static final VERSION_CODE:I = 0x340 +.field public static final VERSION_CODE:I = 0x341 -.field public static final VERSION_NAME:Ljava/lang/String; = "8.3.2" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.3.3" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 858c76eca0..29ca048099 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x340 + const/16 v0, 0x341 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali index 528e2a1182..f7f133b36b 100644 --- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali +++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali @@ -39,7 +39,7 @@ # virtual methods .method public final call()V - .locals 3 + .locals 9 sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker; @@ -65,7 +65,51 @@ packed-switch v0, :pswitch_data_0 - goto :goto_0 + sget-object v3, Lcom/discord/app/AppLog;->tg:Lcom/discord/app/AppLog; + + const-string v4, "Fetching Gift Error" + + new-instance v0, Ljava/lang/Exception; + + iget-object v1, p0, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->$error:Lcom/discord/utilities/error/Error; + + invoke-virtual {v1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type; + + move-result-object v1 + + invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String; + + move-result-object v1 + + invoke-direct {v0, v1}, Ljava/lang/Exception;->(Ljava/lang/String;)V + + move-object v5, v0 + + check-cast v5, Ljava/lang/Throwable; + + const/4 v6, 0x0 + + const/4 v7, 0x4 + + const/4 v8, 0x0 + + invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V + + iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->this$0:Lcom/discord/stores/StoreGifting$fetchGift$1; + + iget-object v0, v0, Lcom/discord/stores/StoreGifting$fetchGift$1;->this$0:Lcom/discord/stores/StoreGifting; + + iget-object v1, p0, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->this$0:Lcom/discord/stores/StoreGifting$fetchGift$1; + + iget-object v1, v1, Lcom/discord/stores/StoreGifting$fetchGift$1;->$giftCode:Ljava/lang/String; + + sget-object v2, Lcom/discord/stores/StoreGifting$GiftState$LoadFailed;->INSTANCE:Lcom/discord/stores/StoreGifting$GiftState$LoadFailed; + + check-cast v2, Lcom/discord/stores/StoreGifting$GiftState; + + invoke-static {v0, v1, v2}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V + + return-void :pswitch_0 iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->this$0:Lcom/discord/stores/StoreGifting$fetchGift$1; @@ -82,7 +126,7 @@ invoke-static {v0, v1, v2}, Lcom/discord/stores/StoreGifting;->access$setGifts(Lcom/discord/stores/StoreGifting;Ljava/lang/String;Lcom/discord/stores/StoreGifting$GiftState;)V - goto :goto_0 + return-void :pswitch_1 iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchGift$1$1;->$error:Lcom/discord/utilities/error/Error; @@ -107,9 +151,6 @@ return-void - :goto_0 - return-void - :pswitch_data_0 .packed-switch 0x1 :pswitch_1 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali index 37b7fa4a4e..a8e688c887 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali @@ -194,7 +194,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/832" + const-string v2, "Discord-Android/833" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -206,7 +206,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x340 + const/16 v2, 0x341 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -222,7 +222,7 @@ const-string v1, "client_version" - const-string v2, "8.3.2" + const-string v2, "8.3.3" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali index c1ab1855e4..3f31d54446 100644 --- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali +++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali @@ -59,7 +59,7 @@ .end method .method public final invoke(Landroid/content/Context;)V - .locals 3 + .locals 8 const-string v0, "" @@ -71,67 +71,101 @@ move-result-object p1 - if-eqz p1, :cond_2 + if-eqz p1, :cond_3 - invoke-static {}, Lcom/discord/stores/StoreStream;->getUserConnections()Lcom/discord/stores/StoreUserConnections; + iget-object p1, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog; + + invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Dialog;->getMetadata()Ljava/util/Map; move-result-object p1 + const-string v0, "platform_name" + + invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object p1 + + instance-of v0, p1, Ljava/lang/String; + + const/4 v1, 0x0 + + if-nez v0, :cond_0 + + move-object p1, v1 + + :cond_0 + check-cast p1, Ljava/lang/String; + iget-object v0, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog; invoke-virtual {v0}, Lcom/discord/stores/StoreNotices$Dialog;->getMetadata()Ljava/util/Map; move-result-object v0 - const-string v1, "platform_name" + const-string v2, "connection_id" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 - if-eqz v0, :cond_1 + instance-of v2, v0, Ljava/lang/String; - check-cast v0, Ljava/lang/String; + if-nez v2, :cond_1 - iget-object v1, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog; - - invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Dialog;->getMetadata()Ljava/util/Map; - - move-result-object v1 - - const-string v2, "connection_id" - - invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v1 - - if-eqz v1, :cond_0 - - check-cast v1, Ljava/lang/String; - - invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreUserConnections;->deleteUserConnection(Ljava/lang/String;Ljava/lang/String;)V - - goto :goto_0 - - :cond_0 - new-instance p1, Lkotlin/r; - - const-string v0, "null cannot be cast to non-null type kotlin.String" - - invoke-direct {p1, v0}, Lkotlin/r;->(Ljava/lang/String;)V - - throw p1 + move-object v0, v1 :cond_1 - new-instance p1, Lkotlin/r; + check-cast v0, Ljava/lang/String; - const-string v0, "null cannot be cast to non-null type kotlin.String" + if-eqz p1, :cond_2 - invoke-direct {p1, v0}, Lkotlin/r;->(Ljava/lang/String;)V + if-eqz v0, :cond_2 - throw p1 + invoke-static {}, Lcom/discord/stores/StoreStream;->getUserConnections()Lcom/discord/stores/StoreUserConnections; + + move-result-object v1 + + invoke-virtual {v1, p1, v0}, Lcom/discord/stores/StoreUserConnections;->deleteUserConnection(Ljava/lang/String;Ljava/lang/String;)V + + return-void :cond_2 - :goto_0 + sget-object v2, Lcom/discord/app/AppLog;->tg:Lcom/discord/app/AppLog; + + const-string v3, "Delete Connections" + + new-instance v1, Ljava/lang/Exception; + + new-instance v4, Ljava/lang/StringBuilder; + + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string p1, ", " + + invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object p1 + + invoke-direct {v1, p1}, Ljava/lang/Exception;->(Ljava/lang/String;)V + + move-object v4, v1 + + check-cast v4, Ljava/lang/Throwable; + + const/4 v5, 0x0 + + const/4 v6, 0x4 + + const/4 v7, 0x0 + + invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V + + :cond_3 return-void .end method diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index 615f2ad753..e4fbdf2832 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -167,7 +167,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/832" + const-string v0, "Discord-Android/833" return-object v0 .end method diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index c574ebc074..ced7234630 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -512,7 +512,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "8.3.2" + const-string v4, "8.3.3" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali index e7141574cb..f87e1e0da9 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali @@ -35,15 +35,18 @@ # virtual methods .method public final afterTextChanged(Landroid/text/Editable;)V - .locals 4 + .locals 8 + :try_start_0 const-string v0, "editable" invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - check-cast p1, Ljava/lang/CharSequence; + move-object v0, p1 - invoke-interface {p1}, Ljava/lang/CharSequence;->length()I + check-cast v0, Ljava/lang/CharSequence; + + invoke-interface {v0}, Ljava/lang/CharSequence;->length()I move-result v0 @@ -80,6 +83,8 @@ move-result-object v0 + check-cast p1, Ljava/lang/CharSequence; + invoke-interface {p1}, Ljava/lang/CharSequence;->length()I move-result p1 @@ -93,6 +98,61 @@ :goto_1 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setEnabled(Z)V + :try_end_0 + .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 + + return-void + + :catch_0 + sget-object v2, Lcom/discord/app/AppLog;->tg:Lcom/discord/app/AppLog; + + const-string v3, "Failed to update views via LambdaTextWatcher" + + new-instance p1, Ljava/lang/Exception; + + new-instance v0, Ljava/lang/StringBuilder; + + const-string v1, "Detached: " + + invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAdd; + + invoke-virtual {v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->isDetached()Z + + move-result v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + + const-string v1, " Visible: " + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAdd; + + invoke-virtual {v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->isVisible()Z + + move-result v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + invoke-direct {p1, v0}, Ljava/lang/Exception;->(Ljava/lang/String;)V + + move-object v4, p1 + + check-cast v4, Ljava/lang/Throwable; + + const/4 v5, 0x0 + + const/4 v6, 0x4 + + const/4 v7, 0x0 + + invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V return-void .end method diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali index 0ee854b9da..12d2826e67 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali @@ -81,10 +81,6 @@ iget-object v1, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1;->$savedMessage:Lcom/discord/models/domain/ModelMessage; - const-string v2, "channel" - - invoke-static {p2, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const-string v2, "bodyText" invoke-static {p5, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali index ea6a16d714..89ae16ae3b 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali @@ -537,7 +537,7 @@ .end method .method private final createModel(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Ljava/util/Map;)Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model; - .locals 9 + .locals 8 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -554,11 +554,13 @@ } .end annotation + const/4 v0, 0x0 + + if-eqz p3, :cond_c + invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v0 - - const/4 v2, 0x0 + move-result-wide v1 if-nez p2, :cond_0 @@ -569,27 +571,27 @@ move-result-wide v3 - cmp-long p2, v3, v0 + cmp-long p2, v3, v1 if-nez p2, :cond_1 - return-object v2 + goto/16 :goto_7 :cond_1 :goto_0 invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v0 + move-result-wide v1 const-wide/16 v3, -0x1 - cmp-long p2, v0, v3 + cmp-long p2, v1, v3 if-eqz p2, :cond_4 const-wide/16 v3, 0x0 - cmp-long p2, v0, v3 + cmp-long p2, v1, v3 if-nez p2, :cond_2 @@ -605,26 +607,26 @@ goto :goto_1 :cond_3 - move-object p2, v2 + move-object p2, v0 :goto_1 - new-instance v0, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - const-string v1, "#" + const-string v2, "#" - invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + invoke-direct {v1, v2}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String; + move-result-object v2 + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v0 - - invoke-static {p2, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; + invoke-static {p2, v1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; move-result-object p2 @@ -636,14 +638,14 @@ move-result-object p2 - invoke-static {p2, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; + invoke-static {p2, v0}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; move-result-object p2 :goto_3 - iget-object v0, p2, Lkotlin/Pair;->first:Ljava/lang/Object; + iget-object v1, p2, Lkotlin/Pair;->first:Ljava/lang/Object; - check-cast v0, Ljava/lang/String; + check-cast v1, Ljava/lang/String; iget-object p2, p2, Lkotlin/Pair;->second:Ljava/lang/Object; @@ -651,9 +653,9 @@ invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getType()I - move-result v1 + move-result v2 - if-eqz v1, :cond_5 + if-eqz v2, :cond_5 invoke-static {p3}, Lcom/discord/utilities/icon/IconUtils;->getForChannel(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/String; @@ -662,9 +664,9 @@ goto :goto_4 :cond_5 - const-string v1, "asset://asset/images/default_icon_selected.jpg" + const-string v2, "asset://asset/images/default_icon_selected.jpg" - invoke-static {p4, v1}, Lcom/discord/utilities/icon/IconUtils;->getForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;)Ljava/lang/String; + invoke-static {p4, v2}, Lcom/discord/utilities/icon/IconUtils;->getForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;)Ljava/lang/String; move-result-object p4 @@ -673,19 +675,19 @@ const-string p4, "asset://asset/images/default_icon.jpg" - move-object v6, p4 + move-object v5, p4 goto :goto_5 :cond_6 - move-object v6, p4 + move-object v5, p4 :goto_5 invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getType()I move-result p4 - const/4 v1, 0x0 + const/4 v2, 0x0 const/4 v3, 0x1 @@ -695,12 +697,12 @@ if-eq p4, v4, :cond_7 - const/4 v8, 0x0 + const/4 v7, 0x0 goto :goto_6 :cond_7 - const/4 v8, 0x1 + const/4 v7, 0x1 :goto_6 move-object p4, p5 @@ -731,17 +733,17 @@ invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessageEmbed;->getTitle()Ljava/lang/String; - move-result-object v2 + move-result-object v0 :cond_8 - if-nez v2, :cond_9 + if-nez v0, :cond_9 - const-string v2, "" + const-string v0, "" :cond_9 - check-cast v2, Ljava/lang/CharSequence; + check-cast v0, Ljava/lang/CharSequence; - invoke-virtual {p5, v2}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; + invoke-virtual {p5, v0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; :cond_a invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->isDM()Z @@ -760,9 +762,9 @@ invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v2 + move-result-wide v3 - invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p4 @@ -788,30 +790,34 @@ check-cast p1, Ljava/lang/CharSequence; - invoke-virtual {p5, v1, p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->insert(ILjava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; + invoke-virtual {p5, v2, p1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->insert(ILjava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; :cond_b new-instance p1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model; const-string p3, "title" - invoke-static {v0, p3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, p3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - move-object v4, v0 + move-object v3, v1 + + check-cast v3, Ljava/lang/CharSequence; + + move-object v4, p2 check-cast v4, Ljava/lang/CharSequence; - move-object v5, p2 + move-object v2, p1 - check-cast v5, Ljava/lang/CharSequence; + move-object v6, p5 - move-object v3, p1 - - move-object v7, p5 - - invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Z)V + invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Z)V return-object p1 + + :cond_c + :goto_7 + return-object v0 .end method .method private final getAttachmentIv()Lcom/facebook/drawee/view/SimpleDraweeView; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index 0f09b200c4..6effa5b94b 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1264,7 +1264,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 8.3.2 (832)" + const-string v0, " - 8.3.3 (833)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;