Changed android UUID flow, again

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

@@ -108,7 +108,15 @@ public class AndroidLauncher extends AndroidApplication{
 					String s = Secure.getString(getContext().getContentResolver(),
 							Secure.ANDROID_ID);
 
-					if(s == null){
+					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){
                     Settings.defaults("uuid", "");
 
                     String uuid = Settings.getString("uuid");
@@ -122,18 +130,6 @@ public class AndroidLauncher extends AndroidApplication{
                     }
                     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;
-				}
 			}
 		};
 

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Thu Mar 08 20:46:47 EST 2018
+#Thu Mar 08 22:36:02 EST 2018
 version=release
-androidBuildCode=357
+androidBuildCode=359
 name=Mindustry
 code=3.4
-build=33
+build=custom build