Project

General

Profile

« Previous | Next » 

Revision b525bc12

Added by Leszek Koltunski about 1 year ago

Make it possible to download objects with no extras file. Up VERSION_OBJECT_APP to 13.

View differences:

src/main/java/org/distorted/external/RubikUpdates.java
107 107
    try { oIcon = Integer.parseInt(iconPresent); }
108 108
    catch (NumberFormatException ex) { oIcon = 0; }
109 109

  
110
    if( oVersion>=0 && eVersion>=0 && oPercent>=0 )
110
    if( oVersion>=-1 && eVersion>=-1 && oPercent>=0 )
111 111
      {
112 112
      String upperName = shortName.toUpperCase(Locale.ENGLISH);
113 113
      int objOrdinal = RubikObjectList.getOrdinal(upperName);
......
127 127
      if( updateO || updateE )
128 128
        {
129 129
        UpdateInfo info = new UpdateInfo(shortName,longName,description,oVersion,eVersion,oPercent,oIcon,updateO,updateE);
130
        if(oPercent>=100)
130
        if( oPercent>=100 )
131 131
          {
132 132
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "object added to completed");
133 133
          mCompleted.add(info);
src/main/java/org/distorted/objects/RubikObject.java
96 96
    mSolverOrdinal = -1;
97 97

  
98 98
    mMeshID        =  0;
99
    mJsonID        = -1;
100
    mExtrasID      = -1;
101
    mIconID        = -1;
99
    mJsonID        = object.object ? -1 : 0;
100
    mExtrasID      = object.extras ? -1 : 0;
101
    mIconID        = object.icon   ? -1 : 0;
102 102
    }
103 103

  
104 104
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff