diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 3b75165a6f..e14f0908e7 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1260.apk +apkFileName: com.discord-1262.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1260' - versionName: '40.1' + versionCode: '1262' + versionName: '41.01' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index e8fa5ac980..9a1df9353e 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png b/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png index ca5f430a9a..0c20251da0 100644 Binary files a/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png and b/com.discord/res/drawable-xhdpi/bg_cloud_pattern_dark.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png index 135a348869..f409d1fca3 100644 Binary files a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png and b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png differ diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 729835493b..185dc4c7a2 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1149,7 +1149,7 @@ We’re here to make a good impression." Presets Select a color Transparency - c1c34bc68aca4617ac015f23444db293 + c11fc99903e64f848e255b244a3e96ee Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 6e77d37d0c..586a9b9490 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -42,11 +42,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1260" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1262" -.field public static final VERSION_CODE:I = 0x4ec +.field public static final VERSION_CODE:I = 0x4ee -.field public static final VERSION_NAME:Ljava/lang/String; = "40.1" +.field public static final VERSION_NAME:Ljava/lang/String; = "41.01" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index d8b3777e35..0752d46762 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, 0x4ec + const/16 v0, 0x4ee iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index e06a31d0ba..c31a17eb3b 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -173,7 +173,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1260" + const-string v4, "Discord-Android/1262" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -181,7 +181,7 @@ const/4 v1, 0x2 - const/16 v2, 0x4ec + const/16 v2, 0x4ee invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "40.1" + const-string v4, "41.01" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali index eb519e662c..4c4380362e 100644 --- a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali +++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali @@ -365,7 +365,7 @@ .end method .method public final isDeviceConnected(Landroid/content/Context;Landroid/content/Intent;)Z - .locals 2 + .locals 9 const-string v0, "context" @@ -380,19 +380,21 @@ move-result-object p1 - if-eqz p1, :cond_3 + if-eqz p1, :cond_7 check-cast p1, Landroid/net/ConnectivityManager; invoke-virtual {p1}, Landroid/net/ConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo; - move-result-object p1 + move-result-object v1 + + const/4 v2, 0x0 if-eqz p2, :cond_0 - const-string v1, "networkInfo" + const-string v3, "networkInfo" - invoke-virtual {p2, v1}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable; + invoke-virtual {p2, v3}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable; move-result-object p2 @@ -401,36 +403,153 @@ goto :goto_0 :cond_0 - const/4 p2, 0x0 + move-object p2, v2 :goto_0 - if-eqz p1, :cond_1 + const/4 v3, 0x2 - invoke-virtual {p1}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z + new-array v4, v3, [Landroid/net/NetworkInfo; - move-result p1 + const/4 v5, 0x0 - if-eq p1, v0, :cond_4 + aput-object v1, v4, v5 + + aput-object p2, v4, v0 + + invoke-virtual {p1}, Landroid/net/ConnectivityManager;->getAllNetworks()[Landroid/net/Network; + + move-result-object p2 + + const-string v1, "connectivityManager.allNetworks" + + invoke-static {p2, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v1, Ljava/util/ArrayList; + + array-length v6, p2 + + invoke-direct {v1, v6}, Ljava/util/ArrayList;->(I)V + + array-length v6, p2 + + const/4 v7, 0x0 + + :goto_1 + if-ge v7, v6, :cond_1 + + aget-object v8, p2, v7 + + invoke-virtual {p1, v8}, Landroid/net/ConnectivityManager;->getNetworkInfo(Landroid/net/Network;)Landroid/net/NetworkInfo; + + move-result-object v8 + + invoke-interface {v1, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + add-int/lit8 v7, v7, 0x1 + + goto :goto_1 :cond_1 - if-eqz p2, :cond_2 + const-string p1, "$this$plus" - invoke-virtual {p2}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z + invoke-static {v4, p1}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string p1, "elements" + + invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {v1}, Ljava/util/Collection;->size()I move-result p1 - if-ne p1, v0, :cond_2 + add-int/2addr p1, v3 - goto :goto_1 + invoke-static {v4, p1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; + + move-result-object p1 + + invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; + + move-result-object p2 + + :goto_2 + invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_2 + + invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + add-int/lit8 v4, v3, 0x1 + + aput-object v1, p1, v3 + + move v3, v4 + + goto :goto_2 :cond_2 - const/4 p1, 0x0 + const-string p2, "result" - const/4 v0, 0x0 + invoke-static {p1, p2}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - goto :goto_1 + array-length p2, p1 + + const/4 v1, 0x0 + + :goto_3 + if-ge v1, p2, :cond_5 + + aget-object v3, p1, v1 + + move-object v4, v3 + + check-cast v4, Landroid/net/NetworkInfo; + + if-eqz v4, :cond_3 + + invoke-virtual {v4}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z + + move-result v4 + + if-ne v4, v0, :cond_3 + + const/4 v4, 0x1 + + goto :goto_4 :cond_3 + const/4 v4, 0x0 + + :goto_4 + if-eqz v4, :cond_4 + + move-object v2, v3 + + goto :goto_5 + + :cond_4 + add-int/lit8 v1, v1, 0x1 + + goto :goto_3 + + :cond_5 + :goto_5 + check-cast v2, Landroid/net/NetworkInfo; + + if-eqz v2, :cond_6 + + goto :goto_6 + + :cond_6 + const/4 v0, 0x0 + + goto :goto_6 + + :cond_7 new-instance p1, Ljava/lang/NullPointerException; const-string p2, "null cannot be cast to non-null type android.net.ConnectivityManager" @@ -442,7 +561,6 @@ .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 :catch_0 - :cond_4 - :goto_1 + :goto_6 return v0 .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 961289bd77..da0186ea0f 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -159,7 +159,7 @@ .method public getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/1260" + const-string v0, "Discord-Android/1262" 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 189dcd36a5..799fce5062 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -446,7 +446,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "40.1" + const-string v4, "41.01" aput-object v4, v2, v3 diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali index c222d5e641..59b206ad7a 100644 --- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali @@ -1902,7 +1902,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 40.1 (1260)" + const-string v0, " - 41.01 (1262)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;