fix: 1.1.2 Release

feelfreelinux · Sep 27, 2022 · d969361 · d969361
1 parent eec3a10
commit d969361
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.octo4a"
         minSdk = 17
         targetSdk = 28
-        versionName = "1.1.1"
-        versionCode = 1001001
+        versionName = "1.1.2"
+        versionCode = 1001002
         multiDexEnabled = true
 
         ndk {

diff --git a/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt b/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt
@@ -26,6 +26,7 @@ interface BootstrapRepository {
     fun resetSSHPassword(newPassword: String)
     val isBootstrapInstalled: Boolean
     val isSSHConfigured: Boolean
+    val isArgonFixApplied: Boolean
 }
 
 class BootstrapRepositoryImpl(private val logger: LoggerRepository, private val githubRepository: GithubRepository, val context: Context) : BootstrapRepository {
@@ -204,6 +205,10 @@ class BootstrapRepositoryImpl(private val logger: LoggerRepository, private val
         get() {
             return File("/data/data/com.octo4a/files/bootstrap/bootstrap/home/octoprint/.ssh_configured").exists()
         }
+    override val isArgonFixApplied: Boolean
+        get() {
+            return File("/data/data/com.octo4a/files/bootstrap/bootstrap/home/octoprint/.argon-fix").exists()
+        }
 
     override fun resetSSHPassword(newPassword: String) {
         logger.log(this) { "Deleting password just in case" }

diff --git a/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt b/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt
@@ -225,6 +225,18 @@ class OctoPrintHandlerRepositoryImpl(
         bootstrapRepository.run {
             vspPty.createEventPipe()
         }
+        if (!bootstrapRepository.isArgonFixApplied) {
+            logger.log { "Applying argon fix..." }
+            bootstrapRepository.runCommand("pip3 install -U packaging --ignore-installed").waitAndPrintOutput(
+                logger
+            )
+            bootstrapRepository.runCommand("pip3 install https://github.com/feelfreelinux/octo4a-argon2-mock/archive/main.zip").waitAndPrintOutput(
+                logger
+            )
+            bootstrapRepository.runCommand("touch /home/octoprint/.argon-fix").waitAndPrintOutput(
+                logger
+            )
+        }
         ensureCommFixExists()
         _serverState.value = ServerStatus.BootingUp
         octoPrintProcess = bootstrapRepository.runCommand("LD_PRELOAD=/home/octoprint/ioctlHook.so octoprint serve --iknowwhatimdoing")