ki9
/
tracman-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepared for production server

master
Keith Irwin 2018-01-28 16:59:25 -05:00
parent 9cd3d4e6a9
commit cf61c76802
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/us/keithirwin/tracman/LocationService.java
View File

@ -47,9 +47,9 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
final static private int ICON_HALF = 1; final static private int ICON_HALF = 1;
final static private int ICON_OFF = 0; final static private int ICON_OFF = 0;
// Development // Development
final String SERVER_ADDRESS = "https://dev.tracman.org"; // final String SERVER_ADDRESS = "https://dev.tracman.org";
// Production // Production
// final String SERVER_ADDRESS = "https://www.tracman.org"; final String SERVER_ADDRESS = "https://www.tracman.org";
private Socket socket; private Socket socket;
private String mUserID; private String mUserID;

8
app/src/main/java/us/keithirwin/tracman/LoginActivity.java
View File

@ -50,11 +50,11 @@ public class LoginActivity extends AppCompatActivity implements
private static boolean DONT_LOG_IN = false; private static boolean DONT_LOG_IN = false;
// Development // Development
private final String SERVER_ADDRESS = "https://dev.tracman.org/"; // private final String SERVER_ADDRESS = "https://dev.tracman.org/";
private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com"; // private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com";
// Production // Production
// private final String SERVER_ADDRESS = "https://www.tracman.org/"; private final String SERVER_ADDRESS = "https://www.tracman.org/";
// private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com"; private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com";
private GoogleApiClient mGoogleApiClient; private GoogleApiClient mGoogleApiClient;
private ProgressDialog mProgressDialog; private ProgressDialog mProgressDialog;