2.0-beta2: add a delay to Bluetooth transmissions based on the AllianceStation

Author: 19lmyers

app/build.gradle

@@ -32,8 +32,8 @@ android {
         applicationId "com.team980.thunderscout"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 12 //Next public release: 13
-        versionName "2.0-beta1" //2018 will be when I make the semantic change
+        versionCode 13 //Next public release: 14
+        versionName "2.0-beta2" //2018 will be when I make the semantic change
         resConfigs "en"
     }
 

app/src/main/java/com/team980/thunderscout/bluetooth/ClientConnectionThread.java

@@ -92,6 +92,12 @@ public ClientConnectionThread(BluetoothDevice device, ScoutData data, Context co
     }
 
     public void run() {
+        try {
+            Thread.sleep(scoutData.getAllianceStation().getDelay()); //Variable delay based on AllianceStation
+        } catch (InterruptedException e) {
+            FirebaseCrash.report(e);
+        }
+
         // Cancel discovery because it will slow down the connection
         mBluetoothAdapter.cancelDiscovery();
 

app/src/main/java/com/team980/thunderscout/bluetooth/ServerConnectionTask.java

@@ -78,7 +78,7 @@ protected ScoutData doInBackground(Void[] params) {
         ObjectInputStream inputStream;
 
         try {
-            inputStream = new ObjectInputStream(mmSocket.getInputStream());
+            inputStream = new ObjectInputStream(mmSocket.getInputStream()); //TODO fix the IOException caused by the missing socket...
         } catch (IOException e) {
             FirebaseCrash.report(e);
             notificationManager.showBtTransferError(mmSocket.getRemoteDevice().getName(),

app/src/main/java/com/team980/thunderscout/schema/enumeration/AllianceStation.java

@@ -30,22 +30,24 @@
 import com.team980.thunderscout.R;
 
 public enum AllianceStation {
-    RED_1(AllianceColor.RED, R.color.alliance_red_primary, R.id.match_red1),
-    RED_2(AllianceColor.RED, R.color.alliance_red_primary_dark, R.id.match_red2),
-    RED_3(AllianceColor.RED, R.color.alliance_red_primary, R.id.match_red3),
+    RED_1(AllianceColor.RED, R.color.alliance_red_primary, R.id.match_red1, 0),
+    RED_2(AllianceColor.RED, R.color.alliance_red_primary_dark, R.id.match_red2, 100),
+    RED_3(AllianceColor.RED, R.color.alliance_red_primary, R.id.match_red3, 200),
 
-    BLUE_1(AllianceColor.BLUE, R.color.alliance_blue_primary, R.id.match_blue1),
-    BLUE_2(AllianceColor.BLUE, R.color.alliance_blue_primary_dark, R.id.match_blue2),
-    BLUE_3(AllianceColor.BLUE, R.color.alliance_blue_primary, R.id.match_blue3);
+    BLUE_1(AllianceColor.BLUE, R.color.alliance_blue_primary, R.id.match_blue1, 300),
+    BLUE_2(AllianceColor.BLUE, R.color.alliance_blue_primary_dark, R.id.match_blue2, 400),
+    BLUE_3(AllianceColor.BLUE, R.color.alliance_blue_primary, R.id.match_blue3, 500);
 
     AllianceColor color;
     int colorStratified;
     int matchCellViewID;
+    long delayInMillis;
 
-    AllianceStation(AllianceColor color, int colorStratified, @IdRes int matchCellViewID) {
+    AllianceStation(AllianceColor color, int colorStratified, @IdRes int matchCellViewID, long delayInMillis) {
         this.color = color;
         this.colorStratified = colorStratified;
         this.matchCellViewID = matchCellViewID;
+        this.delayInMillis = delayInMillis;
     }
 
     public AllianceColor getColor() {
@@ -61,6 +63,10 @@ public int getMatchCellViewID() {
         return matchCellViewID;
     }
 
+    public long getDelay() { //Client delay to prevent socket errors
+        return delayInMillis;
+    }
+
     public enum AllianceColor {
         RED("Red Alliance", R.color.alliance_red_primary, R.color.alliance_red_primary_dark),
         BLUE("Blue Alliance", R.color.alliance_blue_primary, R.color.alliance_blue_primary_dark);

app/src/main/res/values/strings.xml

@@ -26,26 +26,9 @@
     <string name="app_name">ThunderScout</string>
 
     <!--- TODO These must be updated for every public release!-->
-    <!--- TODO Last update: v12 -->
+    <!--- TODO Last update: v13 -->
     <string name="update_notes">
-        ThunderScout 2.0 redesigns the app\'s analytic features from the ground up to be more useful, relevant, and elegant.
-        \n
-        \nThe data analysis is now broken up into three tabs: Matches, Rankings, and Alliances.
-        \n
-        \nThe Matches tab displays a generated schedule of the event, allowing you to see at a glance all the data you have collected, or may be missing.
-        \n
-        \nThe Rankings tab ranks teams by an estimation of how many points they would score, on average, alone on the field based on your collected data.
-        \n
-        \nThe match and team breakdowns have been updated to highlight statistical performance and point estimations, and now take up less space.
-        \n
-        \nOther notable changes:
-        \n&#8226; A "gears dropped" field has been added to auto and teleop.
-        \n&#8226; The alliance field has been updated to reflect individual alliance stations.
-        \n&#8226; The Bluetooth Device selection preference now opens a system dialog.
-        \n&#8226; New squircle icon (now Adaptive on Android Oreo)
-        \n&#8226; And don\'t forget this very dialog, which is also accessible in the About menu!
-        \n
-        \nThere are a lot of other under-the-hood changes as well.
+        Beta 2 adds a variable delay to client-side Bluetooth transmissions based on the data\'s AllianceStation. This should improve Bluetooth reliability.
         \n
         \nKnown issues:
         \n&#8226; The match schedule currently does not show when multiple matches occupy the same slot.