cutthecord/patches/notrack/1132.patch
2020-05-08 14:34:21 +01:00

1511 lines
56 KiB
Diff

diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml 2020-05-08 14:21:12.745416341 +0100
--- to/AndroidManifest.xml 2020-05-08 14:29:42.363723556 +0100
***************
*** 1,4 ****
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1132" platformBuildVersionName="22-alpha1">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- 1,4 ----
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1132CTCBUILD" platformBuildVersionName="22-alpha1-cutthecord-CTCBUILD">
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
***************
*** 20,31 ****
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
--- 20,31 ----
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
! <permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
***************
*** 114,120 ****
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
<intent-filter>
<action android:name="com.discord.intent.action.CONNECT"/>
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
--- 114,120 ----
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
<intent-filter>
<action android:name="com.discord.intent.action.CONNECT"/>
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
***************
*** 144,155 ****
</receiver>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
</provider>
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
! <meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
! <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
<service android:directBootAware="true" android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
--- 144,155 ----
</receiver>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
</provider>
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
! <meta-data android:name="io.fabric.ApiKey" android:value="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"/>
! <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"/>
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
<service android:directBootAware="true" android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
***************
*** 161,167 ****
<meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
</service>
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
--- 161,167 ----
<meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
</service>
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
***************
*** 176,182 ****
</intent-filter>
</receiver>
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
<intent-filter>
--- 176,182 ----
</intent-filter>
</receiver>
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
<intent-filter>
***************
*** 186,192 ****
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
--- 186,192 ----
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
***************
*** 226,239 ****
</intent-filter>
</receiver>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
<service android:exported="false" android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery">
<meta-data android:name="backend:com.google.android.datatransport.cct.CctBackendFactory" android:value="cct"/>
</service>
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
! </manifest>
\ No newline at end of file
--- 226,239 ----
</intent-filter>
</receiver>
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
<service android:exported="false" android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery">
<meta-data android:name="backend:com.google.android.datatransport.cct.CctBackendFactory" android:value="cct"/>
</service>
<service android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService" android:permission="android.permission.BIND_JOB_SERVICE"/>
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
</application>
! </manifest>
diff -crB from/apktool.yml to/apktool.yml
*** from/apktool.yml 2020-05-08 14:20:55.799591501 +0100
--- to/apktool.yml 2020-05-08 14:29:25.335923282 +0100
***************
*** 190,194 ****
tag: null
version: 2.4.2-f3136b-SNAPSHOT
versionInfo:
! versionCode: '1132'
! versionName: 22-alpha1
--- 190,194 ----
tag: null
version: 2.4.2-f3136b-SNAPSHOT
versionInfo:
! versionCode: '1132CTCBUILD'
! versionName: '22-alpha1-cutthecord-CTCBUILD'
diff -crB from/res/values/strings.xml to/res/values/strings.xml
*** from/res/values/strings.xml 2020-05-08 14:20:51.075640107 +0100
--- to/res/values/strings.xml 2020-05-08 14:29:42.363723556 +0100
***************
*** 1057,1063 ****
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse">Collapse</string>
<string name="collapse_category">Collapse Category</string>
! <string name="com.crashlytics.android.build_id">4bff2f59-00dc-4215-a84f-938dfec03f1f</string>
<string name="coming_soon">Coming Soon</string>
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
<string name="command_me_description">Displays text with emphasis.</string>
--- 1057,1063 ----
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse">Collapse</string>
<string name="collapse_category">Collapse Category</string>
! <string name="com.crashlytics.android.build_id">00000000-0000-0000-0000-000000000000</string>
<string name="coming_soon">Coming Soon</string>
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
<string name="command_me_description">Displays text with emphasis.</string>
***************
*** 1389,1395 ****
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
<string name="disconnect_account_title">Disconnect %1$s</string>
<string name="disconnect_from_voice">Disconnect from Voice</string>
! <string name="discord">Discord</string>
<string name="discord_desc_long">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
<string name="discord_desc_short">Team voice &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
--- 1389,1395 ----
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
<string name="disconnect_account_title">Disconnect %1$s</string>
<string name="disconnect_from_voice">Disconnect from Voice</string>
! <string name="discord">CTCNAME</string>
<string name="discord_desc_long">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
<string name="discord_desc_short">Team voice &amp; text chat</string>
<string name="discord_gg">discord.gg/</string>
***************
*** 3790,3796 ****
<string name="notification_reply_failed">Failed to reply to %1$s</string>
<string name="notification_reply_success">Replied to %1$s</string>
<string name="notification_settings">Notification Settings</string>
! <string name="notification_title_discord">Discord</string>
<string name="notification_title_start_game">"Somebody Playin'"</string>
<string name="notifications">Notifications</string>
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
--- 3790,3796 ----
<string name="notification_reply_failed">Failed to reply to %1$s</string>
<string name="notification_reply_success">Replied to %1$s</string>
<string name="notification_settings">Notification Settings</string>
! <string name="notification_title_discord">CTCNAME</string>
<string name="notification_title_start_game">"Somebody Playin'"</string>
<string name="notifications">Notifications</string>
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
***************
*** 5119,5125 ****
<string name="subscriptions_title">Subscriptions</string>
<string name="suggestions">Suggestions</string>
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
! <string name="support">Support</string>
<string name="suppress_all_embeds">Remove all embeds</string>
<string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
<string name="suppress_embed_confirm">Remove All Embeds</string>
--- 5119,5125 ----
<string name="subscriptions_title">Subscriptions</string>
<string name="suggestions">Suggestions</string>
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
! <string name="support">CutTheCord Repo</string>
<string name="suppress_all_embeds">Remove all embeds</string>
<string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
<string name="suppress_embed_confirm">Remove All Embeds</string>
diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
*** from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-05-08 14:20:52.929621043 +0100
--- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-05-08 14:30:23.863234861 +0100
***************
*** 42,135 ****
.end method
.method public onActivityPaused(Landroid/app/Activity;)V
! .locals 2
- .line 1
- invoke-static {}, Ls/a/b/b/a;->c()Lf/c/a/c0;
-
- move-result-object p1
-
- .line 2
- invoke-virtual {p1}, Lf/c/a/c0;->a()Z
-
- move-result v0
-
- if-nez v0, :cond_0
-
- goto :goto_0
-
- .line 3
- :cond_0
- iget-object p1, p1, Lf/c/a/c0;->d:Lf/c/a/s0;
-
- check-cast p1, Lf/c/a/g;
-
- .line 4
- iget-object v0, p1, Lf/c/a/g;->h:Lf/c/a/g$j;
-
- const/4 v1, 0x1
-
- iput-boolean v1, v0, Lf/c/a/g$j;->c:Z
-
- .line 5
- iget-object v0, p1, Lf/c/a/g;->a:Lf/c/a/p0;
-
- new-instance v1, Lf/c/a/n;
-
- invoke-direct {v1, p1}, Lf/c/a/n;-><init>(Lf/c/a/g;)V
-
- .line 6
- iget-object p1, v0, Lf/c/a/p0;->a:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
- invoke-virtual {p1, v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
-
- :goto_0
return-void
.end method
.method public onActivityResumed(Landroid/app/Activity;)V
! .locals 2
!
! .line 1
! invoke-static {}, Ls/a/b/b/a;->c()Lf/c/a/c0;
!
! move-result-object p1
!
! .line 2
! invoke-virtual {p1}, Lf/c/a/c0;->a()Z
!
! move-result v0
!
! if-nez v0, :cond_0
!
! goto :goto_0
!
! .line 3
! :cond_0
! iget-object p1, p1, Lf/c/a/c0;->d:Lf/c/a/s0;
!
! check-cast p1, Lf/c/a/g;
!
! .line 4
! iget-object v0, p1, Lf/c/a/g;->h:Lf/c/a/g$j;
!
! const/4 v1, 0x0
!
! iput-boolean v1, v0, Lf/c/a/g$j;->c:Z
!
! .line 5
! iget-object v0, p1, Lf/c/a/g;->a:Lf/c/a/p0;
!
! new-instance v1, Lf/c/a/j;
!
! invoke-direct {v1, p1}, Lf/c/a/j;-><init>(Lf/c/a/g;)V
!
! .line 6
! iget-object p1, v0, Lf/c/a/p0;->a:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
!
! invoke-virtual {p1, v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
- :goto_0
return-void
.end method
--- 42,55 ----
.end method
.method public onActivityPaused(Landroid/app/Activity;)V
! .locals 0
return-void
.end method
.method public onActivityResumed(Landroid/app/Activity;)V
! .locals 0
return-void
.end method
diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali/com/discord/utilities/analytics/AdjustConfig.smali
*** from/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-05-08 14:20:52.929621043 +0100
--- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-05-08 14:29:42.365723534 +0100
***************
*** 12,18 ****
# static fields
! .field public static final ADJUST_APP_TOKEN:Ljava/lang/String; = "d8fcx8xdmrr4"
.field public static final ADJUST_ENVIRONMENT:Ljava/lang/String;
--- 12,18 ----
# static fields
! .field public static final ADJUST_APP_TOKEN:Ljava/lang/String; = "aaaaaaaaaaaa"
.field public static final ADJUST_ENVIRONMENT:Ljava/lang/String;
diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
*** from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-05-08 14:20:52.929621043 +0100
--- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-05-08 14:30:55.310862854 +0100
***************
*** 15,23 ****
# static fields
! .field public static final EVENT_TOKEN_LOGIN:Ljava/lang/String; = "ctt5aq"
! .field public static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "ebn8ke"
.field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker;
--- 15,23 ----
# static fields
! .field public static final EVENT_TOKEN_LOGIN:Ljava/lang/String; = "aaaaaa"
! .field public static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "aaaaaa"
.field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker;
***************
*** 48,78 ****
# virtual methods
.method public final trackLogin()V
! .locals 2
!
! .line 1
! new-instance v0, Lf/c/a/w;
!
! const-string v1, "ctt5aq"
!
! invoke-direct {v0, v1}, Lf/c/a/w;-><init>(Ljava/lang/String;)V
!
! invoke-static {v0}, Ls/a/b/b/a;->a(Lf/c/a/w;)V
return-void
.end method
.method public final trackRegister()V
! .locals 2
!
! .line 1
! new-instance v0, Lf/c/a/w;
!
! const-string v1, "ebn8ke"
!
! invoke-direct {v0, v1}, Lf/c/a/w;-><init>(Ljava/lang/String;)V
!
! invoke-static {v0}, Ls/a/b/b/a;->a(Lf/c/a/w;)V
return-void
.end method
--- 48,60 ----
# virtual methods
.method public final trackLogin()V
! .locals 0
return-void
.end method
.method public final trackRegister()V
! .locals 0
return-void
.end method
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-05-08 14:20:52.931621023 +0100
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-05-08 14:31:28.310471046 +0100
***************
*** 173,179 ****
.method private final setBaselineProperties()V
.locals 5
! const/16 v0, 0x8
new-array v0, v0, [Lkotlin/Pair;
--- 173,179 ----
.method private final setBaselineProperties()V
.locals 5
! const/16 v0, 0x4
new-array v0, v0, [Lkotlin/Pair;
***************
*** 241,323 ****
aput-object v3, v0, v1
- const/4 v1, 0x4
-
- .line 7
- new-instance v2, Ljava/lang/StringBuilder;
-
- invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
- sget-object v3, Landroid/os/Build;->MODEL:Ljava/lang/String;
-
- invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v3, ", "
-
- invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- sget-object v3, Landroid/os/Build;->PRODUCT:Ljava/lang/String;
-
- invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object v2
-
- .line 8
- new-instance v3, Lkotlin/Pair;
-
- const-string v4, "device"
-
- invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
- aput-object v3, v0, v1
-
- const/4 v1, 0x5
-
- .line 9
- new-instance v2, Lkotlin/Pair;
-
- const-string v3, "os"
-
- const-string v4, "Android"
-
- invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
- aput-object v2, v0, v1
-
- const/4 v1, 0x6
-
- .line 10
- sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
-
- invoke-static {v2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
- move-result-object v2
-
- .line 11
- new-instance v3, Lkotlin/Pair;
-
- const-string v4, "os_sdk_version"
-
- invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
- aput-object v3, v0, v1
-
- const/4 v1, 0x7
-
- .line 12
- sget-object v2, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
-
- .line 13
- new-instance v3, Lkotlin/Pair;
-
- const-string v4, "os_version"
-
- invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
- aput-object v3, v0, v1
-
.line 14
invoke-static {v0}, Ly/q/m;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
--- 241,246 ----
***************
*** 547,955 ****
.end method
.method public final setAdvertiserId(Ljava/lang/String;)V
! .locals 1
!
! if-eqz p1, :cond_0
!
! const-string v0, "device_advertiser_id"
!
! .line 1
! invoke-static {v0, p1}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
!
! move-result-object p1
!
! const-string v0, "java.util.Collections.si\u2026(pair.first, pair.second)"
!
! invoke-static {p1, v0}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
!
! .line 2
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
return-void
-
- :cond_0
- const-string p1, "advertiserId"
-
- .line 3
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
.end method
.method public final setCampaignProperties(Landroid/content/Intent;)V
! .locals 7
!
! if-eqz p1, :cond_9
!
! .line 1
! invoke-virtual {p1}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
!
! move-result-object p1
!
! if-eqz p1, :cond_8
!
! const-string v0, "referrer"
!
! invoke-virtual {p1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
!
! move-result-object p1
!
! if-eqz p1, :cond_8
!
! const-string v1, "intent.extras?.getString\u2026PERTY_REFERRER) ?: return"
!
! invoke-static {p1, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
!
! const/4 v1, 0x1
!
! new-array v2, v1, [Lkotlin/Pair;
!
! .line 2
! new-instance v3, Lkotlin/Pair;
!
! invoke-direct {v3, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
!
! const/4 v0, 0x0
!
! aput-object v3, v2, v0
!
! .line 3
! invoke-static {v2}, Ly/q/m;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
!
! move-result-object v2
!
! const-string v3, "&"
!
! .line 4
! filled-new-array {v3}, [Ljava/lang/String;
!
! move-result-object v3
!
! const/4 v4, 0x6
!
! invoke-static {p1, v3, v0, v0, v4}, Ly/b0/u;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
!
! move-result-object p1
!
! .line 5
! new-instance v3, Ljava/util/ArrayList;
!
! const/16 v5, 0xa
!
! invoke-static {p1, v5}, Lf/o/a/j/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
!
! move-result v5
!
! invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
!
! .line 6
! invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
!
! move-result-object p1
!
! :goto_0
! invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
!
! move-result v5
!
! if-eqz v5, :cond_0
!
! invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
!
! move-result-object v5
!
! .line 7
! check-cast v5, Ljava/lang/String;
!
! const-string v6, "="
!
! .line 8
! filled-new-array {v6}, [Ljava/lang/String;
- move-result-object v6
-
- invoke-static {v5, v6, v0, v0, v4}, Ly/b0/u;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
-
- move-result-object v5
-
- invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_0
-
- .line 9
- :cond_0
- new-instance p1, Ljava/util/ArrayList;
-
- invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
- .line 10
- invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object v3
-
- :cond_1
- :goto_1
- invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v4
-
- if-eqz v4, :cond_3
-
- invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- move-object v5, v4
-
- check-cast v5, Ljava/util/List;
-
- .line 11
- invoke-interface {v5}, Ljava/util/List;->size()I
-
- move-result v5
-
- const/4 v6, 0x2
-
- if-ne v5, v6, :cond_2
-
- const/4 v5, 0x1
-
- goto :goto_2
-
- :cond_2
- const/4 v5, 0x0
-
- :goto_2
- if-eqz v5, :cond_1
-
- invoke-interface {p1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_1
-
- .line 12
- :cond_3
- new-instance v3, Ljava/util/ArrayList;
-
- invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
- .line 13
- invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object p1
-
- :cond_4
- :goto_3
- invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v4
-
- if-eqz v4, :cond_6
-
- invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- move-object v5, v4
-
- check-cast v5, Ljava/util/List;
-
- .line 14
- invoke-interface {v5, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object v5
-
- check-cast v5, Ljava/lang/String;
-
- .line 15
- invoke-virtual {v5}, Ljava/lang/String;->hashCode()I
-
- move-result v6
-
- sparse-switch v6, :sswitch_data_0
-
- goto :goto_5
-
- :sswitch_0
- const-string v6, "utm_source"
-
- .line 16
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_1
- const-string v6, "location"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_2
- const-string v6, "utm_medium"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_3
- const-string v6, "search_engine"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_4
- const-string v6, "mp_keyword"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_5
- const-string v6, "utm_term"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_6
- const-string v6, "utm_campaign"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_7
- const-string v6, "referring_domain"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- goto :goto_4
-
- :sswitch_8
- const-string v6, "utm_content"
-
- invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v5
-
- if-eqz v5, :cond_5
-
- :goto_4
- const/4 v5, 0x1
-
- goto :goto_6
-
- :cond_5
- :goto_5
- const/4 v5, 0x0
-
- :goto_6
- if-eqz v5, :cond_4
-
- .line 17
- invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_3
-
- .line 18
- :cond_6
- invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object p1
-
- :goto_7
- invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v3
-
- if-eqz v3, :cond_7
-
- invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v3
-
- .line 19
- check-cast v3, Ljava/util/List;
-
- .line 20
- invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object v4
-
- check-cast v4, Ljava/lang/String;
-
- invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object v3
-
- check-cast v3, Ljava/lang/String;
-
- invoke-interface {v2, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_7
-
- .line 21
- :cond_7
- invoke-direct {p0, v2}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
-
- :cond_8
return-void
-
- :cond_9
- const-string p1, "intent"
-
- .line 22
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-
- :sswitch_data_0
- .sparse-switch
- -0x5bc8ed18 -> :sswitch_8
- -0x40f32acd -> :sswitch_7
- -0x3db0f7f -> :sswitch_6
- 0x31ad945d -> :sswitch_5
- 0x3d3a7f4d -> :sswitch_4
- 0x3f4764b9 -> :sswitch_3
- 0x70a1a726 -> :sswitch_2
- 0x714f9fb5 -> :sswitch_1
- 0x7b737fcc -> :sswitch_0
- .end sparse-switch
.end method
--- 470,482 ----
.end method
.method public final setAdvertiserId(Ljava/lang/String;)V
! .locals 0
return-void
.end method
.method public final setCampaignProperties(Landroid/content/Intent;)V
! .locals 0
return-void
.end method
diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
*** from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-05-08 14:20:52.933621002 +0100
--- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-05-08 14:33:00.071374535 +0100
***************
*** 149,157 ****
.method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
.locals 0
- .line 1
- invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
-
return-void
.end method
--- 149,154 ----
***************
*** 174,263 ****
.end method
.method private final declared-synchronized drainEventsQueue()V
! .locals 4
!
! monitor-enter p0
!
! .line 1
! :try_start_0
! invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->getCanDrain()Z
!
! move-result v0
! :try_end_0
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
!
! if-nez v0, :cond_0
!
! .line 2
! monitor-exit p0
!
! return-void
!
! .line 3
! :cond_0
! :try_start_1
! new-instance v0, Ljava/util/ArrayList;
!
! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
!
! invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
!
! .line 4
! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
!
! invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
!
! .line 5
! iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->restAPI:Lcom/discord/utilities/rest/RestAPI;
!
! .line 6
! new-instance v2, Lcom/discord/restapi/RestAPIParams$Science;
!
! iget-object v3, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->analyticsToken:Ljava/lang/String;
!
! invoke-direct {v2, v3, v0}, Lcom/discord/restapi/RestAPIParams$Science;-><init>(Ljava/lang/String;Ljava/util/List;)V
!
! invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->science(Lcom/discord/restapi/RestAPIParams$Science;)Lrx/Observable;
!
! move-result-object v1
!
! const/4 v2, 0x0
!
! const/4 v3, 0x1
!
! .line 7
! invoke-static {v2, v3}, Lf/a/b/k;->a(ZI)Lrx/Observable$c;
!
! move-result-object v2
!
! invoke-virtual {v1, v2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
!
! move-result-object v1
!
! .line 8
! sget-object v2, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;
!
! .line 9
! new-instance v3, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;
!
! invoke-direct {v3, p0, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;-><init>(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/util/ArrayList;)V
!
! .line 10
! invoke-virtual {v1, v2, v3}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
! :try_end_1
! .catchall {:try_start_1 .. :try_end_1} :catchall_0
!
! .line 11
! monitor-exit p0
return-void
-
- :catchall_0
- move-exception v0
-
- monitor-exit p0
-
- throw v0
.end method
.method private final getCanDrain()Z
--- 171,179 ----
.end method
.method private final declared-synchronized drainEventsQueue()V
! .locals 0
return-void
.end method
.method private final getCanDrain()Z
***************
*** 531,562 ****
.method public static synthetic setTrackingData$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;ZILjava/lang/Object;)V
.locals 0
- and-int/lit8 p3, p3, 0x2
-
- if-eqz p3, :cond_0
-
- const/4 p2, 0x0
-
- .line 1
- :cond_0
- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->setTrackingData(Ljava/lang/String;Z)V
-
return-void
.end method
.method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
.locals 0
- and-int/lit8 p3, p3, 0x2
-
- if-eqz p3, :cond_0
-
- const/4 p2, 0x0
-
- .line 1
- :cond_0
- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
-
return-void
.end method
--- 447,458 ----
***************
*** 598,839 ****
.method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
.locals 0
- monitor-enter p0
-
- .line 1
- :try_start_0
- invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
-
- .line 2
- iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->analyticsToken:Ljava/lang/String;
-
- .line 3
- iput-boolean p2, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->fingerprinted:Z
-
- .line 4
- invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
- .line 5
- monitor-exit p0
-
return-void
-
- :catchall_0
- move-exception p1
-
- monitor-exit p0
-
- throw p1
.end method
.method public final track(Ljava/lang/String;Ljava/util/Map;)V
! .locals 2
! .annotation system Ldalvik/annotation/Signature;
! value = {
! "(",
! "Ljava/lang/String;",
! "Ljava/util/Map<",
! "Ljava/lang/String;",
! "+",
! "Ljava/lang/Object;",
! ">;)V"
! }
! .end annotation
!
! if-eqz p1, :cond_1
!
! .line 7
! iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
!
! new-instance v1, Lcom/discord/restapi/RestAPIParams$Science$Event;
!
! if-eqz p2, :cond_0
!
! goto :goto_0
!
! :cond_0
! invoke-static {}, Ly/q/m;->emptyMap()Ljava/util/Map;
!
! move-result-object p2
!
! :goto_0
! invoke-direct {v1, p1, p2}, Lcom/discord/restapi/RestAPIParams$Science$Event;-><init>(Ljava/lang/String;Ljava/util/Map;)V
!
! invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
!
! const-wide/16 p1, 0x5dc
!
! .line 8
! sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
!
! invoke-static {p1, p2, v0}, Lrx/Observable;->h(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
!
! move-result-object p1
!
! .line 9
! new-instance p2, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;
!
! invoke-direct {p2, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;-><init>(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
!
! invoke-virtual {p1, p2}, Lrx/Observable;->c(Lrx/functions/Action1;)Lrx/Subscription;
return-void
-
- :cond_1
- const-string p1, "event"
-
- .line 10
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
.end method
.method public final track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
! .locals 2
! .annotation system Ldalvik/annotation/Signature;
! value = {
! "(",
! "Lkotlin/Pair<",
! "Ljava/lang/String;",
! "Ljava/lang/Long;",
! ">;J",
! "Lkotlin/jvm/functions/Function0<",
! "+",
! "Ljava/util/Map<",
! "Ljava/lang/String;",
! "+",
! "Ljava/lang/Object;",
! ">;>;)V"
! }
! .end annotation
!
! const/4 v0, 0x0
!
! if-eqz p1, :cond_2
!
! if-eqz p4, :cond_1
!
! .line 1
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isEventThrottled(Lkotlin/Pair;)Z
!
! move-result v0
!
! if-eqz v0, :cond_0
!
! return-void
!
! .line 2
! :cond_0
! invoke-virtual {p1}, Lkotlin/Pair;->component1()Ljava/lang/Object;
!
! move-result-object v0
!
! check-cast v0, Ljava/lang/String;
!
! .line 3
! invoke-interface {p4}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
!
! move-result-object p4
!
! check-cast p4, Ljava/util/Map;
!
! invoke-virtual {p0, v0, p4}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
!
! .line 4
! iget-object p4, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->clock:Lcom/discord/utilities/time/Clock;
!
! invoke-interface {p4}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
!
! move-result-wide v0
!
! .line 5
! iget-object p4, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsThrottledUntilMillis:Ljava/util/concurrent/ConcurrentHashMap;
!
! add-long/2addr v0, p2
!
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
!
! move-result-object p2
!
! invoke-interface {p4, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
return-void
-
- :cond_1
- const-string p1, "lazyPropertyProvider"
-
- .line 6
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "throttleKey"
-
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
.end method
.method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
! .locals 1
! .annotation system Ldalvik/annotation/Signature;
! value = {
! "(",
! "Ljava/lang/String;",
! "Ljava/util/Map<",
! "Ljava/lang/String;",
! "+",
! "Ljava/lang/Object;",
! ">;)V"
! }
! .end annotation
!
! const/4 v0, 0x0
!
! if-eqz p1, :cond_2
!
! if-eqz p2, :cond_1
!
! .line 1
! new-instance v0, Landroid/os/Bundle;
!
! invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
!
! invoke-direct {p0, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->putMap(Landroid/os/Bundle;Ljava/util/Map;)Landroid/os/Bundle;
!
! move-result-object p2
!
! .line 2
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
!
! invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics;
!
! move-result-object v0
!
! if-eqz v0, :cond_0
!
! invoke-virtual {v0, p1, p2}, Lcom/google/firebase/analytics/FirebaseAnalytics;->a(Ljava/lang/String;Landroid/os/Bundle;)V
- :cond_0
return-void
-
- :cond_1
- const-string p1, "properties"
-
- .line 3
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "event"
-
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
.end method
--- 494,516 ----
.method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
.locals 0
return-void
.end method
.method public final track(Ljava/lang/String;Ljava/util/Map;)V
! .locals 0
return-void
.end method
.method public final track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
! .locals 0
return-void
.end method
.method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
! .locals 0
return-void
.end method
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-08 14:20:52.947620858 +0100
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-08 14:29:25.337923258 +0100
***************
*** 76,82 ****
.line 3
new-instance v0, Landroid/content/Intent;
! const-string v1, "https://discordapp.com/app"
.line 4
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
--- 76,82 ----
.line 3
new-instance v0, Landroid/content/Intent;
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
.line 4
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
*** from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-05-08 14:20:52.979620529 +0100
--- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-05-08 14:29:42.365723534 +0100
***************
*** 45,51 ****
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
! const-string v2, "https://app.adjust.com/ndjczk?campaign="
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
--- 45,51 ----
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
! const-string v2, "https://play.google.com/store/apps/details?id=com.spotify.music&trash="
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff -crB from/smali/com/discord/utilities/receiver/CampaignReceiver.smali to/smali/com/discord/utilities/receiver/CampaignReceiver.smali
*** from/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-05-08 14:20:53.015620159 +0100
--- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-05-08 14:33:21.109121808 +0100
***************
*** 16,62 ****
# virtual methods
.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
! .locals 1
!
! const/4 v0, 0x0
!
! if-eqz p1, :cond_1
!
! if-eqz p2, :cond_0
!
! .line 1
! new-instance v0, Lf/c/a/d0;
!
! invoke-direct {v0}, Lf/c/a/d0;-><init>()V
!
! invoke-virtual {v0, p1, p2}, Lf/c/a/d0;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
!
! .line 2
! new-instance v0, Lf/k/a/d/b/a;
!
! invoke-direct {v0}, Lf/k/a/d/b/a;-><init>()V
!
! invoke-virtual {v0, p1, p2}, Lf/k/a/d/b/a;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
!
! .line 3
! sget-object p1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticSuperProperties;
!
! invoke-virtual {p1, p2}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setCampaignProperties(Landroid/content/Intent;)V
return-void
-
- :cond_0
- const-string p1, "intent"
-
- .line 4
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- const-string p1, "context"
-
- invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
-
- throw v0
.end method
--- 16,22 ----
# virtual methods
.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
! .locals 0
return-void
.end method