From 78352d3c2dccc2ac3dac5be35b70352dbb57c4a2 Mon Sep 17 00:00:00 2001
From: Keith <hypergeek14@gmail.com>
Date: Wed, 22 Jun 2016 21:18:35 -0400
Subject: [PATCH] Added security token

---
 .../main/java/us/keithirwin/tracman/LocationService.java   | 3 +++
 app/src/main/java/us/keithirwin/tracman/LoginActivity.java | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java
index 9db726c..357516d 100644
--- a/app/src/main/java/us/keithirwin/tracman/LocationService.java
+++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java
@@ -39,6 +39,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 
 	private Socket mSocket;
 	private String mUserID;
+	private String mUserSK;
 	private SharedPreferences sharedPref;
 	Location mLastLocation;
 	private GoogleApiClient mGoogleApiClient;
@@ -118,6 +119,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		Log.d(TAG, "LowPowerReceiver activated");
 
 		mUserID = sharedPref.getString("loggedInUserId", null);
+		mUserSK = sharedPref.getString("loggedInUserId", null);
 		final String SERVER_ADDRESS = "https://tracman.org/";
 
 		// Connect to socket
@@ -209,6 +211,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		JSONObject mLocationView = new JSONObject();
 		try {
 			mLocationView.put("usr", mUserID);
+			mLocationView.put("tok", mUserSK);
 			mLocationView.put("lat", String.valueOf(location.getLatitude()));
 			mLocationView.put("lon", String.valueOf(location.getLongitude()));
 			mLocationView.put("dir", String.valueOf(location.getBearing()));
diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
index d2235e0..e300205 100644
--- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
@@ -143,20 +143,20 @@ public class LoginActivity extends AppCompatActivity implements
 					String userString = res.body().string();
 					System.out.println("Full response: " + userString);
 
-					String userID, userName;
+					String userID, userName, userSK;
 					try {
 						JSONObject user = new JSONObject(userString);
 						userID = user.getString("_id");
 						userName = user.getString("name");
+						userSK = user.getString("sk32");
 						Log.v(TAG, "User retrieved with ID: " + userID);
-
 					} catch (JSONException e) {
 						Log.e(TAG, "Unable to parse user JSON: ", e);
 						Log.e(TAG, "JSON String used: " + userString);
 						userID = null;
 						userName = null;
+						userSK = null;
 					}
-					Log.v(TAG, "UserID: " + userID);
 
 					// Save user as loggedInUser
 					SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
@@ -164,6 +164,7 @@ public class LoginActivity extends AppCompatActivity implements
 					editor.putString("loggedInUser", userString);
 					editor.putString("loggedInUserId", userID);
 					editor.putString("loggedInUserName", userName);
+					editor.putString("loggedInUserSk", userSK);
 					editor.commit();
 
 					startActivity(new Intent(getBaseContext(), MainActivity.class));