Project

General

Profile

« Previous | Next » 

Revision 298f3977

Added by Leszek Koltunski over 1 year ago

Partly merge the 'iap' branch.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
194 194
        try
195 195
          {
196 196
          JsonReader reader = JsonReader.getInstance();
197
          mInfo.mNumScrambles = reader.readNumScrambles(act,objectName);
198
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles);
197
          reader.readNumScramblesAndIsFree(act,objectName);
198
          mInfo.mNumScrambles = reader.getNumScrambles();
199
          mInfo.mIsFree       = reader.isFree();
200
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles+" isFree="+mInfo.mIsFree);
199 201

  
200 202
          if( mInfo.mExtrasStream!=null )
201 203
            {
......
211 213

  
212 214
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "1");
213 215

  
214
            boolean success = RubikObjectList.addDownloadedObject(act, mInfo.mObjectShortName,mInfo.mNumScrambles, mInfo.mObjectMinorVersion,
215
                                                                  mInfo.mExtrasMinorVersion, mIconSaved, oSuccess, eSuccess);
216
            boolean success = RubikObjectList.addDownloadedObject(act, mInfo.mObjectShortName, mInfo.mNumScrambles, mInfo.mIsFree,
217
                                                                  mInfo.mObjectMinorVersion, mInfo.mExtrasMinorVersion, mIconSaved, oSuccess, eSuccess);
216 218
            if( success )
217 219
              {
218 220
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2");

Also available in: Unified diff