diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/app/app-release.apk b/app/app-release.apk
index 5559a69..77df6ec 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java
index 62eca8e..a625d41 100644
--- a/app/src/main/java/us/keithirwin/tracman/LocationService.java
+++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java
@@ -10,17 +10,16 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
-//import android.content.pm.PackageManager;
import android.content.pm.PackageManager;
import android.location.Location;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.os.Bundle;
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
-//import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.NotificationCompat;
-//import android.support.v4.content.ContextCompat;
import android.support.v4.content.ContextCompat;
import android.util.Log;
@@ -237,19 +236,33 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
@Override
public void onLocationChanged(Location location) {
- JSONObject mLocationView = new JSONObject();
- try {
- mLocationView.put("usr", mUserID);
- mLocationView.put("tok", mUserSK);
- mLocationView.put("lat", String.valueOf(location.getLatitude()));
- mLocationView.put("lon", String.valueOf(location.getLongitude()));
- mLocationView.put("dir", String.valueOf(location.getBearing()));
- mLocationView.put("spd", String.valueOf(location.getSpeed()));
- } catch (JSONException e) {
-// Log.e(TAG, "Failed to put JSON data");
+
+ // Check for internet connectivity
+ ConnectivityManager cm =
+ (ConnectivityManager)this.getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+ boolean isConnected = activeNetwork != null &&
+ activeNetwork.isConnectedOrConnecting();
+
+ if (isConnected) {
+ JSONObject mLocationView = new JSONObject();
+ try {
+ mLocationView.put("usr", mUserID);
+ mLocationView.put("tok", mUserSK);
+ mLocationView.put("lat", String.valueOf(location.getLatitude()));
+ mLocationView.put("lon", String.valueOf(location.getLongitude()));
+ mLocationView.put("dir", String.valueOf(location.getBearing()));
+ mLocationView.put("spd", String.valueOf(location.getSpeed()));
+ } catch (JSONException e) {
+ // Log.e(TAG, "Failed to put JSON data");
+ }
+ mSocket.emit("app", mLocationView);
+ // Log.v(TAG, "Location updated: " + mLocationView.toString());
+
+ } else {
+ showNotification(getString(R.string.not_connected), false);
}
- mSocket.emit("app", mLocationView);
-// Log.v(TAG, "Location updated: " + mLocationView.toString());
+
}
@Override
diff --git a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
index 3bfe042..003d5f7 100644
--- a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
@@ -36,8 +36,7 @@ import java.util.List;
* API Guide for more information on developing a Settings UI.
*/
public class SettingsActivity extends AppCompatPreferenceActivity {
- private static final String TAG = "SettingsActivity";
-
+// private static final String TAG = "SettingsActivity";
private static int MY_FINE_LOCATION_PERMISSION = 425;
/**
@@ -208,7 +207,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
addPreferencesFromResource(R.xml.pref_general);
setHasOptionsMenu(true);
- // Bind the summary of server address preference to its value
+ // Bind the summary of preferences to their value
bindPreferenceSummaryToValue(findPreference("broadcast_frequency"));
bindPreferenceSummaryToValue(findPreference("broadcast_priority"));
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c16c9f1..656f621 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -16,10 +16,6 @@
FEHLER: Nutzer nicht gefunden.
Ausloggen
Hauptsicht
- Hallo%1$s! \n
- Auf dem Hamburger klicken, Einstellungen zu ändern. \n\nAuf dem Knopf darunter klicken, deine Standort im Broswer zu zeigen.
- Navigation schließen
- Navigation aufmachen
Aktualisiert gelegentlich
Aktualisiert realtime
App Einstellungen
@@ -29,8 +25,6 @@
Einstellungen
FEHLER: Könnte nicht zum Tracman Server verbinden.
Vorschläge
- Karte zeigen
- Wilkommen
Aktualisierung Zwischenraum
- 1 Sekund
@@ -56,4 +50,5 @@
Sendungen einschalten
Aktualisierung Vorrang
+ Kein Internet Zugang
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 412fcbc..3c6b3d3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,8 +3,6 @@
Atras
Info
conectando…
- Bienvenido
- Hola%1$s! \n
Mostrar licensia en el navegador (inglés)
Cargando…
Conexión perdida
@@ -12,7 +10,6 @@
Informe de error
Configuración principales
Configuración
- Mostrar mapa
Sugerencias
ERROR: No se puede conectar al servidor de Tracman.
Se actualiza a veces
@@ -25,8 +22,6 @@
ERROR: Usario no encontrado
Cerrar sesión
Vida principal
- Cerrar navegación
- Abrir navegación
Configuración de la aplicación
Iniciar el servicio al encender
Intervalo de actualización
@@ -53,7 +48,6 @@
- Ciudad
- Sin energía
- Encender transmisiónes
- Haga clic en el menú de hamburguesa para cambiar la configuración. \n\n Haga clic en el botón abajo para ver su ubicación en su navegador.
- Actualizaciones de ubicación
+ Encender transmisiónes Actualizaciones de ubicación
+ "Sin conexión a Internet "
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ecfb36..2628c1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,16 +22,7 @@
Sending realtime updates
Sending occasional updates
Broadcast disabled
-
-
- Open navigation drawer
- Close navigation drawer
-
-
- Welcome
- Hi%1$s! \n
- Tap on the hamburger menu to change settings. \n\nTap on the button below to see your location in your browser.
- View Map
+ No internet connection
Settings