From aad4591711a1d5d414a334fce48070506f8687c4 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Fri, 25 Jan 2019 11:54:04 +0300 Subject: [PATCH] notrack: Push some changes I forgot to push --- patches/notrack/835.patch | 238 ++++++++++++++++++-------------------- 1 file changed, 115 insertions(+), 123 deletions(-) diff --git a/patches/notrack/835.patch b/patches/notrack/835.patch index b527b7c60b..12b752853f 100644 --- a/patches/notrack/835.patch +++ b/patches/notrack/835.patch @@ -1554,147 +1554,139 @@ diff -crB -x dist -x build com.discord-835-base/smali/com/discord/utilities/inte return-void .end method -*** com.discord-835-base/smali/com/discord/utilities/analytics/AdjustConfig.smali 2019-01-25 10:57:34.539249031 +0300 ---- com.discord-835/smali/com/discord/utilities/analytics/AdjustConfig.smali 2019-01-25 11:33:23.561995030 +0300 +*** com.discord-835-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2019-01-25 10:57:34.539249031 +0300 +--- com.discord-835/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2019-01-25 11:32:15.345030480 +0300 *************** -*** 12,18 **** +*** 42,95 **** + .end method + .method public final onActivityPaused(Landroid/app/Activity;)V +! .locals 1 - # static fields -! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "d8fcx8xdmrr4" +- .line 1050 +- invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k; +- +- move-result-object p1 +- +- const/4 v0, 0x0 +- +- .line 1396 +- invoke-virtual {p1, v0}, Lcom/adjust/sdk/k;->e(Ljava/lang/String;)Z +- +- move-result v0 +- +- if-eqz v0, :cond_0 +- +- .line 1094 +- iget-object p1, p1, Lcom/adjust/sdk/k;->dC:Lcom/adjust/sdk/v; +- +- invoke-interface {p1}, Lcom/adjust/sdk/v;->onPause()V +- +- :cond_0 + return-void + .end method - .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String; - ---- 12,18 ---- - - - # static fields -! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "aaaaaaaaaaaa" - - .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String; - -*************** -*** 53,59 **** - .line 34 - new-instance v0, Lcom/adjust/sdk/AdjustConfig; - -! const-string v1, "d8fcx8xdmrr4" - - sget-object v2, Lcom/discord/utilities/analytics/AdjustConfig;->ADJUST_ENVIRONMENT:Ljava/lang/String; - ---- 53,59 ---- - .line 34 - new-instance v0, Lcom/adjust/sdk/AdjustConfig; - -! const-string v1, "aaaaaaaaaaaa" - - sget-object v2, Lcom/discord/utilities/analytics/AdjustConfig;->ADJUST_ENVIRONMENT:Ljava/lang/String; - -*************** -*** 73,171 **** - - # virtual methods - .method public final init(Landroid/app/Application;Z)V -! .locals 2 + .method public final onActivityResumed(Landroid/app/Activity;)V +! .locals 1 ! -! const-string v0, "application" -! -! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V -! -! if-eqz p2, :cond_0 -! -! return-void -! -! .line 28 -! :cond_0 -! move-object p2, p1 -! -! check-cast p2, Landroid/content/Context; -! -! invoke-direct {p0, p2}, Lcom/discord/utilities/analytics/AdjustConfig;->getAdjustConfig(Landroid/content/Context;)Lcom/adjust/sdk/AdjustConfig; -! -! move-result-object p2 -! -! .line 1035 +! .line 2045 ! invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k; ! -! move-result-object v0 +! move-result-object p1 ! -! .line 1047 -! iget-object v1, v0, Lcom/adjust/sdk/k;->dC:Lcom/adjust/sdk/v; +! const/4 v0, 0x0 ! -! if-eqz v1, :cond_1 +! .line 2396 +! invoke-virtual {p1, v0}, Lcom/adjust/sdk/k;->e(Ljava/lang/String;)Z ! -! .line 1048 -! invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x; +! move-result v0 ! -! move-result-object p2 +! if-eqz v0, :cond_0 ! -! const-string v0, "Adjust already initialized" +! .line 2083 +! iget-object p1, p1, Lcom/adjust/sdk/k;->dC:Lcom/adjust/sdk/v; ! -! const/4 v1, 0x0 -! -! new-array v1, v1, [Ljava/lang/Object; -! -! invoke-interface {p2, v0, v1}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V -! -! goto :goto_0 -! -! .line 1052 -! :cond_1 -! iget-object v1, v0, Lcom/adjust/sdk/k;->do:Ljava/util/List; -! -! iput-object v1, p2, Lcom/adjust/sdk/AdjustConfig;->do:Ljava/util/List; -! -! .line 1053 -! iget-object v1, v0, Lcom/adjust/sdk/k;->pushToken:Ljava/lang/String; -! -! iput-object v1, p2, Lcom/adjust/sdk/AdjustConfig;->pushToken:Ljava/lang/String; -! -! .line 1054 -! iget-object v1, v0, Lcom/adjust/sdk/k;->dq:Ljava/lang/Boolean; -! -! iput-object v1, p2, Lcom/adjust/sdk/AdjustConfig;->dq:Ljava/lang/Boolean; -! -! .line 1055 -! iget-boolean v1, v0, Lcom/adjust/sdk/k;->dr:Z -! -! iput-boolean v1, p2, Lcom/adjust/sdk/AdjustConfig;->dr:Z -! -! .line 1057 -! invoke-static {p2}, Lcom/adjust/sdk/j;->b(Lcom/adjust/sdk/AdjustConfig;)Lcom/adjust/sdk/v; -! -! move-result-object v1 -! -! iput-object v1, v0, Lcom/adjust/sdk/k;->dC:Lcom/adjust/sdk/v; -! -! .line 1059 -! iget-object p2, p2, Lcom/adjust/sdk/AdjustConfig;->context:Landroid/content/Context; -! -! .line 1472 -! new-instance v1, Lcom/adjust/sdk/k$2; -! -! invoke-direct {v1, v0, p2}, Lcom/adjust/sdk/k$2;->(Lcom/adjust/sdk/k;Landroid/content/Context;)V -! -! .line 1480 -! invoke-static {v1}, Lcom/adjust/sdk/ay;->a(Ljava/lang/Runnable;)V -! -! .line 30 -! :goto_0 -! new-instance p2, Lcom/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener; -! -! invoke-direct {p2}, Lcom/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener;->()V -! -! check-cast p2, Landroid/app/Application$ActivityLifecycleCallbacks; -! -! invoke-virtual {p1, p2}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V +! invoke-interface {p1}, Lcom/adjust/sdk/v;->onResume()V + +- :cond_0 + return-void + .end method + +--- 42,55 ---- + .end method + + .method public final onActivityPaused(Landroid/app/Activity;)V +! .locals 0 return-void .end method ---- 73,79 ---- + + .method public final onActivityResumed(Landroid/app/Activity;)V +! .locals 0 + + return-void + .end method + +diff -crB -x dist -x build com.discord-835-a/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali com.discord-835/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali +*** com.discord-835-a/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2019-01-25 11:52:07.470235954 +0300 +--- com.discord-835/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2019-01-25 11:33:59.212150702 +0300 +*************** +*** 15,21 **** + + + # static fields +! .field private static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "o9bacq" + + .field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker; + +--- 15,21 ---- + + + # static fields +! .field private static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "aaaaaa" + + .field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker; + +*************** +*** 46,79 **** # virtual methods - .method public final init(Landroid/app/Application;Z)V + .method public final trackRegister()V +! .locals 3 +! +! .line 894 +! new-instance v0, Lcom/adjust/sdk/g; +! +! const-string v1, "o9bacq" +! +! invoke-direct {v0, v1}, Lcom/adjust/sdk/g;->(Ljava/lang/String;)V +! +! .line 1040 +! invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k; +! +! move-result-object v1 +! +! const/4 v2, 0x0 +! +! .line 1396 +! invoke-virtual {v1, v2}, Lcom/adjust/sdk/k;->e(Ljava/lang/String;)Z +! +! move-result v2 +! +! if-eqz v2, :cond_0 +! +! .line 1072 +! iget-object v1, v1, Lcom/adjust/sdk/k;->dC:Lcom/adjust/sdk/v; +! +! invoke-interface {v1, v0}, Lcom/adjust/sdk/v;->a(Lcom/adjust/sdk/g;)V + +- :cond_0 + return-void + .end method +--- 46,52 ---- + + # virtual methods + .method public final trackRegister()V ! .locals 0 return-void