From 94e8aaf9f9f6ee8fd5b16268673bd3cf8a89bedf Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sun, 28 Jan 2018 14:15:20 -0500 Subject: [PATCH] Updated server URL --- .idea/modules.xml | 2 +- README.md | 8 ++++---- .../main/java/us/keithirwin/tracman/LocationService.java | 2 +- .../main/java/us/keithirwin/tracman/LoginActivity.java | 2 +- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index 3086b1f..3e9e851 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index 4e3eab1..a8f0683 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# []Tracman for Android +# []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. diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java index 54d636b..596e149 100644 --- a/app/src/main/java/us/keithirwin/tracman/LocationService.java +++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java @@ -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; diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java index 6f9be06..567f62e 100644 --- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java +++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java @@ -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; diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e1de3f8..2e1ecaf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -8,7 +8,7 @@ FEHLER: Könnte nicht zum Google API Server verbinden. Hilfe Ladet… - Einloggen oder ein neues Konto erstellen. + Einloggen oder ein neues Konto erstellen. Einloggen FEHLER: Nutzer nicht gefunden. Ausloggen @@ -47,7 +47,7 @@ Sendungen einschalten Aktualisierung Vorrang - Passwort vergessen? + Passwort vergessen? Einloggen Email Passwort diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 45e7fe5..4cac28b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -14,7 +14,7 @@ Transmisiónes apagado ERROR: No se puede conectar al Google API servidor. Ayuda - Iniciar una sesión o participar. + Iniciar una sesión o participar. Iniciar sesión ERROR: Usario no encontrado Cerrar sesión @@ -47,7 +47,7 @@ Encender transmisiónes Actualizaciones de ubicación - Olividé su contrasena? + Olividé su contrasena? Inciar session email contrasena diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7e8af54..505699d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ Login Logout - Log in or create an account. + Log in or create an account. ERROR: Unable to connect to Tracman server. @@ -95,7 +95,7 @@ Bug report - Forgot your password? + Forgot your password? Login email password