From 10d9822b740383ad7a04beb72e3ed9dd96b04d15 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Sep 2020 19:41:11 +0000 Subject: [PATCH] Changes of com.discord v1267 --- com.discord/apktool.yml | 6 +- com.discord/original/AndroidManifest.xml | Bin 39520 -> 39520 bytes com.discord/res/values/strings.xml | 2 +- .../androidx/transition/Visibility.smali | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../stores/StoreStream$deferredInit$1.smali | 4 +- .../accessibility/AccessibilityMonitor.smali | 4 +- .../analytics/AnalyticSuperProperties.smali | 6 +- ...itor$registerBroadcastAirplaneMode$1.smali | 20 ++++- ...roadcastConnectivityNetworkMonitor$1.smali | 20 ++++- ...vityNetworkMonitor$networkCallback$1.smali | 80 +++++++++++++++++- .../utilities/networking/NetworkMonitor.smali | 70 ++++++++++++--- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- com.discord/smali/f/a/l/b$a.smali | 20 ++++- .../widgets/settings/WidgetSettings.smali | 2 +- 17 files changed, 213 insertions(+), 35 deletions(-) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 924a0e573a..c1036fdf2a 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1266.apk +apkFileName: com.discord-1267.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1266' - versionName: '41.02' + versionCode: '1267' + versionName: '41.03' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 27ab4255d1f932c0524d9dd0ebc5f279ea0961cd..f8d3755df8bb68b55bb1f5f629f4516ba0529ce6 100644 GIT binary patch delta 23 fcmaE`h3UZ-rVR;PjK-T2xzsHgKX2}Iz8(eub_WTW delta 23 fcmaE`h3UZ-rVR;Pj7FOixzsHgKW*-Gz8(eub@U0B diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index f500eecebf..708bca0df2 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 - a245948bd0a64c90977d934a3b9779fe + 776116a90a6e44299f9a7b157686e00d Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/androidx/transition/Visibility.smali b/com.discord/smali/androidx/transition/Visibility.smali index 034707fdc3..4bbaa44507 100644 --- a/com.discord/smali/androidx/transition/Visibility.smali +++ b/com.discord/smali/androidx/transition/Visibility.smali @@ -82,7 +82,7 @@ check-cast p2, Landroid/content/res/XmlResourceParser; - const-string v0, "transitionVisibilityMode" + const-string/jumbo v0, "transitionVisibilityMode" const/4 v1, 0x0 diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 9ad61aceaa..4e9ad9a9b6 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/1266" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1267" -.field public static final VERSION_CODE:I = 0x4f2 +.field public static final VERSION_CODE:I = 0x4f3 -.field public static final VERSION_NAME:Ljava/lang/String; = "41.02" +.field public static final VERSION_NAME:Ljava/lang/String; = "41.03" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 892bcf64b5..8b395f1733 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, 0x4f2 + const/16 v0, 0x4f3 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali index 647b8c224a..d2bb73a0f6 100644 --- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali +++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali @@ -84,7 +84,9 @@ iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application; - invoke-direct {v0, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->(Landroid/content/Context;)V + sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog; + + invoke-direct {v0, v1, v2}, Lcom/discord/utilities/networking/NetworkMonitor;->(Landroid/content/Context;Lcom/discord/utilities/logging/Logger;)V iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream; diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali index 5ad6a535e6..305c71f80f 100644 --- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali +++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali @@ -182,7 +182,7 @@ iput-object v0, p0, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->contentResolver:Landroid/content/ContentResolver; - const-string v0, "transition_animation_scale" + const-string/jumbo v0, "transition_animation_scale" invoke-static {v0}, Landroid/provider/Settings$Global;->getUriFor(Ljava/lang/String;)Landroid/net/Uri; @@ -280,7 +280,7 @@ if-eqz v1, :cond_2 - const-string v2, "transition_animation_scale" + const-string/jumbo v2, "transition_animation_scale" invoke-static {v1, v2}, Landroid/provider/Settings$Global;->getString(Landroid/content/ContentResolver;Ljava/lang/String;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index dea6aedec1..58d7e74d21 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/1266" + const-string v4, "Discord-Android/1267" 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, 0x4f2 + const/16 v2, 0x4f3 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "41.02" + const-string v4, "41.03" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali index 5c7f846bdc..425b71f6c0 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1.smali @@ -37,7 +37,7 @@ # virtual methods .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V - .locals 2 + .locals 6 const-string v0, "context" @@ -49,6 +49,24 @@ iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p2}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Got airplane mode broadcast intent." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastAirplaneMode$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + const/4 v0, 0x0 const/4 v1, 0x2 diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali index aa1edcba69..045b37c79e 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1.smali @@ -37,7 +37,7 @@ # virtual methods .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V - .locals 1 + .locals 7 const-string v0, "context" @@ -49,6 +49,24 @@ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v1 + + const-string v2, "[NetworkMonitor]" + + const-string v3, "Got connectivity action broadcast intent." + + const/4 v4, 0x0 + + const/4 v5, 0x4 + + const/4 v6, 0x0 + + invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerBroadcastConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {v0, p1, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V return-void diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali index 0de5ff8d38..7143b27f7f 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali @@ -43,7 +43,7 @@ # virtual methods .method public onAvailable(Landroid/net/Network;)V - .locals 3 + .locals 6 const-string v0, "network" @@ -51,6 +51,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onAvailable fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v1, 0x0 @@ -63,7 +81,7 @@ .end method .method public onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V - .locals 2 + .locals 6 const-string v0, "network" @@ -75,6 +93,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onCapabilitiesChanged fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v0, 0x0 @@ -87,7 +123,7 @@ .end method .method public onLost(Landroid/net/Network;)V - .locals 3 + .locals 6 const-string v0, "network" @@ -95,6 +131,24 @@ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + invoke-static {p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v0 + + const-string v1, "[NetworkMonitor]" + + const-string v2, "Network callback, onLost fired." + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + + iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context; const/4 v1, 0x0 @@ -107,7 +161,25 @@ .end method .method public onUnavailable()V - .locals 4 + .locals 7 + + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; + + invoke-static {v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + + move-result-object v1 + + const-string v2, "[NetworkMonitor]" + + const-string v3, "Network callback, onUnavailable fired." + + const/4 v4, 0x0 + + const/4 v5, 0x4 + + const/4 v6, 0x0 + + invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor; diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali index f707d1a71e..9cb29f6bfb 100644 --- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali +++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali @@ -12,6 +12,8 @@ # instance fields +.field public logger:Lcom/discord/utilities/logging/Logger; + .field public final networkStateSubject:Lrx/subjects/BehaviorSubject; .annotation system Ldalvik/annotation/Signature; value = { @@ -24,34 +26,56 @@ # direct methods -.method public constructor (Landroid/content/Context;)V - .locals 2 +.method public constructor (Landroid/content/Context;Lcom/discord/utilities/logging/Logger;)V + .locals 1 const-string v0, "context" invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v0, "logger" + + invoke-static {p2, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0}, Ljava/lang/Object;->()V - const/4 v0, 0x0 + iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; - const/4 v1, 0x2 + const/4 p2, 0x0 - invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State; + const/4 v0, 0x2 - move-result-object v0 + invoke-static {p0, p1, p2, v0, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State; - invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + move-result-object p2 - move-result-object v0 + invoke-static {p2}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; - iput-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject; + move-result-object p2 + + iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject; invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->registerConnectivityNetworkMonitor(Landroid/content/Context;)V return-void .end method +.method public static final synthetic access$getLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;)Lcom/discord/utilities/logging/Logger; + .locals 0 + + iget-object p0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + return-object p0 +.end method + +.method public static final synthetic access$setLogger$p(Lcom/discord/utilities/networking/NetworkMonitor;Lcom/discord/utilities/logging/Logger;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + return-void +.end method + .method public static final synthetic access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V .locals 0 @@ -61,7 +85,7 @@ .end method .method private final getState(Landroid/content/Context;Landroid/content/Intent;)Lcom/discord/utilities/networking/NetworkMonitor$State; - .locals 1 + .locals 6 sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils; @@ -92,6 +116,32 @@ sget-object p1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE:Lcom/discord/utilities/networking/NetworkMonitor$State; :goto_0 + iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->logger:Lcom/discord/utilities/logging/Logger; + + new-instance p2, Ljava/lang/StringBuilder; + + invoke-direct {p2}, Ljava/lang/StringBuilder;->()V + + const-string v1, "Updating network state to " + + invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v2 + + const/4 v3, 0x0 + + const/4 v4, 0x4 + + const/4 v5, 0x0 + + const-string v1, "[NetworkMonitor]" + + invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + return-object p1 .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 652d0c9b12..06db7fdc41 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/1266" + const-string v0, "Discord-Android/1267" 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 c574be088c..5968e634b3 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, "41.02" + const-string v4, "41.03" aput-object v4, v2, v3 diff --git a/com.discord/smali/f/a/l/b$a.smali b/com.discord/smali/f/a/l/b$a.smali index 1503815232..2eade34879 100644 --- a/com.discord/smali/f/a/l/b$a.smali +++ b/com.discord/smali/f/a/l/b$a.smali @@ -35,13 +35,31 @@ # virtual methods .method public final run()V - .locals 1 + .locals 3 + :try_start_0 iget-object v0, p0, Lf/a/l/b$a;->d:Lf/a/l/b; iget-object v0, v0, Lf/a/l/b;->b:Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat; invoke-virtual {v0}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->start()V + :try_end_0 + .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0 + goto :goto_0 + + :catch_0 + move-exception v0 + + sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + + const/16 v2, 0x17 + + if-gt v1, v2, :cond_0 + + :goto_0 return-void + + :cond_0 + throw v0 .end method 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 65ad9ab71e..a1a81fad49 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, " - 41.02 (1266)" + const-string v0, " - 41.03 (1267)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;