0.2.0-rc7

* Bug fixes & improvements
* Added Backup & Restore tool

Author: nift4

.idea/modules/app/AndroidBootManager.app.iml

@@ -11,8 +11,8 @@ android {
         // we're not going to google play
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 2060
-        versionName "0.2.0-rc6"
+        versionCode 2070
+        versionName "0.2.0-rc7"
     }
     signingConfigs {
         release {
@@ -55,7 +55,6 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.github.hedzr:android-file-chooser:v1.2.0-final'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment:2.3.3'
     implementation 'androidx.navigation:navigation-ui:2.3.3'

app/build.gradle

@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +21,8 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
 import com.topjohnwu.superuser.io.SuFileOutputStream;
 
 import org.androidbootmanager.app.R;
@@ -94,7 +97,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                     Intent intent = new Intent();
                     intent.setType("*/*");
                     intent.setAction(Intent.ACTION_GET_CONTENT);
-                    startActivityForResult(intent, 5210);
+                    startActivityForResult(intent, 5299);
                 });
                 imodel.getROM().getValue().flashes.remove(key);
                 imodel.addPart(meta.dumpPartition(dd.getSelectedItemPosition()).id);
@@ -150,6 +153,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
     }
 
+    @SuppressLint("SdCardPath")
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         if (requestCode == 5210) {
@@ -169,17 +173,61 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
                     ok.setVisibility(View.INVISIBLE);
                     new Thread(() -> {
                         try {
-                            @SuppressLint("SdCardPath") File targetFile = new File(pdump);
+                            File targetFile = new File(pdump);
+                            assert initialStream != null;
+                            OutputStream outStream = SuFileOutputStream.open(targetFile);
+                            SplashActivity.copyFile(initialStream, outStream);
+                            initialStream.close();
+                            outStream.close();
+                            requireActivity().runOnUiThread(() -> {
+                                model.setPositiveText(getString(R.string.next));
+                                model.setPositiveFragment(DeviceROMInstallerWizardPageFragment.class);
+                                txt.setText(getString(R.string.selected));
+                            });
+                        } catch (IOException e) {
+                            requireActivity().runOnUiThread(() -> Toast.makeText(requireContext(), R.string.failure, Toast.LENGTH_LONG).show());
+                            e.printStackTrace();
+                        }
+                    }).start();
+                } catch (IOException e) {
+                    Toast.makeText(requireContext(), R.string.failure, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
+            } else {
+                Toast.makeText(requireContext(), R.string.failure, Toast.LENGTH_LONG).show();
+                new IllegalStateException("Result not OK but " + resultCode).printStackTrace();
+            }
+        } else if (requestCode == 5299) {
+            if (resultCode == Activity.RESULT_OK) {
+                assert data != null;
+                Uri selectedUri = data.getData();
+                try {
+                    InputStream initialStream;
+                    if (selectedUri != null) {
+                        initialStream = requireActivity().getContentResolver().openInputStream(selectedUri);
+                    } else {
+                        Toast.makeText(requireContext(), R.string.failure, Toast.LENGTH_LONG).show();
+                        new IllegalStateException("null selected").printStackTrace();
+                        return;
+                    }
+                    txt.setText(R.string.copy_file);
+                    ok.setVisibility(View.INVISIBLE);
+                    new Thread(() -> {
+                        try {
+                            File targetFile = new File("/data/data/org.androidbootmanager.app/cache/unsparse.img");
                             assert initialStream != null;
                             OutputStream outStream = SuFileOutputStream.open(targetFile);
                             SplashActivity.copyFile(initialStream, outStream);
                             initialStream.close();
                             outStream.close();
+                            Log.i("ABM","copy done");
+                            Shell.su("/data/data/org.androidbootmanager.app/assets/Toolkit/simg2img /data/data/org.androidbootmanager.app/cache/unsparse.img " + pdump).exec();
                             requireActivity().runOnUiThread(() -> {
                                 model.setPositiveText(getString(R.string.next));
                                 model.setPositiveFragment(DeviceROMInstallerWizardPageFragment.class);
                                 txt.setText(getString(R.string.selected));
                             });
+                            Log.i("ABM","Result of delete: " + SuFile.open(targetFile.getAbsolutePath()).delete());
                         } catch (IOException e) {
                             requireActivity().runOnUiThread(() -> Toast.makeText(requireContext(), R.string.failure, Toast.LENGTH_LONG).show());
                             e.printStackTrace();