Updated server URL

master
Keith Irwin 2018-01-28 14:15:20 -05:00
parent 57f7aaf281
commit 94e8aaf9f9
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
7 changed files with 13 additions and 13 deletions

View File

@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Tracman.iml" filepath="$PROJECT_DIR$/Tracman.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/tracman-android.iml" filepath="$PROJECT_DIR$/tracman-android.iml" />
</modules>
</component>
</project>

View File

@ -1,4 +1,4 @@
# <img align="left" src="https://tracman.org/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman for Android
# <img align="left" src="https://www.tracman.org/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman for Android
###### v 0.6.0
Android app to upload a user's GPS location to the [tracman server](https://github.com/tracman-org/Server).
@ -13,11 +13,11 @@ In order to apply changes to settings, you need to hit the back button and retur
The app will switch between "realtime updates" (Every second, or whatever interval you set up in the settings) and "occasional updates", depending on if there are visitors to your map. This prevents the app from draining your battery when nobody's looking at your location anyway.
More information is available on the [help page](https://tracman.org/help#android).
More information is available on the [help page](https://www.tracman.org/help#android).
## Contributing
Tracman for Android is in perpetually poor condition. I just don't know enough about android/java to create a top-quality app. I think this project would benefit greatly from being torn down and rebuilt from scratch. If you know anything about Android, you probably know more than me. Feel free to check out the [issues marked help wanted](https://github.com/Tracman-org/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) (or [any issues](https://github.com/Tracman-org/Android/issues), really) or [contact me](https://keithirwin.us/contact) about getting involved.
Tracman for Android is in perpetually poor condition. I just don't know enough about android/java to create a top-quality app. I think this project would benefit greatly from being torn down and rebuilt from scratch. If you know anything about Android, you probably know more than me. Feel free to check out the [issues marked help wanted](https://github.com/Tracman-org/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) (or [any issues](https://github.com/Tracman-org/Android/issues), really) or [contact me](https://www.keithirwin.us/contact) about getting involved.
## Changelog
@ -37,7 +37,7 @@ Tracman for Android is in perpetually poor condition. I just don't know enough
###### see [LICENSE.md](https://github.com/Tracman-org/Android/blob/master/LICENSE.md)
Tracman: GPS tracking app for android
Copyright © 2017 [Keith Irwin](https://keithirwin.us/)
Copyright © 2017 [Keith Irwin](https://www.keithirwin.us/)
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

View File

@ -49,7 +49,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
// Development
final String SERVER_ADDRESS = "https://dev.tracman.org";
// Production
// final String SERVER_ADDRESS = "https://tracman.org";
// final String SERVER_ADDRESS = "https://www.tracman.org";
private Socket socket;
private String mUserID;

View File

@ -53,7 +53,7 @@ public class LoginActivity extends AppCompatActivity implements
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 final String SERVER_ADDRESS = "https://www.tracman.org/";
// private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com";
private GoogleApiClient mGoogleApiClient;

View File

@ -8,7 +8,7 @@
<string name="google_connection_error">FEHLER: Könnte nicht zum Google API Server verbinden. </string>
<string name="help_name">Hilfe</string>
<string name="loading">Ladet…</string>
<string name="login_description">Einloggen oder <a href="https://tracman.org/login#join">ein neues Konto erstellen</a>. </string>
<string name="login_description">Einloggen oder <a href="https://www.tracman.org/login#join">ein neues Konto erstellen</a>. </string>
<string name="login_name">Einloggen</string>
<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
<string name="logout_name">Ausloggen</string>
@ -47,7 +47,7 @@
</string-array>
<string name="pref_title_gps_broadcast">Sendungen einschalten</string>
<string name="pref_title_broadcast_priority">Aktualisierung Vorrang</string>
<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Passwort vergessen?</a></string>
<string name="login_forgot_password"><a href="https://www.tracman.org/login/forgot">Passwort vergessen?</a></string>
<string name="login_button_text">Einloggen</string>
<string name="email">Email</string>
<string name="password">Passwort</string>

View File

@ -14,7 +14,7 @@
<string name="broadcast_disabled">Transmisiónes apagado</string>
<string name="google_connection_error">ERROR: No se puede conectar al Google API servidor. </string>
<string name="help_name">Ayuda</string>
<string name="login_description">Iniciar una sesión o <a href="https://tracman.org/login">participar</a>. </string>
<string name="login_description">Iniciar una sesión o <a href="https://www.tracman.org/login">participar</a>. </string>
<string name="login_name">Iniciar sesión</string>
<string name="login_no_user_error">ERROR: Usario no encontrado</string>
<string name="logout_name">Cerrar sesión</string>
@ -47,7 +47,7 @@
</string-array>
<string name="pref_title_gps_broadcast">Encender transmisiónes</string>
<string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Olividé su contrasena?</a></string>
<string name="login_forgot_password"><a href="https://www.tracman.org/login/forgot">Olividé su contrasena?</a></string>
<string name="login_button_text">Inciar session</string>
<string name="email">email</string>
<string name="password">contrasena</string>

View File

@ -12,7 +12,7 @@
<!-- Strings related to login -->
<string name="login_name">Login</string>
<string name="logout_name">Logout</string>
<string name="login_description">Log in or <a href="https://tracman.org/login#join">create an account</a>. </string>
<string name="login_description">Log in or <a href="https://www.tracman.org/login#join">create an account</a>. </string>
<string name="server_connection_error">ERROR: Unable to connect to Tracman server. </string>
<!-- Strings related to notifications -->
@ -95,7 +95,7 @@
<!--Strings related to bugs-->
<string name="bugs_name">Bug report</string>
<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a></string>
<string name="login_forgot_password"><a href="https://www.tracman.org/login/forgot">Forgot your password?</a></string>
<string name="login_button_text">Login</string>
<string name="email">email</string>
<string name="password">password</string>