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

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -6,15 +6,18 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings.Secure;
 import android.telephony.TelephonyManager;
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
+import com.badlogic.gdx.utils.Base64Coder;
 import io.anuke.kryonet.DefaultThreadImpl;
 import io.anuke.kryonet.KryoClient;
 import io.anuke.kryonet.KryoServer;
 import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
 import io.anuke.mindustry.io.Platform;
 import io.anuke.mindustry.net.Net;
+import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.scene.ui.TextField;
 import io.anuke.ucore.scene.ui.layout.Unit;
 
@@ -23,6 +26,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Random;
 
 public class AndroidLauncher extends AndroidApplication{
 	boolean doubleScaleTablets = true;
@@ -97,6 +101,40 @@ public class AndroidLauncher extends AndroidApplication{
 			public boolean isDebug() {
 				return false;
 			}
+
+			@Override
+			public byte[] getUUID() {
+				try {
+					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) {
+						data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+								+ Character.digit(s.charAt(i + 1), 16));
+					}
+
+					return data;
+				}catch (Exception e){
+					return null;
+				}
+			}
 		};
 
 		if(doubleScaleTablets && isTablet(this.getContext())){