diff --git a/app/release/app-release-4.0.0i.apk b/app/release/app-release-4.0.0j.apk similarity index 59% rename from app/release/app-release-4.0.0i.apk rename to app/release/app-release-4.0.0j.apk index 167e2d4..bbca98b 100644 Binary files a/app/release/app-release-4.0.0i.apk and b/app/release/app-release-4.0.0j.apk differ diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java index bdc1f87..cbd631e 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java @@ -293,8 +293,8 @@ public class LogManagerControlActivity extends AppCompatActivity { if (mRemoteEventsList != null) { ListView lv = (ListView) findViewById(R.id.remoteEventsLv); ListAdapter adapter = new RemoteEventsAdapter(LogManagerControlActivity.this, mRemoteEventsList, R.layout.log_entry_layout_remote, - new String[]{"dataTime", "type", "subType", "osdAlarmStateStr", "desc"}, - new int[]{R.id.event_date_remote_tv, R.id.event_type_remote_tv, R.id.event_subtype_remote_tv, + new String[]{"id","dataTime", "type", "subType", "osdAlarmStateStr", "desc"}, + new int[]{R.id.event_id_remote_tv, R.id.event_date_remote_tv, R.id.event_type_remote_tv, R.id.event_subtype_remote_tv, R.id.event_alarmState_remote_tv, R.id.event_notes_remote_tv}); lv.setAdapter(adapter); //Log.i(TAG,"adapter[0]="+adapter.getItem(0)); diff --git a/app/src/main/res/layout/log_entry_layout_remote.xml b/app/src/main/res/layout/log_entry_layout_remote.xml index ffd6bee..a6c6fbd 100644 --- a/app/src/main/res/layout/log_entry_layout_remote.xml +++ b/app/src/main/res/layout/log_entry_layout_remote.xml @@ -4,10 +4,28 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + android:text="eventId" /> + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a7b3c53..58f1696 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -105,7 +105,6 @@ SMS Location Alarm Active SMS Location Alarm Disabled Cancel Audible Active - not sending SMS - SMS Alarms Disabled - not doing anything! Network State Changed - no Wifi Connection Network State Changed - No Active Network Problem Parsing Preferences - Something won\'t work - Please go back to Settings and correct it! diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c12f7c6..c68f080 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -120,7 +120,6 @@ Alarma de Localización de SMS Activa Alarma de Localización de SMS Inactiva Cancele Alarma Audible - no enviando SMS - Alarmas de SMS Incativas - No está haciendo nada ! Cambio en el Estado de Red - Sin Conexión de Wifi Cambio en el Estado de Red - Sin Red Activa Problema al Interpretar las Preferencias - Algo no está Trabajando - Por favor regrese a Ajustes y corríjalo ! diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 76117f2..dc0051b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -128,7 +128,6 @@ Wysyłaj lokalizację w SMS Nie wysyłaj lokalizacji w SMS Wyłączono alarmy dźwiękowe - nie wysyłam SMS - Wyłączono alarmy SMS - nic nie zrobię! Stan sieci zmieniony - brak połączenia Wifi Stan sieci zmieniony - brak aktywnych sieci Problem z ustawieniami - to nie zadziała - proszę wrócić do ustawień i poprawić to! diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 01e2db9..9bcbc8b 100644 Binary files a/app/src/main/res/values-ru/strings.xml and b/app/src/main/res/values-ru/strings.xml differ diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0a70a82..37ae8db 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -119,7 +119,6 @@ SMS positionslarm PÅ SMS positionslarm AV Stäng av ljudlarm - skicka inte SMS - SMS-larm avstängt- ingen åtgärd Nätverksstatus ändrad - ingen uppkoppling Nätverksstatus ändrad - inga aktiva nätverk Något gick fel! Problem med inställningarna - justera dessa.