forked from distok/cutthecord
Remove branding patches from notrack patch
This commit is contained in:
parent
b5d311537d
commit
aa7717d480
GPG key ID:
D08609FADBD8C395
1 changed files with 13 additions and 246 deletions
|
|
@ -1,67 +1,8 @@
|
||||||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
*** from/AndroidManifest.xml 2020-05-08 14:21:12.745416341 +0100
|
*** from/AndroidManifest.xml 2020-05-08 16:37:35.212835997 +0100
|
||||||
--- to/AndroidManifest.xml 2020-05-08 14:29:42.363723556 +0100
|
--- to/AndroidManifest.xml 2020-05-08 16:37:40.530705156 +0100
|
||||||
***************
|
***************
|
||||||
*** 1,4 ****
|
*** 148,155 ****
|
||||||
! <?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"/>
|
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||||
</provider>
|
</provider>
|
||||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||||
|
|
@ -70,11 +11,7 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
<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">
|
<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"/>
|
<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||||
--- 144,155 ----
|
--- 148,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"/>
|
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||||
</provider>
|
</provider>
|
||||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||||
|
|
@ -83,108 +20,9 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||||
<activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
<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">
|
<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"/>
|
<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
|
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
|
*** from/res/values/strings.xml 2020-05-08 16:37:35.212835997 +0100
|
||||||
--- to/res/values/strings.xml 2020-05-08 14:29:42.363723556 +0100
|
--- to/res/values/strings.xml 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 1057,1063 ****
|
*** 1057,1063 ****
|
||||||
<string name="cloud_sync_modal_or">OR</string>
|
<string name="cloud_sync_modal_or">OR</string>
|
||||||
|
|
@ -202,60 +40,9 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||||
<string name="coming_soon">Coming Soon</string>
|
<string name="coming_soon">Coming Soon</string>
|
||||||
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
|
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
|
||||||
<string name="command_me_description">Displays text with emphasis.</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 & 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 & 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
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 42,135 ****
|
*** 42,135 ****
|
||||||
.end method
|
.end method
|
||||||
|
|
@ -369,7 +156,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycl
|
||||||
|
|
||||||
diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali/com/discord/utilities/analytics/AdjustConfig.smali
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/analytics/AdjustConfig.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 12,18 ****
|
||||||
|
|
||||||
|
|
@ -389,7 +176,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali
|
||||||
|
|
||||||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 15,23 ****
|
*** 15,23 ****
|
||||||
|
|
||||||
|
|
@ -460,7 +247,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEven
|
||||||
.end method
|
.end method
|
||||||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 173,179 ****
|
*** 173,179 ****
|
||||||
.method private final setBaselineProperties()V
|
.method private final setBaselineProperties()V
|
||||||
|
|
@ -991,7 +778,7 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma
|
||||||
.end method
|
.end method
|
||||||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 149,157 ****
|
*** 149,157 ****
|
||||||
.method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
|
.method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
|
||||||
|
|
@ -1409,29 +1196,9 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smal
|
||||||
|
|
||||||
return-void
|
return-void
|
||||||
.end method
|
.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
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 45,51 ****
|
*** 45,51 ****
|
||||||
|
|
||||||
|
|
@ -1451,7 +1218,7 @@ diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlaySt
|
||||||
|
|
||||||
diff -crB from/smali/com/discord/utilities/receiver/CampaignReceiver.smali to/smali/com/discord/utilities/receiver/CampaignReceiver.smali
|
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
|
*** 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
|
--- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali 2020-05-08 16:37:40.532705107 +0100
|
||||||
***************
|
***************
|
||||||
*** 16,62 ****
|
*** 16,62 ****
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue