mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

[DO NOT MERGE] Fallback APK without D2D changes

Browse source 
* Bump version
  * 33030020 -> 13-3.2
  * 33030021 -> d2d test #478
  * 33030022 -> This, to go back to normal build after testing
* This is to allow going back to a build without D2D safely,
  because otherwise to uninstall the update to an app you
  have to wipe data.
* Also set the testing property to false

Change-Id: I1a9530102c851ac8ea05711b947ef7390e3a0dc8
This commit is contained in:
Chirayu Desai 2022-12-30 05:06:35 +05:30
parent 97618a384b
commit db26d3340d
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.stevesoltys.seedvault" package="com.stevesoltys.seedvault"
android:versionCode="33030020" android:versionCode="33030022"
android:versionName="13-3.2"> android:versionName="13-3.2">
<!-- <!--
The version code is the targeted SDK_VERSION plus 6 digits for our own version code. The version code is the targeted SDK_VERSION plus 6 digits for our own version code.

4
app/src/main/java/com/stevesoltys/seedvault/App.kt
View file

@ -10,6 +10,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
import android.os.Build import android.os.Build
import android.os.ServiceManager.getService import android.os.ServiceManager.getService
import android.os.StrictMode import android.os.StrictMode
import android.os.SystemProperties
import android.os.UserHandle import android.os.UserHandle
import com.stevesoltys.seedvault.crypto.cryptoModule import com.stevesoltys.seedvault.crypto.cryptoModule
import com.stevesoltys.seedvault.header.headerModule import com.stevesoltys.seedvault.header.headerModule
@ -60,6 +61,7 @@ open class App : Application() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
SystemProperties.set(BACKUP_D2D_PROPERTY, "false")
startKoin() startKoin()
if (isDebugBuild()) { if (isDebugBuild()) {
StrictMode.setThreadPolicy( StrictMode.setThreadPolicy(
@ -122,6 +124,8 @@ const val MAGIC_PACKAGE_MANAGER = PACKAGE_MANAGER_SENTINEL
const val ANCESTRAL_RECORD_KEY = "@ancestral_record@" const val ANCESTRAL_RECORD_KEY = "@ancestral_record@"
const val GLOBAL_METADATA_KEY = "@meta@" const val GLOBAL_METADATA_KEY = "@meta@"
const val BACKUP_D2D_PROPERTY = "persist.backup.fake-d2d"
// TODO this doesn't work for LineageOS as they do public debug builds // TODO this doesn't work for LineageOS as they do public debug builds
fun isDebugBuild() = Build.TYPE == "userdebug" fun isDebugBuild() = Build.TYPE == "userdebug"

2
contactsbackup/src/main/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="org.calyxos.backup.contacts" package="org.calyxos.backup.contacts"
android:versionCode="33030020" android:versionCode="33030022"
android:versionName="13-3.2"> android:versionName="13-3.2">
<!-- <!--
The version code is the targeted SDK_VERSION plus 6 digits for our own version code. The version code is the targeted SDK_VERSION plus 6 digits for our own version code.