/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision a8be1a23

Close assets after use.

+          {
           RubikFiles files = RubikFiles.getInstance();
           InputStream jsonStream = files.openFile(this,name+"_object.json");
           InitAssets assets = new InitAssets(jsonStream);
           InitAssets assets = new InitAssets(jsonStream,null);
           if( !assets.noJsonStream() )
+            {
             int meshState= TwistyObject.MESH_NICE;
             int iconMode = TwistyObject.MODE_NORM;
             SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
             SharedPreferences.Editor editor = preferences.edit();
             TwistyObject object = new TwistyJson( meshState, iconMode, null, null, 1.0f, assets);
             if( !object.getError() ) object.removePreferences(editor);
             editor.apply();
             TwistyObject object = new TwistyJson( TwistyObject.MESH_NICE, TwistyObject.MODE_NORM, null, null, 1.0f, assets);
             if( !object.getError() )
+              {
               SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
               SharedPreferences.Editor editor = preferences.edit();
               object.removePreferences(editor);
               editor.apply();
+              }
+            }
           mScreen.deleteObject(this,name);

           int meshState          = TwistyObject.MESH_NICE;
           int iconMode           = TwistyObject.MODE_NORM;
           InputStream jsonStream = files.openFile(this,name+"_object.json");
           InputStream meshStream = null;
           InitAssets asset       = new InitAssets(jsonStream,null);
           int ordinal            = 0; // if jsonStream!=null, this doesn't matter
           InitAssets asset       = new InitAssets(jsonStream,meshStream);
           control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
+          }

Also available in: Unified diff