Updated flash screen with new arch

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt

@@ -16,6 +16,7 @@ import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavTransactionOptions
 import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.ViewActionEvent
 import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
@@ -36,7 +37,8 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
     protected open val defaultPosition: Int = 0
 
-    protected val navigationController by lazy {
+    protected val navigationController get() = if (navHostId == 0) null else _navigationController
+    private val _navigationController by lazy {
         if (navHostId == 0) throw IllegalStateException("Did you forget to override \"navHostId\"?")
         FragNavController(supportFragmentManager, navHostId)
     }
@@ -54,7 +56,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        navigationController.apply {
+        navigationController?.apply {
             rootFragmentListener = this@MagiskActivity
             initialize(defaultPosition, savedInstanceState)
         }
@@ -62,13 +64,14 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        navigationController.onSaveInstanceState(outState)
+        navigationController?.onSaveInstanceState(outState)
     }
 
     @CallSuper
     override fun onEventDispatched(event: ViewEvent) {
         super.onEventDispatched(event)
         when (event) {
+            is BackPressEvent -> onBackPressed()
             is MagiskNavigationEvent -> navigateTo(event)
             is ViewActionEvent -> event.action(this)
             is PermissionEvent -> withPermissions(*event.permissions.toTypedArray()) {
@@ -86,15 +89,15 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
     override fun navigateTo(event: MagiskNavigationEvent) {
         val directions = event.navDirections
 
-        navigationController.defaultTransactionOptions = FragNavTransactionOptions.newBuilder()
+        navigationController?.defaultTransactionOptions = FragNavTransactionOptions.newBuilder()
             .customAnimations(event.animOptions)
             .build()
 
-        navigationController.currentStack
+        navigationController?.currentStack
             ?.indexOfFirst { it.javaClass == event.navOptions.popUpTo }
             ?.let { if (it == -1) null else it } // invalidate if class is not found
             ?.let { if (event.navOptions.inclusive) it + 1 else it }
-            ?.let { navigationController.popFragments(it) }
+            ?.let { navigationController?.popFragments(it) }
 
         when (directions.isActivity) {
             true -> navigateToActivity(event)
@@ -127,21 +130,21 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
         when (val index = baseFragments.indexOfFirst { it.java.name == destination.name }) {
             -1 -> destination.newInstance()
                 .apply { arguments = event.navDirections.args }
-                .let { navigationController.pushFragment(it) }
+                .let { navigationController?.pushFragment(it) }
             // When it's desired that fragments of same class are put on top of one another edit this
-            else -> navigationController.switchTab(index)
+            else -> navigationController?.switchTab(index)
         }
     }
 
     override fun onBackPressed() {
-        val fragment = navigationController.currentFrag as? MagiskFragment<*, *>
+        val fragment = navigationController?.currentFrag as? MagiskFragment<*, *>
 
         if (fragment?.onBackPressed() == true) {
             return
         }
 
         try {
-            navigationController.popFragment()
+            navigationController?.popFragment() ?: throw UnsupportedOperationException()
         } catch (e: UnsupportedOperationException) {
             super.onBackPressed()
         }

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskFragment.kt

@@ -5,6 +5,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import com.skoumal.teanity.view.TeanityFragment
 import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.ViewActionEvent
 import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
@@ -27,6 +28,7 @@ abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBin
     override fun onEventDispatched(event: ViewEvent) {
         super.onEventDispatched(event)
         when (event) {
+            is BackPressEvent -> magiskActivity.onBackPressed()
             is MagiskNavigationEvent -> navigateTo(event)
             is ViewActionEvent -> event.action(requireActivity())
             is PermissionEvent -> magiskActivity.withPermissions(*event.permissions.toTypedArray()) {

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskViewModel.kt

@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.ui.base
 
 import android.app.Activity
 import com.skoumal.teanity.viewmodel.LoadingViewModel
+import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.ViewActionEvent
 import com.topjohnwu.magisk.utils.Event
@@ -23,4 +24,7 @@ abstract class MagiskViewModel : LoadingViewModel(), Event.AutoListener {
         val subject = PublishSubject.create<Boolean>()
         return subject.doOnSubscribe { PermissionEvent(permissions.toList(), subject).publish() }
     }
+
+    fun back() = BackPressEvent().publish()
+
 }

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java

@@ -1,274 +0,0 @@
-package com.topjohnwu.magisk.ui.flash;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.model.adapters.StringListAdapter;
-import com.topjohnwu.magisk.tasks.FlashZip;
-import com.topjohnwu.magisk.tasks.MagiskInstaller;
-import com.topjohnwu.magisk.ui.base.BaseActivity;
-import com.topjohnwu.magisk.utils.RootUtils;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.superuser.CallbackList;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.internal.UiThreadHandler;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class FlashActivity extends BaseActivity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.button_panel) LinearLayout buttonPanel;
-    @BindView(R.id.reboot) Button reboot;
-    @BindView(R.id.recyclerView) RecyclerView rv;
-    @BindColor(android.R.color.white) int white;
-
-    private List<String> console, logs;
-
-    @OnClick(R.id.reboot)
-    void reboot() {
-        RootUtils.reboot();
-    }
-
-    @OnClick(R.id.save_logs)
-    void saveLogs() {
-        runWithExternalRW(() -> {
-            Calendar now = Calendar.getInstance();
-            String filename = String.format(Locale.US,
-                    "magisk_install_log_%04d%02d%02d_%02d%02d%02d.log",
-                    now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                    now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                    now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
-
-            File logFile = new File(Const.EXTERNAL_PATH, filename);
-            try (FileWriter writer = new FileWriter(logFile)) {
-                for (String s : logs) {
-                    writer.write(s);
-                    writer.write('\n');
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
-        });
-    }
-
-    @OnClick(R.id.close)
-    public void close() {
-        finish();
-    }
-
-    @Override
-    public void onBackPressed() {
-        // Prevent user accidentally press back button
-    }
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_NoDrawer_Dark;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_flash);
-        new FlashActivity_ViewBinding(this);
-
-        setSupportActionBar(toolbar);
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.flashing);
-        }
-        setFloating();
-        setFinishOnTouchOutside(false);
-        if (!Shell.rootAccess())
-            reboot.setVisibility(View.GONE);
-
-        logs = Collections.synchronizedList(new ArrayList<>());
-        console = new ConsoleList();
-        rv.setAdapter(new ConsoleAdapter());
-
-        Intent intent = getIntent();
-        Uri uri = intent.getData();
-
-        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
-            case Const.Value.FLASH_ZIP:
-                new FlashModule(uri).exec();
-                break;
-            case Const.Value.UNINSTALL:
-                new Uninstall(uri).exec();
-                break;
-            case Const.Value.FLASH_MAGISK:
-                new DirectInstall().exec();
-                break;
-            case Const.Value.FLASH_INACTIVE_SLOT:
-                new SecondSlot().exec();
-                break;
-            case Const.Value.PATCH_FILE:
-                new PatchFile(uri).exec();
-                break;
-        }
-    }
-
-    private class ConsoleAdapter extends StringListAdapter<ConsoleAdapter.ViewHolder> {
-
-        ConsoleAdapter() {
-            super(console, true);
-        }
-
-        @Override
-        protected int itemLayoutRes() {
-            return R.layout.list_item_console;
-        }
-
-        @NonNull
-        @Override
-        public ViewHolder createViewHolder(@NonNull View v) {
-            return new ViewHolder(v);
-        }
-
-        class ViewHolder extends StringListAdapter.ViewHolder {
-
-            public ViewHolder(@NonNull View itemView) {
-                super(itemView);
-                txt.setTextColor(white);
-            }
-
-            @Override
-            protected int textViewResId() {
-                return R.id.txt;
-            }
-        }
-    }
-
-    private class ConsoleList extends CallbackList<String> {
-
-        ConsoleList() {
-            super(new ArrayList<>());
-        }
-
-        private void updateUI() {
-            rv.getAdapter().notifyItemChanged(size() - 1);
-            rv.postDelayed(() -> rv.smoothScrollToPosition(size() - 1), 10);
-        }
-
-        @Override
-        public void onAddElement(String s) {
-            logs.add(s);
-            updateUI();
-        }
-
-        @Override
-        public String set(int i, String s) {
-            String ret = super.set(i, s);
-            UiThreadHandler.run(this::updateUI);
-            return ret;
-        }
-    }
-
-    private class FlashModule extends FlashZip {
-
-        FlashModule(Uri uri) {
-            super(uri, console, logs);
-        }
-
-        @Override
-        protected void onResult(boolean success) {
-            if (success) {
-                Utils.loadModules();
-            } else {
-                console.add("! Installation failed");
-                reboot.setVisibility(View.GONE);
-            }
-            buttonPanel.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private class Uninstall extends FlashModule {
-
-        Uninstall(Uri uri) {
-            super(uri);
-        }
-
-        @Override
-        protected void onResult(boolean success) {
-            if (success)
-                UiThreadHandler.handler.postDelayed(Shell.su("pm uninstall " + getPackageName())::exec, 3000);
-            else
-                super.onResult(false);
-        }
-    }
-
-    private abstract class BaseInstaller extends MagiskInstaller {
-        BaseInstaller() {
-            super(console, logs);
-        }
-
-        @Override
-        protected void onResult(boolean success) {
-            if (success) {
-                console.add("- All done!");
-            } else {
-                Shell.sh("rm -rf " + installDir).submit();
-                console.add("! Installation failed");
-                reboot.setVisibility(View.GONE);
-            }
-            buttonPanel.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private class DirectInstall extends BaseInstaller {
-
-        @Override
-        protected boolean operations() {
-            return findImage() && extractZip() && patchBoot() && flashBoot();
-        }
-    }
-
-    private class SecondSlot extends BaseInstaller {
-
-        @Override
-        protected boolean operations() {
-            return findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA();
-        }
-    }
-
-    private class PatchFile extends BaseInstaller {
-
-        private Uri uri;
-
-        PatchFile(Uri u) {
-            uri = u;
-        }
-
-        @Override
-        protected boolean operations() {
-            return extractZip() && handleFile(uri) && patchBoot() && storeBoot();
-        }
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt

@@ -0,0 +1,24 @@
+package com.topjohnwu.magisk.ui.flash
+
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ActivityFlashBinding
+import com.topjohnwu.magisk.ui.base.MagiskActivity
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>() {
+
+    override val layoutRes: Int = R.layout.activity_flash
+    override val viewModel: FlashViewModel by viewModel {
+        val uri = intent.data
+        val action = intent.getStringExtra(Const.Key.FLASH_ACTION) ?: let { finish();"" }
+        parametersOf(action, uri)
+    }
+
+    override fun onBackPressed() {
+        if (viewModel.loading) return
+        super.onBackPressed()
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -0,0 +1,104 @@
+package com.topjohnwu.magisk.ui.flash
+
+import android.Manifest.permission.READ_EXTERNAL_STORAGE
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.content.res.Resources
+import android.net.Uri
+import android.os.Handler
+import androidx.core.os.postDelayed
+import androidx.databinding.ObservableArrayList
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.skoumal.teanity.extensions.subscribeK
+import com.skoumal.teanity.util.DiffObservableList
+import com.skoumal.teanity.util.KObservableField
+import com.skoumal.teanity.viewevents.SnackbarEvent
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
+import com.topjohnwu.magisk.model.flash.FlashResultListener
+import com.topjohnwu.magisk.model.flash.Flashing
+import com.topjohnwu.magisk.model.flash.Patching
+import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.*
+import com.topjohnwu.superuser.Shell
+import me.tatarka.bindingcollectionadapter2.ItemBinding
+import java.io.File
+
+class FlashViewModel(
+    action: String,
+    uri: Uri?,
+    private val resources: Resources
+) : MagiskViewModel(), FlashResultListener {
+
+    val canShowReboot = Shell.rootAccess()
+    val showRestartTitle = KObservableField(false)
+
+    val behaviorText = KObservableField(resources.getString(R.string.flashing))
+
+    val items = DiffObservableList(ComparableRvItem.callback)
+    val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
+        item.bind(itemBinding)
+        itemBinding.bindExtra(BR.viewModel, this@FlashViewModel)
+    }
+
+    private val rawItems = ObservableArrayList<String>()
+
+    init {
+        rawItems.sendUpdatesTo(items) { it.map { ConsoleRvItem(it) } }
+
+        state = State.LOADING
+
+        val uri = uri ?: Uri.EMPTY
+        when (action) {
+            Const.Value.FLASH_ZIP -> Flashing
+                .Install(uri, rawItems, rawItems, this)
+                .exec()
+            Const.Value.UNINSTALL -> Flashing
+                .Uninstall(uri, rawItems, rawItems, this)
+                .exec()
+            Const.Value.FLASH_MAGISK -> Patching
+                .Direct(rawItems, rawItems, this)
+                .exec()
+            Const.Value.FLASH_INACTIVE_SLOT -> Patching
+                .SecondSlot(rawItems, rawItems, this)
+                .exec()
+            Const.Value.PATCH_FILE -> Patching
+                .File(uri, rawItems, rawItems, this)
+                .exec()
+        }
+    }
+
+    override fun onResult(isSuccess: Boolean) {
+        state = if (isSuccess) State.LOADED else State.LOADING_FAILED
+        behaviorText.value = when {
+            isSuccess -> resources.getString(R.string.done)
+            else -> resources.getString(R.string.failure)
+        }
+
+        if (isSuccess) {
+            Handler().postDelayed(500) {
+                showRestartTitle.value = true
+            }
+        }
+    }
+
+    fun savePressed() = withPermissions(READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE)
+        .map { now }
+        .map { it.toTime(timeFormatFull) }
+        .map { Const.MAGISK_INSTALL_LOG_FILENAME.format(it) }
+        .map { File(Const.EXTERNAL_PATH, it) }
+        .map { file ->
+            val log = items.filterIsInstance<ConsoleRvItem>()
+                .joinToString("\n") { it.item }
+            file.writeText(log)
+            file.path
+        }
+        .subscribeK { SnackbarEvent(it).publish() }
+        .add()
+
+    fun restartPressed() = RootUtils.reboot()
+
+    fun backPressed() = back()
+
+}