Small fix with table headings in CSV And TLS version in app

co60ca · Sep 18, 2018 · 4a826e1 · 4a826e1
1 parent c03a335
commit 4a826e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Server Application/server.go b/Server Application/server.go
@@ -173,7 +173,7 @@ func writeCSV(csvType int, d Data, experimentName string) bool {
 			fmt.Fprintf(writer, "\n\"%s\",%f,%f,%d", data.Datetime, data.Data[0], data.Data[1], data.Paused)
 		}
 	} else if csvType == CSV_ACCELERATION {
-		fmt.Fprintf(writer, "\"Datetime\",\"realx\",\"realy\"")
+		fmt.Fprintf(writer, "\"Datetime\",\"realx\",\"realy\",\"realz\"")
 		for _, data := range d.AccelerometerData {
 			fmt.Fprintf(writer, "\n\"%s\",%f,%f,%f", data.Datetime, data.Data[0], data.Data[1], data.Data[2])
 		}

diff --git a/app/src/main/java/ca/uoguelph/pspenler/maptracker/MainActivity.java b/app/src/main/java/ca/uoguelph/pspenler/maptracker/MainActivity.java
@@ -359,7 +359,7 @@ private SSLContext getSingleSSLContext() {
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
             tmf.init(keyStore);
 
-            SSLContext context = SSLContext.getInstance("TLS");
+            SSLContext context = SSLContext.getInstance("TLSv1.2");
             context.init(null, tmf.getTrustManagers(), null);
             return context;
         } catch (Exception e) {