cutthecord/resources/patches/branding/1196.patch

diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
*** from/AndroidManifest.xml	2020-07-10 17:09:15.980000000 +0300
--- to/AndroidManifest.xml	2020-07-10 17:20:21.240000000 +0300
***************
*** 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="1196" platformBuildVersionName="31-alpha2">
      <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="1196CTCBUILD" platformBuildVersionName="31-alpha2-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: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">
***************
*** 120,126 ****
                  <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"/>
--- 120,126 ----
                  <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.CTCBRANCH.permission.CONNECT">
              <intent-filter>
                  <action android:name="com.discord.intent.action.CONNECT"/>
                  <data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
***************
*** 150,156 ****
          </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"/>
--- 150,156 ----
          </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"/>
***************
*** 174,180 ****
                  <action android:name="com.google.firebase.MESSAGING_EVENT"/>
              </intent-filter>
          </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"/>
--- 174,180 ----
                  <action android:name="com.google.firebase.MESSAGING_EVENT"/>
              </intent-filter>
          </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"/>
***************
*** 183,189 ****
                  <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
              </intent-filter>
          </receiver>
!         <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
--- 183,189 ----
                  <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
              </intent-filter>
          </receiver>
!         <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
***************
*** 194,200 ****
                  <action android:name="android.service.chooser.ChooserTargetService"/>
              </intent-filter>
          </service>
!         <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"/>
          <service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
--- 194,200 ----
                  <action android:name="android.service.chooser.ChooserTargetService"/>
              </intent-filter>
          </service>
!         <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"/>
          <service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
***************
*** 242,245 ****
          <receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
      </application>
! </manifest>
\ No newline at end of file
--- 242,245 ----
          <receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
          <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-07-10 17:08:51.230000000 +0300
--- to/apktool.yml	2020-07-10 17:19:43.630000000 +0300
***************
*** 3224,3228 ****
    tag: null
  version: 2.4.2-de5d0e-SNAPSHOT
  versionInfo:
!   versionCode: '1196'
!   versionName: 31-alpha2
--- 3224,3228 ----
    tag: null
  version: 2.4.2-de5d0e-SNAPSHOT
  versionInfo:
!   versionCode: '1196CTCBUILD'
!   versionName: 31-alpha2-cutthecord-CTCBUILD
Only in to: build
Only in to: dist
diff -crB from/res/values/strings.xml to/res/values/strings.xml
*** from/res/values/strings.xml	2020-07-10 17:08:45.650000000 +0300
--- to/res/values/strings.xml	2020-07-10 17:19:43.630000000 +0300
***************
*** 1479,1485 ****
      <string name="disconnect_account_title">Disconnect %1$s</string>
      <string name="disconnect_from_voice">Disconnect from Voice</string>
      <string name="disconnect_user_success">User has been disconnected from voice.</string>
!     <string name="discord">Discord</string>
      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
      <string name="discord_desc_short">Your place to talk</string>
      <string name="discord_gg">discord.gg/</string>
--- 1479,1485 ----
      <string name="disconnect_account_title">Disconnect %1$s</string>
      <string name="disconnect_from_voice">Disconnect from Voice</string>
      <string name="disconnect_user_success">User has been disconnected from voice.</string>
!     <string name="discord">CTCNAME</string>
      <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
      <string name="discord_desc_short">Your place to talk</string>
      <string name="discord_gg">discord.gg/</string>
***************
*** 4046,4052 ****
      <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>
--- 4046,4052 ----
      <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>
***************
*** 5390,5396 ****
      <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>
--- 5390,5396 ----
      <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/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-07-10 17:08:48.140000000 +0300
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2020-07-10 17:19:43.630000000 +0300
***************
*** 76,82 ****
      .line 3
      new-instance v0, Landroid/content/Intent;
  
!     const-string v1, "https://discord.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;