From e12dcdf86ac0cbcf24e0b204a2102461902bb1b6 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 12 Apr 2022 13:49:11 +0300 Subject: [PATCH] Fixed strange twitter crash --- .../AdvertisingInfoServiceStrategy.smali | 201 ------------------ .../internal/AttributionIdentifiers.smali | 94 +------- 2 files changed, 1 insertion(+), 294 deletions(-) diff --git a/smali/smali_classes2/com/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy.smali b/smali/smali_classes2/com/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy.smali index be0084be9..f51775d6b 100644 --- a/smali/smali_classes2/com/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy.smali +++ b/smali/smali_classes2/com/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy.smali @@ -52,206 +52,5 @@ const/4 v2, 0x0 - if-ne v0, v1, :cond_0 - - .line 50 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v0 - - const-string v1, "Twitter" - - const-string v3, "AdvertisingInfoServiceStrategy cannot be called on the main thread" - - invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V - - return-object v2 - - .line 56 - :cond_0 - :try_start_0 - iget-object v0, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context; - - invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager; - - move-result-object v0 - - const-string v1, "com.android.vending" - - const/4 v3, 0x0 - - .line 57 - invoke-virtual {v0, v1, v3}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo; - :try_end_0 - .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_3 - .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2 - - .line 71 - new-instance v0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a; - - invoke-direct {v0, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;->(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V - - .line 72 - new-instance v1, Landroid/content/Intent; - - const-string v3, "com.google.android.gms.ads.identifier.service.START" - - invoke-direct {v1, v3}, Landroid/content/Intent;->(Ljava/lang/String;)V - - const-string v3, "com.google.android.gms" - - .line 73 - invoke-virtual {v1, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent; - - .line 75 - :try_start_1 - iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context; - - const/4 v4, 0x1 - - invoke-virtual {v3, v1, v0, v4}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z - - move-result v1 - :try_end_1 - .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1 - - if-eqz v1, :cond_1 - - .line 77 - :try_start_2 - new-instance v1, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b; - - .line 78 - invoke-virtual {v0}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;->a()Landroid/os/IBinder; - - move-result-object v3 - - invoke-direct {v1, v3, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->(Landroid/os/IBinder;Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V - - .line 79 - new-instance v3, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo; - - invoke-virtual {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a()Ljava/lang/String; - - move-result-object v4 - - .line 80 - invoke-static {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;)Z - - move-result v1 - - invoke-direct {v3, v4, v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo;->(Ljava/lang/String;Z)V - :try_end_2 - .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0 - .catchall {:try_start_2 .. :try_end_2} :catchall_0 - - .line 86 - :try_start_3 - iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context; - - invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - :try_end_3 - .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_1 - - return-object v3 - - :catchall_0 - move-exception v1 - - goto :goto_0 - - :catch_0 - move-exception v1 - - .line 82 - :try_start_4 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v3 - - const-string v4, "Twitter" - - const-string v5, "Exception in binding to Google Play Service to capture AdvertisingId" - - invoke-interface {v3, v4, v5, v1}, Lcom/twitter/sdk/android/core/Logger;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V - :try_end_4 - .catchall {:try_start_4 .. :try_end_4} :catchall_0 - - .line 86 - :try_start_5 - iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context; - - invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - - goto :goto_1 - - :goto_0 - iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context; - - invoke-virtual {v3, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - - throw v1 - - .line 89 - :cond_1 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v0 - - const-string v1, "Twitter" - - const-string v3, "Could not bind to Google Play Service to capture AdvertisingId" - - invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V - :try_end_5 - .catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_1 - - goto :goto_1 - - :catch_1 - move-exception v0 - - .line 93 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v1 - - const-string v3, "Twitter" - - const-string v4, "Could not bind to Google Play Service to capture AdvertisingId" - - invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V - - :goto_1 - return-object v2 - - :catch_2 - move-exception v0 - - .line 66 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v1 - - const-string v3, "Twitter" - - const-string v4, "Unable to determine if Google Play Services is available" - - invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V - - return-object v2 - - .line 60 - :catch_3 - invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger; - - move-result-object v0 - - const-string v1, "Twitter" - - const-string v3, "Unable to find Google Play Services package name" - - invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V - return-object v2 .end method diff --git a/smali/smali_classes3/com/facebook/internal/AttributionIdentifiers.smali b/smali/smali_classes3/com/facebook/internal/AttributionIdentifiers.smali index 44b556ad5..d175cb93b 100644 --- a/smali/smali_classes3/com/facebook/internal/AttributionIdentifiers.smali +++ b/smali/smali_classes3/com/facebook/internal/AttributionIdentifiers.smali @@ -657,100 +657,8 @@ .method private static d(Landroid/content/Context;)Lcom/facebook/internal/AttributionIdentifiers; .locals 5 - .line 147 - new-instance v0, Lcom/facebook/internal/AttributionIdentifiers$b; + const v1, 0x0 - const/4 v1, 0x0 - - invoke-direct {v0, v1}, Lcom/facebook/internal/AttributionIdentifiers$b;->(Lcom/facebook/internal/AttributionIdentifiers$1;)V - - .line 148 - new-instance v2, Landroid/content/Intent; - - const-string v3, "com.google.android.gms.ads.identifier.service.START" - - invoke-direct {v2, v3}, Landroid/content/Intent;->(Ljava/lang/String;)V - - const-string v3, "com.google.android.gms" - - .line 149 - invoke-virtual {v2, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent; - - const/4 v3, 0x1 - - .line 150 - invoke-virtual {p0, v2, v0, v3}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z - - move-result v2 - - if-eqz v2, :cond_0 - - .line 152 - :try_start_0 - new-instance v2, Lcom/facebook/internal/AttributionIdentifiers$a; - - invoke-virtual {v0}, Lcom/facebook/internal/AttributionIdentifiers$b;->a()Landroid/os/IBinder; - - move-result-object v3 - - invoke-direct {v2, v3}, Lcom/facebook/internal/AttributionIdentifiers$a;->(Landroid/os/IBinder;)V - - .line 153 - new-instance v3, Lcom/facebook/internal/AttributionIdentifiers; - - invoke-direct {v3}, Lcom/facebook/internal/AttributionIdentifiers;->()V - - .line 154 - invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->a()Ljava/lang/String; - - move-result-object v4 - - iput-object v4, v3, Lcom/facebook/internal/AttributionIdentifiers;->c:Ljava/lang/String; - - .line 155 - invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->b()Z - - move-result v2 - - iput-boolean v2, v3, Lcom/facebook/internal/AttributionIdentifiers;->e:Z - :try_end_0 - .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 - - .line 160 - invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - - return-object v3 - - :catchall_0 - move-exception v1 - - goto :goto_0 - - :catch_0 - move-exception v2 - - :try_start_1 - const-string v3, "android_id" - - .line 158 - invoke-static {v3, v2}, Lcom/facebook/internal/Utility;->a(Ljava/lang/String;Ljava/lang/Exception;)V - :try_end_1 - .catchall {:try_start_1 .. :try_end_1} :catchall_0 - - .line 160 - invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - - goto :goto_1 - - :goto_0 - invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V - - .line 161 - throw v1 - - :cond_0 - :goto_1 return-object v1 .end method