Revision 318c0a7d
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/network/RubikNetwork.java | ||
|---|---|---|
| 34 | 34 |
import androidx.fragment.app.FragmentActivity; |
| 35 | 35 |
|
| 36 | 36 |
import org.distorted.library.main.DistortedLibrary; |
| 37 |
import org.distorted.objectlib.main.ObjectList;
|
|
| 37 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 38 | 38 |
|
| 39 |
import static org.distorted.objectlib.main.ObjectList.MAX_LEVEL;
|
|
| 40 |
import static org.distorted.objectlib.main.ObjectList.NUM_OBJECTS;
|
|
| 39 |
import static org.distorted.objectlib.main.ObjectType.MAX_LEVEL;
|
|
| 40 |
import static org.distorted.objectlib.main.ObjectType.NUM_OBJECTS;
|
|
| 41 | 41 |
|
| 42 | 42 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 43 | 43 |
|
| ... | ... | |
| 204 | 204 |
|
| 205 | 205 |
if( s5>s4 && s4>s3 && s3>s2 && s2>s1 && s1>0 ) |
| 206 | 206 |
{
|
| 207 |
int object = ObjectList.getOrdinal( row.substring(0,s1) );
|
|
| 207 |
int object = ObjectType.getOrdinal( row.substring(0,s1) );
|
|
| 208 | 208 |
|
| 209 | 209 |
if( object>=0 && object<NUM_OBJECTS ) |
| 210 | 210 |
{
|
| ... | ... | |
| 471 | 471 |
|
| 472 | 472 |
String url="https://distorted.org/magic/cgi-bin/download.cgi"; |
| 473 | 473 |
url += "?n="+name+"&v="+veri+"&r="+numRuns+"&p="+numPlay+"&c="+country+"&e="+mVersion+"d"; |
| 474 |
url += "&o="+ ObjectList.getObjectList()+"&min=0&max="+MAX_LEVEL+"&l="+MAX_PLACES;
|
|
| 474 |
url += "&o="+ ObjectType.getObjectList()+"&min=0&max="+MAX_LEVEL+"&l="+MAX_PLACES;
|
|
| 475 | 475 |
|
| 476 | 476 |
return url; |
| 477 | 477 |
} |
| ... | ... | |
| 501 | 501 |
String url1="https://distorted.org/magic/cgi-bin/submit.cgi"; |
| 502 | 502 |
String url2 = "n="+name+"&v="+veri+"&r="+numRuns+"&p="+numPlay+"&i="+deviceID+"&e="+mVersion+"d"; |
| 503 | 503 |
url2 += "&d="+renderer+"&s="+version; |
| 504 |
url2 += reclist+"&c="+country+"&f="+epoch+"&oo="+ ObjectList.getObjectList();
|
|
| 504 |
url2 += reclist+"&c="+country+"&f="+epoch+"&oo="+ ObjectType.getObjectList();
|
|
| 505 | 505 |
url2 += "&min=0&max="+MAX_LEVEL+"&lo="+MAX_PLACES; |
| 506 | 506 |
String hash = computeHash( url2, salt.getBytes() ); |
| 507 | 507 |
|
Also available in: Unified diff
Reename ObjectList to a more logical ObjectType.