Using dev server
parent
dd88598ac7
commit
80cbfdc89f
|
@ -46,9 +46,9 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
|
||||||
final int ICON_HALF = 1;
|
final int ICON_HALF = 1;
|
||||||
final int ICON_OFF = 0;
|
final 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://tracman.org";
|
// final String SERVER_ADDRESS = "https://tracman.org";
|
||||||
|
|
||||||
private Socket socket;
|
private Socket socket;
|
||||||
private String mUserID;
|
private String mUserID;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue