Merge pull request #452 from fzurita/dynamic_zip_extraction

Dynamic zip extraction
mupen64plus-ae · Sep 8, 2015 · b2be8ff · b2be8ff
2 parents f5fc6a0 + 71c5cc2
commit b2be8ff
Show file tree

Hide file tree

Showing 13 changed files with 399 additions and 182 deletions.
diff --git a/src/paulscode/android/mupen64plusae/ActivityHelper.java b/src/paulscode/android/mupen64plusae/ActivityHelper.java
@@ -55,7 +55,9 @@ public static class Keys
         //@formatter:off
         public static final String ROM_PATH             = NAMESPACE + "ROM_PATH";
         public static final String ROM_MD5              = NAMESPACE + "ROM_MD5";
-        public static final String CHEAT_ARGS           = NAMESPACE + "CHEAT_ARGS";
+        public static final String ROM_CRC              = NAMESPACE + "ROM_CRC";
+        public static final String ROM_HEADER_NAME      = NAMESPACE + "ROM_HEADER_NAME";
+        public static final String ROM_COUNTRY_CODE     = NAMESPACE + "ROM_COUNTRY_CODE";
         public static final String DO_RESTART           = NAMESPACE + "DO_RESTART";
         public static final String PROFILE_NAME         = NAMESPACE + "PROFILE_NAME";
         public static final String MENU_DISPLAY_MODE    = NAMESPACE + "MENU_DISPLAY_MODE";
@@ -114,15 +116,17 @@ public static void startGalleryActivity( Context context, String romPath )
         context.startActivity( intent );
     }
 
-    public static void startGameActivity( Context context, String romPath, String romMd5,
+    public static void startGameActivity( Context context, String romPath, String romMd5, String romCrc,
-            String cheatArgs, boolean doRestart, boolean isXperiaPlay )
+            String romHeaderName, byte romCountryCode, boolean doRestart, boolean isXperiaPlay )
     {
         Intent intent = isXperiaPlay
                 ? new Intent( context, GameActivityXperiaPlay.class )
                 : new Intent( context, GameActivity.class );
         intent.putExtra( ActivityHelper.Keys.ROM_PATH, romPath );
         intent.putExtra( ActivityHelper.Keys.ROM_MD5, romMd5 );
-        intent.putExtra( ActivityHelper.Keys.CHEAT_ARGS, cheatArgs );
+        intent.putExtra( ActivityHelper.Keys.ROM_CRC, romCrc );
+        intent.putExtra( ActivityHelper.Keys.ROM_HEADER_NAME, romHeaderName );
+        intent.putExtra( ActivityHelper.Keys.ROM_COUNTRY_CODE, romCountryCode );
         intent.putExtra( ActivityHelper.Keys.DO_RESTART, doRestart );
         context.startActivity( intent );
     }
@@ -139,11 +143,15 @@ public static void startGlobalPrefsActivity( Context context, int menuDisplayMod
         context.startActivity( intent );
     }
 
-    public static void startGamePrefsActivity( Context context, String romPath, String romMd5 )
+    public static void startGamePrefsActivity( Context context, String romPath, String romMd5,
+        String romCrc, String romHeaderName, byte romCountryCode )
     {
         Intent intent = new Intent( context, GamePrefsActivity.class );
         intent.putExtra( ActivityHelper.Keys.ROM_PATH, romPath );
         intent.putExtra( ActivityHelper.Keys.ROM_MD5, romMd5 );
+        intent.putExtra( ActivityHelper.Keys.ROM_CRC, romCrc );
+        intent.putExtra( ActivityHelper.Keys.ROM_HEADER_NAME, romHeaderName );
+        intent.putExtra( ActivityHelper.Keys.ROM_COUNTRY_CODE, romCountryCode );
         context.startActivity( intent );
     }