diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index f85b748bde..6331eec80c 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-11 Santiago Munín <burning1@gmail.com>
+ * src/pandroid_event_viewer/pandorafms/API.java,
+ src/pandroid_event_viewer/pandorafms/Main.java: Added some SupressWarning annotations.
+ * res/layout/options.xml: Textview
+ * res/drawable-ldpi/incident.png,
+ res/drawable-ldpi/house.png,
+ res/drawable-ldpi/lightning_go.png: Removed, no longer needed.
+ * res/values/strings.xml,
+ res/values-es/strings.xml,
+ res/values-ja/strings.xml: Removed some entries.
+
2012-07-10 Santiago Munín <burning1@gmail.com>
* res/layout/item_list_incident_layout.xml: Deleted file, no longer needed.
* res/layout/main.xml: Little changes.
diff --git a/extras/pandroid_event_viewer/res/drawable-ldpi/house.png b/extras/pandroid_event_viewer/res/drawable-ldpi/house.png
deleted file mode 100644
index da024e5ad4..0000000000
Binary files a/extras/pandroid_event_viewer/res/drawable-ldpi/house.png and /dev/null differ
diff --git a/extras/pandroid_event_viewer/res/drawable-ldpi/incident.png b/extras/pandroid_event_viewer/res/drawable-ldpi/incident.png
deleted file mode 100644
index ccc98729cc..0000000000
Binary files a/extras/pandroid_event_viewer/res/drawable-ldpi/incident.png and /dev/null differ
diff --git a/extras/pandroid_event_viewer/res/drawable-ldpi/lightning_go.png b/extras/pandroid_event_viewer/res/drawable-ldpi/lightning_go.png
deleted file mode 100644
index ed62c56bca..0000000000
Binary files a/extras/pandroid_event_viewer/res/drawable-ldpi/lightning_go.png and /dev/null differ
diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml
index 0bcc41f419..d75194e97a 100644
--- a/extras/pandroid_event_viewer/res/layout/options.xml
+++ b/extras/pandroid_event_viewer/res/layout/options.xml
@@ -148,7 +148,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="60dp"
- android:text="@string/enable_background_service" />
+ android:text="@string/enable_background_service"
+ android:textColor="#ffffff" />
<CheckBox
android:id="@+id/background_service_on"
diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml
index 2c2358dac2..cf2b84e926 100644
--- a/extras/pandroid_event_viewer/res/values-es/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-es/strings.xml
@@ -15,25 +15,12 @@
// GNU General Public License for more details.
-->
<resources>
- <string name="item_tab_main_text">Filtro</string>
- <string name="item_tab_event_list_text">Lista de eventos</string>
-
- <string name="main_text">main text (value spanish)</string>
- <string name="list_text">list (value spanish)</string>
-
- <string name="system_str">Sistema</string>
-
- <string name="empty_str">- Vacio -</string>
+
<string name="all_str">Todo</string>
-
<string name="tags_label_str">Etiquetas</string>
<string name="comments_label_str">Comentarios</string>
<string name="group_label_str">Grupos</string>
<string name="agent_label_str">Nombre del agente</string>
- <string name="type_label_str">Tipo</string>
- <string name="severity_label_str">Severidad</string>
- <string name="date_label_str">Fecha</string>
- <string name="number_events_label_str">Número de eventos</string>
<string name="reset_button_str">Reseteo</string>
<string name="search_button_str">Buscar</string>
<string name="loading_label_str">Cargando</string>
@@ -50,36 +37,29 @@
<string name="refresh_time_label_str">Refresco scanner eventos</string>
<string name="set_as_filter_watcher_button_str">Filtro por defecto</string>
<string name="validate_event_button_str">Validar Evento</string>
-
<string name="config_update_succesful_str">Configuración guardada correctamente.</string>
<string name="config_update_fail_str">Configuración no ha podido guardarse..</string>
<string name="please_set_preferences_str">Por favor configure sus preferencias, como la API URL, usuario y contraseña de su Pandora FMS.</string>
<string name="preferences_set_demo_pandora_str">Pandroid Event Viewer esta conectando con la demo pública, por favor cambia en las preferencias para tu Pandora FMS.</string>
<string name="filter_update_succesful_str">Actualizado filtro correctamente.</string>
<string name="filter_update_fail_str">Actualización filtro no ha podido guardarse.</string>
-
<string name="notification_criticity_0_str">Hay %s eventos y todos son de Mantenimiento.</string>
<string name="notification_criticity_1_str">Hay %s eventos y algunos son Información.</string>
<string name="notification_criticity_2_str">Hay %s eventos y algunos son Normales.</string>
<string name="notification_criticity_3_str">Hay %s eventos y algunos son Aviso.</string>
<string name="notification_criticity_4_str">Hay %s eventos y algunos son Criticos.</string>
-
<string name="loading_events_criticity_0_str">Cargando eventos (todos son de Mantenimiento).</string>
<string name="loading_events_criticity_1_str">Cargando eventos (algunos son Información).</string>
<string name="loading_events_criticity_2_str">Cargando eventos (algunos son Normales).</string>
<string name="loading_events_criticity_3_str">Cargando eventos (algunos son Aviso).</string>
<string name="loading_events_criticity_4_str">Cargando eventos (algunos son Criticos).</string>
-
<string name="successful_validate_event_str">Validación del evento correcta.</string>
<string name="fail_validate_event_str">Validación del evento incorrecta.</string>
-
<string name="status_label_str">Estado</string>
<string name="event_search_label_str">Buscar evento</string>
<string name="max_time_old_event_str">Máx tiempo de antiguedad</string>
-
<string name="licensed_under_gpl_str">Licenciado bajo GPL v2</string>
<string name="develop_team_str">Desarrollado por: Miguel de Dios</string>
-
<string name="alert_recovered_str">Alerta recuperada</string>
<string name="alert_manual_validation_str">Alerta validada manualmente</string>
<string name="going_up_warning_str">Cayendo de crítico a advertencia</string>
@@ -87,14 +67,12 @@
<string name="going_up_normal_str">Subiendo a estado normal</string>
<string name="going_down_warning_str">Cayendo a advertencia</string>
<string name="alert_fired_str">Alerta lanzada</string>
- <string name="recon_host_detected_str">El servidor recon detectó un equipo nuevo</string>
<string name="new_agent_str">Agente nuevo creado</string>
<string name="unknown_str">Tipo desconocido:</string>
<string name="unknown_event_str">Evento desconocido</string>
-
<string name="validate_event_label_str">Evento validado</string>
<string name="pandroid_event_viewer_description_str">Visor de eventos para Pandora FMS.</string>
<string name="pandroid_info_txt"><b>Bienvenido al visor de eventos de Pandora FMS para Android</b></string>
- <string name="pandroid_info_long_txt"><p>Esta aplicación se usa para ver de forma autónoma y cómoda, el estado de los eventos resportados por un servidor de monitorización Pandora FMS. Desde esta aplicación podrá ver en tiempo real los eventos, e incluso validar o filtrarlos.</p>
- <p>La configuración por defecto apunta al servidor de demo de Pandora FMS en firefly.artica.es. Cambie la configuración para que apunte a su propio servidor de Pandora FMS.</p></string>
-</resources>
+ <string name="pandroid_info_long_txt"><p>Esta aplicación se usa para ver de forma autónoma y cómoda, el estado de los eventos resportados por un servidor de monitorización Pandora FMS. Desde esta aplicación podrá ver en tiempo real los eventos, e incluso validar o filtrarlos.</p><p>La configuración por defecto apunta al servidor de demo de Pandora FMS en firefly.artica.es. Cambie la configuración para que apunte a su propio servidor de Pandora FMS.</p></string>
+
+</resources>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/values-ja/strings.xml b/extras/pandroid_event_viewer/res/values-ja/strings.xml
index 0bfa8dace4..6bef7ad229 100644
--- a/extras/pandroid_event_viewer/res/values-ja/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-ja/strings.xml
@@ -15,26 +15,18 @@
// GNU General Public License for more details.
-->
<resources>
- <string name="item_tab_main_text">フィルター</string>
- <string name="item_tab_event_list_text">イベント一覧</string>
-
- <string name="main_text">メインテキスト (値)</string>
- <string name="list_text">一覧 (値)</string>
-
+
+ <string name="item_tab_main_text">フィルター</string>
+ <string name="item_tab_event_list_text">イベント一覧</string>
<string name="system_str">システム</string>
-
- <string name="empty_str">- 空 -</string>
<string name="all_str">全て</string>
-
<string name="tags_label_str">タグ</string>
<string name="comments_label_str">コメント</string>
<string name="group_label_str">グループ</string>
<string name="agent_label_str">エージェント名</string>
<string name="type_label_str">タイプ</string>
<string name="severity_label_str">重要度</string>
- <string name="date_label_str">日時</string>
- <string name="number_events_label_str">イベント数</string>
- <string name="reset_button_str">リセット</string>
+ <string name="reset_button_str">リセット</string>
<string name="search_button_str">検索</string>
<string name="loading_label_str">読み込み</string>
<string name="options_label_str">オプション</string>
@@ -49,36 +41,29 @@
<string name="empty_label_str">イベントがありません</string>
<string name="refresh_time_label_str">更新時間</string>
<string name="set_as_filter_watcher_button_str">デフォルトのフィルタ</string>
-
<string name="config_update_succesful_str">設定を更新しました。</string>
<string name="config_update_fail_str">設定の更新に失敗しました。</string>
<string name="please_set_preferences_str">Pandora FMS の API URL、ユーザ、パスワードを設定してください。</string>
<string name="filter_update_succesful_str">フィルタを更新しました。</string>
<string name="filter_update_fail_str">フィルタの更新に失敗しました。</string>
<string name="validate_event_button_str">イベントの承諾</string>
-
- <string name="notification_criticity_0_str">%s 個のイベントがあり、すべてがメンテナンス状態です。</string>
+ <string name="notification_criticity_0_str">%s 個のイベントがあり、すべてがメンテナンス状態です。</string>
<string name="notification_criticity_1_str">%s 個のイベントがあり、いくつかが情報の状態です。</string>
<string name="notification_criticity_2_str">%s 個のイベントがあり、いくつかが正常状態です。</string>
<string name="notification_criticity_3_str">%s 個のイベントがあり、いくつかが警告状態です。</string>
<string name="notification_criticity_4_str">%s 個のイベントがあり、いくつかが障害状態です。</string>
-
<string name="loading_events_criticity_0_str">%s 個のイベントを読み込み、全てがメンテナンス状態です。</string>
<string name="loading_events_criticity_1_str">%s 個のイベントを読み込み、いくつかが情報の状態です。</string>
<string name="loading_events_criticity_2_str">%s 個のイベントを読み込み、いくつかが正常状態です。</string>
<string name="loading_events_criticity_3_str">%s 個のイベントを読み込み、いくつかが警告状態です。</string>
<string name="loading_events_criticity_4_str">%s 個のイベントを読み込み、いくつかが障害状態です。</string>
-
<string name="successful_validate_event_str">イベントを承諾しました。</string>
<string name="fail_validate_event_str">イベントの承諾に失敗しました。</string>
-
<string name="status_label_str">状態</string>
<string name="event_search_label_str">イベント検索</string>
<string name="max_time_old_event_str">最も古いイベント</string>
-
<string name="licensed_under_gpl_str">GPLv2 ライセンス</string>
<string name="develop_team_str">開発者: Miguel de Dios</string>
-
<string name="alert_recovered_str">アラート復旧</string>
<string name="alert_manual_validation_str">アラートの手動承諾</string>
<string name="going_up_warning_str">障害状態から警告状態に変化</string>
@@ -86,11 +71,10 @@
<string name="going_up_normal_str">正常状態に変化</string>
<string name="going_down_warning_str">警告状態に変化</string>
<string name="alert_fired_str">アラート発生</string>
- <string name="recon_host_detected_str">自動検出サーバが新たなホストを検出</string>
<string name="new_agent_str">新たなエージェント作成</string>
<string name="unknown_str">不明なタイプ:</string>
<string name="unknown_event_str">不明なイベント</string>
-
<string name="validate_event_label_str">承諾済イベント</string>
<string name="pandroid_event_viewer_description_str">Pandora FMS リアルタイムイベントビューワ</string>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml
index afa4617910..ada5e420be 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -21,10 +21,7 @@
<string name="const_string_preferences">PANDROID_EVENT_VIEWER_PREFERENCES</string>
<string name="item_tab_main_text">Filter</string>
<string name="item_tab_event_list_text">Event list</string>
- <string name="main_text">main text (value)</string>
- <string name="list_text">list (value)</string>
<string name="system_str">System</string>
- <string name="empty_str">- Empty -</string>
<string name="all_str">All</string>
<string name="tags_label_str">Tags</string>
<string name="comments_label_str">Comments</string>
@@ -32,8 +29,6 @@
<string name="agent_label_str">Agent name</string>
<string name="type_label_str">Type</string>
<string name="severity_label_str">Severity</string>
- <string name="date_label_str">Date</string>
- <string name="number_events_label_str">Number of events</string>
<string name="reset_button_str">Reset</string>
<string name="search_button_str">Search</string>
<string name="loading_label_str">Loading</string>
@@ -81,7 +76,6 @@
<string name="going_up_normal_str">Going to normal status</string>
<string name="going_down_warning_str">Going down to warning</string>
<string name="alert_fired_str">Alert fired</string>
- <string name="recon_host_detected_str">Recon server detected a new host</string>
<string name="new_agent_str">New agent created</string>
<string name="unknown_str">Unknown type:</string>
<string name="unknown_event_str">Unknown event</string>
@@ -100,19 +94,12 @@
<string name="tag_label_str">Tag</string>
<string name="advanced_options">Show advanced search options</string>
<string name="empty">- Empty -</string>
- <string name="img_severity">Severity image</string>
- <string name="img_group">Group image</string>
- <string name="img_type">Type image</string>
<string name="artica_copyright">Copyright (©) 2011 Artica</string>
<string name="dont_show_again">Don\'t show again</string>
<string name="pandorafms_logo_description">PandoraFMS\'s logo</string>
<string name="description">Description</string>
- <string name="incident_close_button">Close incident</string>
- <string name="incidents_label_str">Incidents</string>
<string name="title">Title</string>
- <string name="priority">Priority</string>
<string name="create">Create</string>
- <string name="source">Source</string>
<string name="incident_created">Incident created</string>
<string name="title_empty">Sorry, you must provide a title</string>
<string name="creating_incident">Creating new incident…</string>
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/API.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/API.java
index d99e044114..7029892aab 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/API.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/API.java
@@ -9,9 +9,11 @@ import java.util.Map;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.util.Log;
+@SuppressLint("UseSparseArrays")
public class API {
private static String TAG = "API";
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
index 1853fd1ac4..28c324243b 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.TabActivity;
@@ -61,6 +62,7 @@ import android.widget.Toast;
* @author Miguel de Dios Matías
*
*/
+@SuppressLint("UseSparseArrays")
public class Main extends Activity {
private static String TAG = "MAIN";
private static String PROFILE_PREFIX = "profile:";