0.2.0-rc3

* Custom entry/OS support
* BETA! Sailfish support
* Minor improvements
* Cleanup strings.xml

Author: nift4

.idea/misc.xml

@@ -11,8 +11,8 @@ android {
         // we're not going to google play
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 2020
-        versionName "0.2.0-rc2"
+        versionCode 2030
+        versionName "0.2.0-rc3"
     }
     signingConfigs {
         release {

app/build.gradle

@@ -33,8 +33,6 @@ public List<ROM> getROMs() {
             int b;
             switch (r.scriptname) {
                 case "add_ubuntutouch_systemimage_haliumboot.sh":
-                    //noinspection SpellCheckingInspection
-                case "add_ubuntutouch_sytemimage_haliumboot.sh": // this is considered deprecated
                     r.viewname = c.getString(R.string.rom_type_add_ut_sysimg_halium);
                     r.requiredFiles = new HashMap<>();
                     r.requiredFiles.put("halium-boot.img", c.getString(R.string.select_halium_boot));
@@ -43,14 +41,30 @@ public List<ROM> getROMs() {
                     r.parts.add(c.getString(R.string.select_part, c.getString(R.string.system_part)));
                     r.parts.add(c.getString(R.string.select_part, c.getString(R.string.data_part)));
                     r.strings = new HashMap<>();
-                    r.strings.put(c.getString(R.string.enter_rom_name), "");
+                    r.strings.put(c.getString(R.string.enter_rom_name), "Ubuntu Touch");
                     a = new ArrayList<>(Arrays.asList(Objects.requireNonNull(SuFile.open("/data/abm/bootset/db/entries/").list())));
                     a.removeIf((c) -> !c.contains("rom"));
                     a.sort((c, d) -> Integer.compare(Integer.parseInt(c.replace("rom","").replace(".conf","")), Integer.parseInt(d.replace("rom","").replace(".conf",""))));
                     b = a.size() > 0 ? Integer.parseInt(a.get(a.size()-1).replace("rom","").replace(".conf",""))+1 : 0;
                     r.strings.put(c.getString(R.string.enter_rom_folder), "rom" + b);
                     r.gen = (imodel, menuName, folderName) -> imodel.setCmdline(Objects.requireNonNull(imodel.getROM().getValue()).fullPath + " '" + folderName + "' '" + menuName + "' " + Objects.requireNonNull(imodel.getParts().getValue()).get(0) + " " + imodel.getParts().getValue().get(1) + " /data/data/org.androidbootmanager.app/cache/system.img /data/data/org.androidbootmanager.app/cache/halium-boot.img");
                     break;
+                case "add_sailfish.sh":
+                    r.viewname = c.getString(R.string.rom_type_add_sailfish);
+                    r.requiredFiles = new HashMap<>();
+                    r.requiredFiles.put("hybris-boot.img", c.getString(R.string.select_hybris_boot));
+                    r.requiredFiles.put("sailfish.img001", c.getString(R.string.select_system_image));
+                    r.parts = new ArrayList<>();
+                    r.parts.add(c.getString(R.string.select_part, c.getString(R.string.data_part)));
+                    r.strings = new HashMap<>();
+                    r.strings.put(c.getString(R.string.enter_rom_name), "SailfishOS");
+                    a = new ArrayList<>(Arrays.asList(Objects.requireNonNull(SuFile.open("/data/abm/bootset/db/entries/").list())));
+                    a.removeIf((c) -> !c.contains("rom"));
+                    a.sort((c, d) -> Integer.compare(Integer.parseInt(c.replace("rom","").replace(".conf","")), Integer.parseInt(d.replace("rom","").replace(".conf",""))));
+                    b = a.size() > 0 ? Integer.parseInt(a.get(a.size()-1).replace("rom","").replace(".conf",""))+1 : 0;
+                    r.strings.put(c.getString(R.string.enter_rom_folder), "rom" + b);
+                    r.gen = (imodel, menuName, folderName) -> imodel.setCmdline(Objects.requireNonNull(imodel.getROM().getValue()).fullPath + " '" + folderName + "' '" + menuName + "' " + Objects.requireNonNull(imodel.getParts().getValue()).get(0) + " /data/data/org.androidbootmanager.app/cache/sailfish.img001 /data/data/org.androidbootmanager.app/cache/hybris-boot.img");
+                    break;
                 case "other_os.sh":
                     r.viewname = c.getString(R.string.other_os);
                     r.requiredFiles = new HashMap<>();

app/src/main/assets/Scripts

@@ -23,7 +23,6 @@
 import org.androidbootmanager.app.R;
 import org.androidbootmanager.app.devices.DeviceList;
 import org.androidbootmanager.app.ui.activities.SplashActivity;
-import org.androidbootmanager.app.ui.installer.DeviceInstallerWizardPageFragment;
 import org.androidbootmanager.app.ui.wizard.WizardViewModel;
 import org.androidbootmanager.app.util.SDUtils;
 

app/src/main/java/org/androidbootmanager/app/roms/ROMsList.java

@@ -13,11 +13,8 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.androidbootmanager.app.R;
-import org.androidbootmanager.app.devices.DeviceList;
 import org.androidbootmanager.app.ui.wizard.WizardViewModel;
 
-import java.util.Objects;
-
 public class ROMNameChooserWizardPageFragment extends Fragment {
     protected WizardViewModel model;
     protected DeviceInstallerViewModel imodel;

app/src/main/java/org/androidbootmanager/app/ui/addrom/DeviceROMInstallerWizardPageFragment.java

@@ -146,7 +146,6 @@ public ViewHolder(View view) {
                             .setCancelable(true)
                             .setNeutralButton(R.string.cancel, (p1, p2) -> p1.dismiss())
                             .setNegativeButton(R.string.delete, (p1, p2) -> MiscUtils.sure(requireContext(), p1, getString(R.string.delete_msg_2, e.config.get("title")), (p112, p212) -> {
-                                Log.i("ABM","tryna1");
                                 if (e.config.get("xsystem") != null && e.config.get("xdata") != null)
                                     if (e.config.get("xsystem").equals("real") || e.config.get("xdata").equals("real")) {
                                         new AlertDialog.Builder(requireContext())

app/src/main/java/org/androidbootmanager/app/ui/installer/ROMNameChooserWizardPageFragment.java

@@ -27,7 +27,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/nav_header_subtitle" />

app/src/main/java/org/androidbootmanager/app/ui/roms/ROMFragment.java

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/wizard_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

app/src/main/res/layout/nav_header_main.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/wizardpage"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.wizard.ExampleWizardPageFragment">