Project

General

Profile

« Previous | Next » 

Revision fad10885

Added by Leszek Koltunski over 1 year ago

Move the 'bandaged' button back to the main menu.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
27 27
import org.distorted.external.RubikNetwork;
28 28
import org.distorted.external.RubikUpdates;
29 29
import org.distorted.objectlib.json.JsonReader;
30
import org.distorted.objects.MainEntry;
31
import org.distorted.objects.MainEntryList;
32
import org.distorted.objects.RubikObject;
33 30
import org.distorted.objects.RubikObjectList;
34 31
import org.distorted.screens.RubikScreenPlay;
35 32
import org.distorted.screens.ScreenList;
......
218 215
                                                                  mInfo.mExtrasMinorVersion, mIconSaved, oSuccess, eSuccess);
219 216
            if( success )
220 217
              {
221
              int numObjects = RubikObjectList.getNumObjects();
222
              int ordinal = numObjects-1;
223
              RubikObject rubikObject = RubikObjectList.getObject(ordinal);
224
              MainEntry entry = new MainEntry(rubikObject,ordinal);
225
              MainEntryList list = MainEntryList.getInstance();
226
              list.addEntry(entry);
227
              }
228

  
229
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2");
218
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2");
230 219

  
231
            RubikNetwork network = RubikNetwork.getInstance();
232
            network.updateDone(mInfo.mObjectShortName);
220
              RubikNetwork network = RubikNetwork.getInstance();
221
              network.updateDone(mInfo.mObjectShortName);
233 222

  
234
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "3");
223
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "3");
235 224

  
236
            RubikScreenPlay play = (RubikScreenPlay)ScreenList.PLAY.getScreenClass();
237
            play.recreatePopup();
225
              RubikScreenPlay play = (RubikScreenPlay)ScreenList.PLAY.getScreenClass();
226
              play.recreatePopup();
238 227

  
239
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "4");
228
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "4");
240 229

  
241
            makeProgress(100,R.string.success);
230
              makeProgress(100,R.string.success);
242 231

  
243
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "5");
232
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "5");
233
              }
234
            else
235
              {
236
              displayError(R.string.saveError);
237
              }
244 238
            }
245 239
          else
246 240
            {

Also available in: Unified diff