forked as Boot Control

capntrips · capntrips · commit ae559ddc7493 · 2023-06-09T15:57:03.000-05:00
added activate button
updated gradle wrapper
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# Devinfo Patcher
+# Boot Control
 
-Devinfo Patcher is an Android app that marks the inactive slot as successful on devices with a valid `devinfo` partition.
+Boot Control is an Android app that toggles the active slot. It first attempts to modify the `devinfo` partition, if a valid one is found, then falls back on modifying the partition table entries of the `boot` partitions. 
 
 ## Usage
 
-If the inactive slot is not marked as successful, pressing the `Patch` button will mark it.
+Pressing the `Activate` button on the inactive slot will toggle the active slot.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,11 +7,11 @@ android {
     compileSdk 31
 
     defaultConfig {
-        applicationId "com.github.capntrips.devinfopatcher"
+        applicationId "com.github.capntrips.bootcontrol"
         minSdk 31
         targetSdk 31
         versionCode 2
-        versionName "1.0.0-alpha02"
+        versionName "1.0.0-alpha01"
 
         vectorDrawables {
             useSupportLibrary true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.capntrips.devinfopatcher">
+    package="com.github.capntrips.bootcontrol">
 
     <application
         android:allowBackup="false"
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Material3.DayNight.NoActionBar">
         <activity
-            android:name="com.github.capntrips.devinfopatcher.MainActivity"
+            android:name="com.github.capntrips.bootcontrol.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.MainSplashScreen">
             <intent-filter>
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/DeviceState.kt b/app/src/main/java/com/github/capntrips/bootcontrol/DeviceState.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/DeviceStateInterface.kt b/app/src/main/java/com/github/capntrips/bootcontrol/DeviceStateInterface.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/DeviceStatePreview.kt b/app/src/main/java/com/github/capntrips/bootcontrol/DeviceStatePreview.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/DevinfoImageFlags.kt b/app/src/main/java/com/github/capntrips/bootcontrol/DevinfoImageFlags.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 enum class DevinfoImageFlags(val position: Byte) {
     Unbootable(1),
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/ErrorScreen.kt b/app/src/main/java/com/github/capntrips/bootcontrol/ErrorScreen.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Box
@@ -20,8 +20,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.github.capntrips.devinfopatcher.ui.theme.DevinfoPatcherTheme
-import com.github.capntrips.devinfopatcher.ui.theme.Orange500
+import com.github.capntrips.bootcontrol.ui.theme.BootControlTheme
+import com.github.capntrips.bootcontrol.ui.theme.Orange500
 
 @ExperimentalMaterial3Api
 @Composable
@@ -64,7 +64,7 @@ fun ErrorScreenPreviewDark() {
 @Preview(showBackground = true)
 @Composable
 fun ErrorScreenPreviewLight() {
-    DevinfoPatcherTheme {
+    BootControlTheme {
         ErrorScreen(stringResource(R.string.root_required))
     }
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainActivity.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.animation.ObjectAnimator
 import android.animation.PropertyValuesHolder
@@ -17,7 +17,7 @@ import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.res.stringResource
 import androidx.core.animation.doOnEnd
 import androidx.core.view.WindowCompat
-import com.github.capntrips.devinfopatcher.ui.theme.DevinfoPatcherTheme
+import com.github.capntrips.bootcontrol.ui.theme.BootControlTheme
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.topjohnwu.superuser.Shell
@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {
         }
 
         setContent {
-            DevinfoPatcherTheme {
+            BootControlTheme {
                 val systemUiController = rememberSystemUiController()
                 val darkIcons = MaterialTheme.colorScheme.background.luminance() > 0.5f
                 SideEffect {
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainContent.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainContent.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.res.Configuration
 import android.os.Build
@@ -34,7 +34,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.github.capntrips.devinfopatcher.ui.theme.DevinfoPatcherTheme
+import com.github.capntrips.bootcontrol.ui.theme.BootControlTheme
 import kotlinx.coroutines.flow.StateFlow
 
 @Composable
@@ -58,12 +58,14 @@ fun MainContent(viewModel: MainViewModelInterface) {
         Spacer(Modifier.height(16.dp))
         SlotCard(
             title = stringResource(R.string.slot_a),
+            viewModel=viewModel,
             slotStateFlow = uiState.slotA,
             isActive = uiState.slotSuffix == "_a"
         )
         Spacer(Modifier.height(16.dp))
         SlotCard(
             title = stringResource(R.string.slot_b),
+            viewModel=viewModel,
             slotStateFlow = uiState.slotB,
             isActive = uiState.slotSuffix == "_b"
         )
@@ -73,6 +75,7 @@ fun MainContent(viewModel: MainViewModelInterface) {
 @Composable
 fun SlotCard(
     title: String,
+    viewModel: MainViewModelInterface,
     slotStateFlow: StateFlow<SlotStateInterface>,
     isActive: Boolean
 ) {
@@ -83,9 +86,11 @@ fun SlotCard(
         title = title,
         button = {
             if (!isRefreshing) {
-                if (!isActive) {
+                if (!slot.active) {
                     if (!slot.successful) {
                         PatchButton(slot)
+                    } else {
+                        ActivateButton(viewModel, slot)
                     }
                 }
             }
@@ -130,6 +135,18 @@ fun PatchButton(slot: SlotStateInterface) {
     }
 }
 
+@Composable
+fun ActivateButton(viewModel: MainViewModelInterface, slot: SlotStateInterface) {
+    val context = LocalContext.current
+    Button(
+        modifier = Modifier.padding(0.dp),
+        shape = RoundedCornerShape(4.0.dp),
+        onClick = { viewModel.activate(context, slot) }
+    ) {
+        Text(stringResource(R.string.activate))
+    }
+}
+
 @Composable
 fun DataCard(
     title: String,
@@ -239,7 +256,7 @@ fun MainContentPreviewDark() {
 @Preview(showBackground = true)
 @Composable
 fun MainContentPreviewLight() {
-    DevinfoPatcherTheme {
+    BootControlTheme {
         Scaffold {
             val viewModel: MainViewModelPreview = viewModel()
             MainContent(viewModel)
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainListener.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainListener.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 internal class MainListener constructor(private val callback: () -> Unit) {
     fun resume() {
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainScreen.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainScreen.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Box
@@ -22,7 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.github.capntrips.devinfopatcher.ui.theme.DevinfoPatcherTheme
+import com.github.capntrips.bootcontrol.ui.theme.BootControlTheme
 import com.google.accompanist.insets.LocalWindowInsets
 import com.google.accompanist.insets.rememberInsetsPaddingValues
 import com.google.accompanist.insets.ui.TopAppBar
@@ -96,7 +96,7 @@ fun MainScreenPreviewDark() {
 @Preview(showBackground = true)
 @Composable
 fun MainScreenPreviewLight() {
-    DevinfoPatcherTheme {
+    BootControlTheme {
         val viewModel: MainViewModelPreview = viewModel()
         MainScreen(viewModel)
     }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModel.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModel.kt
@@ -1,6 +1,8 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
+import android.util.Log
+import android.widget.Toast
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
@@ -10,6 +12,9 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 class MainViewModel constructor(context: Context) : ViewModel(), MainViewModelInterface {
+    companion object {
+        const val TAG: String = "BootControl/MainViewModel"
+    }
     private val _isRefreshing: MutableStateFlow<Boolean> = MutableStateFlow(false)
     private lateinit var _uiState: MutableStateFlow<DeviceStateInterface>
     private var _error: String? = null
@@ -48,4 +53,24 @@ class MainViewModel constructor(context: Context) : ViewModel(), MainViewModelIn
             }
         }
     }
+
+    private fun log(context: Context, message: String, shouldThrow: Boolean = false) {
+        viewModelScope.launch(Dispatchers.Main) {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+        }
+        Log.d(TAG, message)
+        if (shouldThrow) {
+            throw Exception(message)
+        }
+    }
+
+    override fun activate(context: Context, slot: SlotStateInterface) {
+        launch {
+            val slotA = uiState.value.slotA.value
+            val slotB = uiState.value.slotB.value
+            slotA.setActive(context, slotA == slot)
+            slotB.setActive(context, slotB == slot)
+            log(context, "slot activated")
+        }
+    }
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelFactory.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelFactory.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelInterface.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelInterface.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import kotlinx.coroutines.flow.StateFlow
@@ -7,4 +7,5 @@ interface MainViewModelInterface {
     val isRefreshing: StateFlow<Boolean>
     val uiState: StateFlow<DeviceStateInterface>
     fun refresh(context: Context)
+    fun activate(context: Context, slot: SlotStateInterface)
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelPreview.kt b/app/src/main/java/com/github/capntrips/bootcontrol/MainViewModelPreview.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
@@ -32,4 +32,14 @@ class MainViewModelPreview : ViewModel(), MainViewModelInterface {
             uiState.value.refresh(context)
         }
     }
+
+    override fun activate(context: Context, slot: SlotStateInterface) {
+        launch {
+            delay(500)
+            val slotA = uiState.value.slotA.value
+            val slotB = uiState.value.slotB.value
+            slotA.setActive(context, slotA == slot)
+            slotB.setActive(context, slotB == slot)
+        }
+    }
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/SlotState.kt b/app/src/main/java/com/github/capntrips/bootcontrol/SlotState.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import android.util.Base64
@@ -21,7 +21,7 @@ import java.nio.ByteOrder
 
 class SlotState(context: Context, private val devinfo: File, private val offset: Int, private val _isRefreshing : MutableStateFlow<Boolean>) : ViewModel(), SlotStateInterface {
     companion object {
-        const val TAG: String = "VbmetaPatcher/SlotState"
+        const val TAG: String = "BootControl/SlotState"
         const val MAGIC: String = "49564544"
     }
 
@@ -103,6 +103,28 @@ class SlotState(context: Context, private val devinfo: File, private val offset:
         refresh(context)
     }
 
+    override fun setActive(context: Context, active: Boolean) {
+        if (!hasMagic()) {
+            log(context, "Unexpected Format", shouldThrow = true)
+        }
+
+        var flags: Byte = 0x00.toByte()
+        if (unbootable) {
+            flags = flags or DevinfoImageFlags.Unbootable.position
+        }
+        if (successful) {
+            flags = flags or DevinfoImageFlags.Successful.position
+        }
+        if (active) {
+            flags = flags or DevinfoImageFlags.Active.position
+        }
+        if (fastbootOk) {
+            flags = flags or DevinfoImageFlags.FastbootOk.position
+        }
+        Shell.su("printf '\\x${"%02x".format(flags)}' | dd of=$devinfo bs=1 seek=${offset + 1} count=1 conv=notrunc status=none").exec()
+        refresh(context)
+    }
+
     private fun hasMagic() : Boolean {
         // https://android.googlesource.com/device/google/gs101/+/refs/tags/android-12.0.0_r12/interfaces/boot/1.2/DevInfo.h#25
         val magic = Base64.decode(Shell.su("dd if=$devinfo bs=1 count=4 status=none | base64").exec().out[0], Base64.DEFAULT)
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/SlotStateInterface.kt b/app/src/main/java/com/github/capntrips/bootcontrol/SlotStateInterface.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import kotlinx.coroutines.flow.StateFlow
@@ -12,4 +12,5 @@ interface SlotStateInterface {
     val isRefreshing: StateFlow<Boolean>
     fun refresh(context: Context)
     fun patch(context: Context)
+    fun setActive(context: Context, active: Boolean)
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/SlotStatePreview.kt b/app/src/main/java/com/github/capntrips/bootcontrol/SlotStatePreview.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher
+package com.github.capntrips.bootcontrol
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
@@ -12,9 +12,9 @@ import kotlinx.coroutines.launch
 class SlotStatePreview constructor(private val _isRefreshing : MutableStateFlow<Boolean>, isActive: Boolean) : ViewModel(), SlotStateInterface {
     override var retryCount: Int = if (isActive) 2 else 3
     override var unbootable: Boolean = false
-    override var successful: Boolean = isActive
+    override var successful: Boolean = true
     override var active: Boolean = isActive
-    override var fastbootOk: Boolean = isActive
+    override var fastbootOk: Boolean = false
 
     override val isRefreshing: StateFlow<Boolean>
         get() = _isRefreshing.asStateFlow()
@@ -39,4 +39,8 @@ class SlotStatePreview constructor(private val _isRefreshing : MutableStateFlow<
             successful = true
         }
     }
+
+    override fun setActive(context: Context, active: Boolean) {
+        this.active = active
+    }
 }
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Color.kt b/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.github.capntrips.devinfopatcher.ui.theme
+package com.github.capntrips.bootcontrol.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Theme.kt b/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Theme.kt
diff --git a/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Type.kt b/app/src/main/java/com/github/capntrips/bootcontrol/ui/theme/Type.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.capntrips.devinfopatcher`
	`1`	`+package com.github.capntrips.bootcontrol`
`2`	`2`
`3`	`3`	`import android.content.Context`
`4`	`4`	`import com.topjohnwu.superuser.Shell`