Bluetooth checkouts list related fix

widavies · Mar 20, 2018 · 269bd40 · 269bd40
1 parent 8b962cf
commit 269bd40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.cpjd.roblu"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 59
-        versionName "4.4.5"
+        versionCode 60
+        versionName "4.4.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {

diff --git a/app/src/main/java/com/cpjd/roblu/sync/SyncHelper.java b/app/src/main/java/com/cpjd/roblu/sync/SyncHelper.java
@@ -288,7 +288,7 @@ public ArrayList<RCheckout> generateCheckoutsFromEvent(RTeam[] teams, long time)
             newCheckout.setID(id);
             newCheckout.setStatus(HandoffStatus.AVAILABLE);
 
-            if(mode == MODES.BLUETOOTH && newCheckout.getTeam().getLastEdit() > time) checkouts.add(newCheckout);
+            if(mode == MODES.BLUETOOTH && newCheckout.getTeam().getLastEdit() >= time) checkouts.add(newCheckout);
             else if(mode != MODES.BLUETOOTH)  checkouts.add(newCheckout);
             id++;
         }
@@ -307,7 +307,7 @@ public ArrayList<RCheckout> generateCheckoutsFromEvent(RTeam[] teams, long time)
                 check.setID(id);
                 check.setStatus(HandoffStatus.AVAILABLE);
 
-                if(mode == MODES.BLUETOOTH && check.getTeam().getLastEdit() > time) checkouts.add(check);
+                if(mode == MODES.BLUETOOTH && check.getTeam().getLastEdit() >= time) checkouts.add(check);
                 else if(mode != MODES.BLUETOOTH) checkouts.add(check);
 
                 id++;

diff --git a/app/src/main/java/com/cpjd/roblu/sync/bluetooth/BTServer.java b/app/src/main/java/com/cpjd/roblu/sync/bluetooth/BTServer.java
@@ -150,7 +150,7 @@ public void messageReceived(String header, String message) {
                 try {
                     bluetooth.send("CHECKOUTS", syncHelper.packCheckouts(checkouts));
                 } catch(Exception e) {
-                    Log.d("RBS", "Failed to map checkouts to Bluetooth output stream.");
+                    Log.d("RBS", "Failed to map checkouts to Bluetooth output stream. "+e.getMessage());
                 }
                 break;
             case "requestNumber":