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

Prepared release for production

master
Keith Irwin 2017-04-26 13:00:10 -04:00
parent f5cbd47795
commit c21150632d
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,10 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
final int ICON_ON = 2; final int ICON_ON = 2;
final int ICON_HALF = 1; final int ICON_HALF = 1;
final int ICON_OFF = 0; final int ICON_OFF = 0;
final String SERVER_ADDRESS = "https://dev.tracman.org"; // Development
// final String SERVER_ADDRESS = "https://dev.tracman.org";
// Production
final String SERVER_ADDRESS = "https://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://tracman.org/"; private final String SERVER_ADDRESS = "https://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;