Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
This commit is contained in:
Anuken
2018-03-09 20:58:21 -05:00
parent 89ca9ad213 0310614392
commit 9c05ddbd7d
15 changed files with 2205 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -108,21 +108,6 @@ public class AndroidLauncher extends AndroidApplication{
String s = Secure.getString(getContext().getContentResolver(),
Secure.ANDROID_ID);
if(s == null){
Settings.defaults("uuid", "");
String uuid = Settings.getString("uuid");
if(uuid.isEmpty()){
byte[] result = new byte[8];
new Random().nextBytes(result);
uuid = new String(Base64Coder.encode(result));
Settings.putString("uuid", uuid);
Settings.save();
return result;
}
return Base64Coder.decode(uuid);
}
int len = s.length();
byte[] data = new byte[len / 2];
for (int i = 0; i < len; i += 2) {
@@ -132,7 +117,18 @@ public class AndroidLauncher extends AndroidApplication{
return data;
}catch (Exception e){
return null;
Settings.defaults("uuid", "");
String uuid = Settings.getString("uuid");
if(uuid.isEmpty()){
byte[] result = new byte[8];
new Random().nextBytes(result);
uuid = new String(Base64Coder.encode(result));
Settings.putString("uuid", uuid);
Settings.save();
return result;
}
return Base64Coder.decode(uuid);
}
}
};