forked from distok/cutthecord
		
	Add v8.7.6 support and improve patchport
This commit is contained in:
		
							parent
							
								
									fec4f2ae24
								
							
						
					
					
						commit
						042fe52427
					
				
					 37 changed files with 6530 additions and 11 deletions
				
			
		
							
								
								
									
										124
									
								
								patches/branding/876.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										124
									
								
								patches/branding/876.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,124 @@
 | 
			
		|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
 | 
			
		||||
*** from/AndroidManifest.xml	2019-04-25 11:23:36.734134485 +0300
 | 
			
		||||
--- to/AndroidManifest.xml	2019-04-25 11:23:39.967485513 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 1,4 ****
 | 
			
		||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="876" platformBuildVersionName="8.7.6">
 | 
			
		||||
      <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="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="876CTCBUILD" platformBuildVersionName="8.7.6-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"/>
 | 
			
		||||
***************
 | 
			
		||||
*** 96,102 ****
 | 
			
		||||
          </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="false"/>
 | 
			
		||||
--- 96,102 ----
 | 
			
		||||
          </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="top.distok.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="false"/>
 | 
			
		||||
***************
 | 
			
		||||
*** 141,149 ****
 | 
			
		||||
              </intent-filter>
 | 
			
		||||
          </service>
 | 
			
		||||
          <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"/>
 | 
			
		||||
          <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"/>
 | 
			
		||||
--- 141,149 ----
 | 
			
		||||
              </intent-filter>
 | 
			
		||||
          </service>
 | 
			
		||||
          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 | 
			
		||||
!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
 | 
			
		||||
          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
 | 
			
		||||
!         <provider android:authorities="top.distok.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"/>
 | 
			
		||||
***************
 | 
			
		||||
*** 182,189 ****
 | 
			
		||||
                  <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
 | 
			
		||||
              </intent-filter>
 | 
			
		||||
          </receiver>
 | 
			
		||||
!         <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
 | 
			
		||||
!         <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
 | 
			
		||||
          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
 | 
			
		||||
      </application>
 | 
			
		||||
  </manifest>
 | 
			
		||||
--- 182,189 ----
 | 
			
		||||
                  <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
 | 
			
		||||
              </intent-filter>
 | 
			
		||||
          </receiver>
 | 
			
		||||
!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
 | 
			
		||||
!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
 | 
			
		||||
          <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	2019-04-25 10:45:14.687646292 +0300
 | 
			
		||||
--- to/apktool.yml	2019-04-25 11:23:39.967485513 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 469,473 ****
 | 
			
		||||
    tag: null
 | 
			
		||||
  version: 2.4.1-73ac0d-SNAPSHOT
 | 
			
		||||
  versionInfo:
 | 
			
		||||
!   versionCode: '876'
 | 
			
		||||
!   versionName: 8.7.6
 | 
			
		||||
--- 469,473 ----
 | 
			
		||||
    tag: null
 | 
			
		||||
  version: 2.4.1-73ac0d-SNAPSHOT
 | 
			
		||||
  versionInfo:
 | 
			
		||||
!   versionCode: '876CTCBUILD'
 | 
			
		||||
!   versionName: 8.7.6-cutthecord-CTCBUILD
 | 
			
		||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
 | 
			
		||||
*** from/res/values/strings.xml	2019-04-25 10:45:10.627626294 +0300
 | 
			
		||||
--- to/res/values/strings.xml	2019-04-25 11:23:39.970818864 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 1258,1264 ****
 | 
			
		||||
      <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">Free and secure chat for gamers, works on both your desktop and your phone.</string>
 | 
			
		||||
      <string name="discord_desc_short">Team voice & text chat</string>
 | 
			
		||||
      <string name="discord_gg">discord.gg/</string>
 | 
			
		||||
--- 1258,1264 ----
 | 
			
		||||
      <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">Free and secure chat for gamers, works on both your desktop and your phone.</string>
 | 
			
		||||
      <string name="discord_desc_short">Team voice & text chat</string>
 | 
			
		||||
      <string name="discord_gg">discord.gg/</string>
 | 
			
		||||
***************
 | 
			
		||||
*** 2886,2892 ****
 | 
			
		||||
      <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="nsfw_accept">Continue</string>
 | 
			
		||||
--- 2886,2892 ----
 | 
			
		||||
      <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="nsfw_accept">Continue</string>
 | 
			
		||||
| 
						 | 
				
			
			@ -31,4 +31,5 @@ You can use the following line to patch authorities:
 | 
			
		|||
- 8.5.4
 | 
			
		||||
- 8.5.5
 | 
			
		||||
- 8.5.6
 | 
			
		||||
- 8.7.6
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue