Merge pull request #8902 from JosJuice/android-convert

Android: Add disc image conversion

Source/Android/app/src/main/AndroidManifest.xml

@@ -96,6 +96,10 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.ConvertActivity"
+            android:theme="@style/DolphinBase" />
+
         <service android:name=".utils.DirectoryInitialization"/>
         <service android:name=".services.GameFileCacheService"/>
         <service

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java

@@ -12,6 +12,7 @@
 import androidx.appcompat.app.AlertDialog;
 
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.dolphinemu.utils.CompressCallback;
 import org.dolphinemu.dolphinemu.utils.Log;
 import org.dolphinemu.dolphinemu.utils.Rumble;
 
@@ -429,6 +430,10 @@ public static native void SetMotionSensorsEnabled(boolean accelerometerEnabled,
 
   public static native boolean InstallWAD(String file);
 
+  public static native boolean ConvertDiscImage(String inPath, String outPath, int platform,
+          int format, int blockSize, int compression, int compressionLevel, boolean scrub,
+          CompressCallback callback);
+
   public static native String FormatSize(long bytes, int decimals);
 
   public static native void SetObscuredPixelsLeft(int width);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java

@@ -0,0 +1,40 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.fragments.ConvertFragment;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ConvertActivity extends AppCompatActivity
+{
+  private static final String ARG_GAME_PATH = "game_path";
+
+  public static void launch(Context context, String gamePath)
+  {
+    Intent launcher = new Intent(context, ConvertActivity.class);
+    launcher.putExtra(ARG_GAME_PATH, gamePath);
+    context.startActivity(launcher);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.activity_convert);
+
+    String path = getIntent().getStringExtra(ARG_GAME_PATH);
+
+    ConvertFragment fragment = (ConvertFragment) getSupportFragmentManager()
+            .findFragmentById(R.id.fragment_convert);
+    if (fragment == null)
+    {
+      fragment = ConvertFragment.newInstance(path);
+      getSupportFragmentManager().beginTransaction().add(R.id.fragment_convert, fragment).commit();
+    }
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java

@@ -156,9 +156,7 @@ public boolean onLongClick(View view)
       return true;
     }
 
-    GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(),
-            gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform());
-
+    GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile);
     ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
             .add(fragment, GamePropertiesDialog.TAG).commit();
 

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java

@@ -100,9 +100,7 @@ public void onBindViewHolder(ViewHolder viewHolder, Object item)
         return true;
       }
 
-      GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(),
-              gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform());
-
+      GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile);
       ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
               .add(fragment, GamePropertiesDialog.TAG).commit();
 

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java

@@ -9,11 +9,14 @@
 import androidx.fragment.app.DialogFragment;
 
 import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.activities.ConvertActivity;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag;
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity;
+import org.dolphinemu.dolphinemu.model.GameFile;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
+import org.dolphinemu.dolphinemu.utils.AlertDialogItemsBuilder;
 import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
 import org.dolphinemu.dolphinemu.utils.Log;
 
@@ -22,21 +25,22 @@
 public class GamePropertiesDialog extends DialogFragment
 {
   public static final String TAG = "GamePropertiesDialog";
-  public static final String ARG_PATH = "path";
-  public static final String ARG_GAMEID = "game_id";
+  private static final String ARG_PATH = "path";
+  private static final String ARG_GAMEID = "game_id";
   public static final String ARG_REVISION = "revision";
-  public static final String ARG_PLATFORM = "platform";
+  private static final String ARG_PLATFORM = "platform";
+  private static final String ARG_SHOULD_ALLOW_CONVERSION = "should_allow_conversion";
 
-  public static GamePropertiesDialog newInstance(String path, String gameId, int revision,
-          int platform)
+  public static GamePropertiesDialog newInstance(GameFile gameFile)
   {
     GamePropertiesDialog fragment = new GamePropertiesDialog();
 
     Bundle arguments = new Bundle();
-    arguments.putString(ARG_PATH, path);
-    arguments.putString(ARG_GAMEID, gameId);
-    arguments.putInt(ARG_REVISION, revision);
-    arguments.putInt(ARG_PLATFORM, platform);
+    arguments.putString(ARG_PATH, gameFile.getPath());
+    arguments.putString(ARG_GAMEID, gameFile.getGameId());
+    arguments.putInt(ARG_REVISION, gameFile.getRevision());
+    arguments.putInt(ARG_PLATFORM, gameFile.getPlatform());
+    arguments.putBoolean(ARG_SHOULD_ALLOW_CONVERSION, gameFile.shouldAllowConversion());
     fragment.setArguments(arguments);
 
     return fragment;
@@ -46,59 +50,60 @@ public static GamePropertiesDialog newInstance(String path, String gameId, int r
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState)
   {
-    AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
-            R.style.DolphinDialogBase);
-
     String path = requireArguments().getString(ARG_PATH);
     String gameId = requireArguments().getString(ARG_GAMEID);
     int revision = requireArguments().getInt(ARG_REVISION);
     int platform = requireArguments().getInt(ARG_PLATFORM);
+    boolean shouldAllowConversion = requireArguments().getBoolean(ARG_SHOULD_ALLOW_CONVERSION);
+
+    AlertDialogItemsBuilder itemsBuilder = new AlertDialogItemsBuilder(requireContext());
+
+    itemsBuilder.add(R.string.properties_details, (dialog, i) ->
+            GameDetailsDialog.newInstance(path).show(requireActivity()
+                    .getSupportFragmentManager(), "game_details"));
+
+    if (shouldAllowConversion)
+    {
+      itemsBuilder.add(R.string.properties_convert, (dialog, i) ->
+              ConvertActivity.launch(getContext(), path));
+    }
+
+    itemsBuilder.add(R.string.properties_set_default_iso, (dialog, i) ->
+    {
+      try (Settings settings = new Settings())
+      {
+        settings.loadSettings(null);
+        StringSetting.MAIN_DEFAULT_ISO.setString(settings, path);
+        settings.saveSettings(null, getContext());
+      }
+    });
+
+    itemsBuilder.add(R.string.properties_core_settings, (dialog, i) ->
+            SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId, revision));
+
+    itemsBuilder.add(R.string.properties_gfx_settings, (dialog, i) ->
+            SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId, revision));
 
+    itemsBuilder.add(R.string.properties_gc_controller, (dialog, i) ->
+            SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId, revision));
+
+    if (platform != Platform.GAMECUBE.toInt())
+    {
+      itemsBuilder.add(R.string.properties_wii_controller, (dialog, i) ->
+              SettingsActivity.launch(getActivity(), MenuTag.WIIMOTE, gameId, revision));
+    }
+
+    itemsBuilder.add(R.string.properties_clear_game_settings, (dialog, i) ->
+            clearGameSettings(gameId));
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+            R.style.DolphinDialogBase);
+    itemsBuilder.applyToBuilder(builder);
     builder.setTitle(requireContext()
-            .getString(R.string.preferences_game_properties) + ": " + gameId)
-            .setItems(platform == Platform.GAMECUBE.toInt() ?
-                    R.array.gameSettingsMenusGC :
-                    R.array.gameSettingsMenusWii, (dialog, which) ->
-            {
-              switch (which)
-              {
-                case 0:
-                  GameDetailsDialog.newInstance(path).show((requireActivity())
-                          .getSupportFragmentManager(), "game_details");
-                  break;
-                case 1:
-                  try (Settings settings = new Settings())
-                  {
-                    settings.loadSettings(null);
-                    StringSetting.MAIN_DEFAULT_ISO.setString(settings, path);
-                    settings.saveSettings(null, getContext());
-                  }
-                  break;
-                case 2:
-                  SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId, revision);
-                  break;
-                case 3:
-                  SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId, revision);
-                  break;
-                case 4:
-                  SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId, revision);
-                  break;
-                case 5:
-                  // Clear option for GC, Wii controls for else
-                  if (platform == Platform.GAMECUBE.toInt())
-                    clearGameSettings(gameId);
-                  else
-                    SettingsActivity.launch(getActivity(), MenuTag.WIIMOTE, gameId, revision);
-                  break;
-                case 6:
-                  clearGameSettings(gameId);
-                  break;
-              }
-            });
+            .getString(R.string.preferences_game_properties) + ": " + gameId);
     return builder.create();
   }
 
-
   private void clearGameSettings(String gameId)
   {
     String gameSettingsPath =