Fixed sending empty boards over bt and bumped version to 2.1.0

Author: henrykvdb

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.henrykvdb.sttt"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 16
-        versionName "2.0.0"
+        versionCode 17
+        versionName "2.1.0"
         jackOptions {
             enabled true
         }
@@ -31,9 +31,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.support:design:26.1.0'
 
-    compile 'com.google.firebase:firebase-core:11.6.0'
-    compile 'com.google.firebase:firebase-ads:11.6.0'
-    compile 'com.google.firebase:firebase-crash:11.6.0'
+    compile 'com.google.firebase:firebase-core:11.8.0'
+    compile 'com.google.firebase:firebase-ads:11.8.0'
+    compile 'com.google.firebase:firebase-crash:11.8.0'
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }

app/src/main/java/com/flaghacker/sttt/common/JSONBoard.kt

@@ -4,27 +4,27 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 fun Board.toJSON(): JSONObject {
-	val json = JSONObject()
-	val jsonBoard = JSONArray()
-	for (i in 0 until 81) jsonBoard.put(tile(i.toByte()).toNiceString())
+    val json = JSONObject()
+    val jsonBoard = JSONArray()
+    for (i in 0 until 81) jsonBoard.put(tile(i.toByte()).toNiceString())
 
-	json.put("board", jsonBoard)
-	json.put("macroMask", macroMask())
-	json.put("lastMove",lastMove()?.toInt())
+    json.put("board", jsonBoard)
+    json.put("macroMask", macroMask())
+    json.put("lastMove", lastMove()?.toInt())
 
-	return json
+    return json
 }
 
 class JSONBoard {
-	companion object {
-		fun fromJSON(json: JSONObject): com.flaghacker.sttt.common.Board {
-			val board = Array(9, { Array(9, { Player.NEUTRAL }) })
-			for (i in 0 until 81)
-				board[i.toPair().first][i.toPair().second] = fromNiceString(json.getJSONArray("board").getString(i))
-			val macroMask = json.getInt("macroMask")
-			val lastMove = json.getInt("lastMove")
+    companion object {
+        fun fromJSON(json: JSONObject): com.flaghacker.sttt.common.Board {
+            val board = Array(9, { Array(9, { Player.NEUTRAL }) })
+            for (i in 0 until 81)
+                board[i.toPair().first][i.toPair().second] = fromNiceString(json.getJSONArray("board").getString(i))
+            val macroMask = json.getInt("macroMask")
+            val lastMove = if (json.length() == 3) json.getInt("lastMove") else null
 
-			return Board(board, macroMask, lastMove.toByte())
-		}
-	}
+            return Board(board, macroMask, lastMove?.toByte())
+        }
+    }
 }