notrack: fix an issue where I accidentally nop'd an incorrect func
This commit is contained in:
parent
77a2e8ae2f
commit
af3340e5d8
|
|
@ -1,6 +1,6 @@
|
|||
diff -crB com.discord-968-base/AndroidManifest.xml com.discord-968/AndroidManifest.xml
|
||||
*** com.discord-968-base/AndroidManifest.xml 2019-10-08 02:17:31.347153020 +0300
|
||||
--- com.discord-968/AndroidManifest.xml 2019-10-08 02:18:05.524014484 +0300
|
||||
--- com.discord-968/AndroidManifest.xml 2019-10-08 05:25:19.447405051 +0300
|
||||
***************
|
||||
*** 113,120 ****
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
|
|
@ -20,10 +20,9 @@ diff -crB com.discord-968-base/AndroidManifest.xml com.discord-968/AndroidManife
|
|||
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
||||
<service android:exported="false" android:name="com.google.firebase.messaging.FirebaseMessagingService">
|
||||
<intent-filter android:priority="-500">
|
||||
Only in com.discord-968: AndroidManifest.xml.orig
|
||||
diff -crB com.discord-968-base/res/values/strings.xml com.discord-968/res/values/strings.xml
|
||||
*** com.discord-968-base/res/values/strings.xml 2019-10-08 02:17:17.370406687 +0300
|
||||
--- com.discord-968/res/values/strings.xml 2019-10-08 02:18:05.527347837 +0300
|
||||
--- com.discord-968/res/values/strings.xml 2019-10-08 05:25:19.447405051 +0300
|
||||
***************
|
||||
*** 997,1003 ****
|
||||
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
|
||||
|
|
@ -41,10 +40,9 @@ diff -crB com.discord-968-base/res/values/strings.xml com.discord-968/res/values
|
|||
<string name="coming_soon">Coming Soon</string>
|
||||
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
|
||||
<string name="coming_soon_title">COMING SOON!</string>
|
||||
Only in com.discord-968/res/values: strings.xml.orig
|
||||
diff -crB com.discord-968-base/smali/com/crashlytics/android/answers/ab.smali com.discord-968/smali/com/crashlytics/android/answers/ab.smali
|
||||
*** com.discord-968-base/smali/com/crashlytics/android/answers/ab.smali 2019-10-08 02:17:18.593746993 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/answers/ab.smali 2019-10-08 02:21:19.138660433 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/answers/ab.smali 2019-10-08 05:25:19.450738404 +0300
|
||||
***************
|
||||
*** 38,205 ****
|
||||
|
||||
|
|
@ -223,11 +221,9 @@ diff -crB com.discord-968-base/smali/com/crashlytics/android/answers/ab.smali co
|
|||
|
||||
! return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/crashlytics/android/answers: ab.smali.orig
|
||||
Only in com.discord-968/smali/com/crashlytics/android/answers: ab.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/crashlytics/android/core/ah.smali com.discord-968/smali/com/crashlytics/android/core/ah.smali
|
||||
*** com.discord-968-base/smali/com/crashlytics/android/core/ah.smali 2019-10-08 02:17:18.600413698 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/core/ah.smali 2019-10-08 02:21:11.125248838 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/core/ah.smali 2019-10-08 05:25:19.450738404 +0300
|
||||
***************
|
||||
*** 329,465 ****
|
||||
|
||||
|
|
@ -375,11 +371,9 @@ diff -crB com.discord-968-base/smali/com/crashlytics/android/core/ah.smali com.d
|
|||
|
||||
! return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/crashlytics/android/core: ah.smali.orig
|
||||
Only in com.discord-968/smali/com/crashlytics/android/core: ah.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/crashlytics/android/core/x.smali com.discord-968/smali/com/crashlytics/android/core/x.smali
|
||||
*** com.discord-968-base/smali/com/crashlytics/android/core/x.smali 2019-10-08 02:17:18.613747107 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/core/x.smali 2019-10-08 02:21:26.708734365 +0300
|
||||
--- com.discord-968/smali/com/crashlytics/android/core/x.smali 2019-10-08 05:25:19.450738404 +0300
|
||||
***************
|
||||
*** 31,371 ****
|
||||
|
||||
|
|
@ -731,11 +725,9 @@ diff -crB com.discord-968-base/smali/com/crashlytics/android/core/x.smali com.di
|
|||
|
||||
! return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/crashlytics/android/core: x.smali.orig
|
||||
Only in com.discord-968/smali/com/crashlytics/android/core: x.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2019-10-08 02:17:18.900415408 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2019-10-08 02:21:34.972148400 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2019-10-08 05:25:19.450738404 +0300
|
||||
***************
|
||||
*** 42,95 ****
|
||||
.end method
|
||||
|
|
@ -807,11 +799,9 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfi
|
|||
return-void
|
||||
.end method
|
||||
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.orig
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfig.smali com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfig.smali 2019-10-08 02:17:18.900415408 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig.smali 2019-10-08 02:21:41.735540137 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AdjustConfig.smali 2019-10-08 05:25:19.454071756 +0300
|
||||
***************
|
||||
*** 12,18 ****
|
||||
|
||||
|
|
@ -958,11 +948,9 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AdjustConfi
|
|||
|
||||
return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AdjustConfig.smali.orig
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AdjustConfig.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali com.discord-968/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2019-10-08 02:17:18.900415408 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2019-10-08 02:18:05.530681189 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2019-10-08 05:25:19.454071756 +0300
|
||||
***************
|
||||
*** 15,23 ****
|
||||
|
||||
|
|
@ -1033,7 +1021,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsTr
|
|||
.end method
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord-968/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2019-10-08 02:17:18.903748760 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2019-10-08 02:22:33.702558198 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2019-10-08 05:25:19.454071756 +0300
|
||||
***************
|
||||
*** 173,179 ****
|
||||
.method private final setBaselineProperties()V
|
||||
|
|
@ -1573,11 +1561,9 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticSup
|
|||
|
||||
return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali com.discord-968/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2019-10-08 02:17:18.903748760 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2019-10-08 02:19:08.678761662 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2019-10-08 05:25:56.400954133 +0300
|
||||
***************
|
||||
*** 71,79 ****
|
||||
.method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
|
||||
|
|
@ -1591,7 +1577,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
|
||||
--- 71,76 ----
|
||||
***************
|
||||
*** 87,221 ****
|
||||
*** 87,184 ****
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized drainEventsQueue()V
|
||||
|
|
@ -1690,44 +1676,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
.end method
|
||||
|
||||
.method private final getCanDrain()Z
|
||||
! .locals 2
|
||||
!
|
||||
! .line 99
|
||||
! iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
|
||||
!
|
||||
! check-cast v0, Ljava/util/Collection;
|
||||
!
|
||||
! invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! xor-int/2addr v0, v1
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! iget-boolean v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->fingerprinted:Z
|
||||
!
|
||||
! if-nez v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isAuthed$app_productionDiscordExternalRelease()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! :cond_0
|
||||
! return v1
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v0, 0x0
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public static synthetic isEventThrottled$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/lang/Long;ZILjava/lang/Object;)Z
|
||||
--- 84,98 ----
|
||||
--- 84,92 ----
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized drainEventsQueue()V
|
||||
|
|
@ -1737,12 +1686,6 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
.end method
|
||||
|
||||
.method private final getCanDrain()Z
|
||||
! .locals 0
|
||||
|
||||
! return-void
|
||||
.end method
|
||||
|
||||
.method public static synthetic isEventThrottled$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/lang/Long;ZILjava/lang/Object;)Z
|
||||
***************
|
||||
*** 408,441 ****
|
||||
.method public static synthetic setTrackingData$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;ZILjava/lang/Object;)V
|
||||
|
|
@ -1779,7 +1722,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
return-void
|
||||
.end method
|
||||
|
||||
--- 285,296 ----
|
||||
--- 316,327 ----
|
||||
***************
|
||||
*** 576,816 ****
|
||||
.method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
|
||||
|
|
@ -2023,7 +1966,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
- :cond_1
|
||||
return-void
|
||||
.end method
|
||||
--- 431,453 ----
|
||||
--- 462,484 ----
|
||||
.method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
|
||||
.locals 0
|
||||
|
||||
|
|
@ -2047,11 +1990,9 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/analytics/AnalyticsUt
|
|||
|
||||
return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.orig
|
||||
Only in com.discord-968/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.rej
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali com.discord-968/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2019-10-08 02:17:18.933748931 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2019-10-08 02:18:05.530681189 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2019-10-08 05:25:19.454071756 +0300
|
||||
***************
|
||||
*** 43,49 ****
|
||||
|
||||
|
|
@ -2071,7 +2012,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/integrations/SpotifyH
|
|||
|
||||
diff -crB com.discord-968-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali com.discord-968/smali/com/discord/utilities/receiver/CampaignReceiver.smali
|
||||
*** com.discord-968-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2019-10-08 02:17:18.957082398 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2019-10-08 02:18:05.530681189 +0300
|
||||
--- com.discord-968/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2019-10-08 05:25:19.454071756 +0300
|
||||
***************
|
||||
*** 16,49 ****
|
||||
|
||||
|
|
@ -2118,7 +2059,7 @@ diff -crB com.discord-968-base/smali/com/discord/utilities/receiver/CampaignRece
|
|||
.end method
|
||||
diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/a.smali
|
||||
*** com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali 2019-10-08 02:17:20.360423730 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/a.smali 2019-10-08 02:18:05.530681189 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/a.smali 2019-10-08 05:25:19.457405109 +0300
|
||||
***************
|
||||
*** 189,195 ****
|
||||
|
||||
|
|
@ -2136,10 +2077,9 @@ diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali
|
|||
|
||||
.line 142
|
||||
invoke-virtual {p1, v0, v1}, Lio/fabric/sdk/android/a/e/d;->X(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/b: a.smali.orig
|
||||
diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/h.smali com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/h.smali
|
||||
*** com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/h.smali 2019-10-08 02:17:20.360423730 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/h.smali 2019-10-08 02:18:27.685230183 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/b/h.smali 2019-10-08 05:25:19.457405109 +0300
|
||||
***************
|
||||
*** 22,36 ****
|
||||
.end method
|
||||
|
|
@ -2165,11 +2105,9 @@ diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/b/h.smali
|
|||
|
||||
return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/b: h.smali.orig
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/b: h.smali.rej
|
||||
diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/a.smali
|
||||
*** com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali 2019-10-08 02:17:20.370423787 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/a.smali 2019-10-08 02:18:24.104120384 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/a.smali 2019-10-08 05:25:19.457405109 +0300
|
||||
***************
|
||||
*** 343,571 ****
|
||||
|
||||
|
|
@ -2409,11 +2347,9 @@ diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali
|
|||
|
||||
! return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/g: a.smali.orig
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/g: a.smali.rej
|
||||
diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/l.smali
|
||||
*** com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali 2019-10-08 02:17:20.370423787 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/l.smali 2019-10-08 02:18:17.730750725 +0300
|
||||
--- com.discord-968/smali_classes2/io/fabric/sdk/android/a/g/l.smali 2019-10-08 05:25:19.457405109 +0300
|
||||
***************
|
||||
*** 115,502 ****
|
||||
|
||||
|
|
@ -2812,6 +2748,4 @@ diff -crB com.discord-968-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali
|
|||
|
||||
! return-void
|
||||
.end method
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/g: l.smali.orig
|
||||
Only in com.discord-968/smali_classes2/io/fabric/sdk/android/a/g: l.smali.rej
|
||||
|
||||
|
|
|
|||
Reference in New Issue