From 80cbfdc89f89ef230272645230e53b21fb2cd15e Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sat, 6 May 2017 17:44:43 -0400 Subject: [PATCH] Using dev server --- .../main/java/us/keithirwin/tracman/LocationService.java | 4 ++-- .../main/java/us/keithirwin/tracman/LoginActivity.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java index f6b89f4..d913568 100644 --- a/app/src/main/java/us/keithirwin/tracman/LocationService.java +++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java @@ -46,9 +46,9 @@ public class LocationService extends Service implements GoogleApiClient.Connecti final int ICON_HALF = 1; final int ICON_OFF = 0; // Development -// final String SERVER_ADDRESS = "https://dev.tracman.org"; + final String SERVER_ADDRESS = "https://dev.tracman.org"; // Production - final String SERVER_ADDRESS = "https://tracman.org"; +// final String SERVER_ADDRESS = "https://tracman.org"; private Socket socket; private String mUserID; diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java index 6f85820..ca4a398 100644 --- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java +++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java @@ -50,11 +50,11 @@ public class LoginActivity extends AppCompatActivity implements private static boolean DONT_LOG_IN = false; // Development -// private final String SERVER_ADDRESS = "https://dev.tracman.org/"; -// private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com"; + private final String SERVER_ADDRESS = "https://dev.tracman.org/"; + private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com"; // Production - private final String SERVER_ADDRESS = "https://tracman.org/"; - private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com"; +// private final String SERVER_ADDRESS = "https://tracman.org/"; +// private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com"; private GoogleApiClient mGoogleApiClient; private ProgressDialog mProgressDialog;