diff --git a/extras/pandroid_event_viewer/AndroidManifest.xml b/extras/pandroid_event_viewer/AndroidManifest.xml
index fa6b59b733..5484c4c7c4 100644
--- a/extras/pandroid_event_viewer/AndroidManifest.xml
+++ b/extras/pandroid_event_viewer/AndroidManifest.xml
@@ -79,7 +79,9 @@
android:label="@string/pandroid_event_viewer_str"
android:theme="@android:style/Theme.Dialog" >
-
+
+
diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 7c15f34868..0e5cf1c86c 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-06 Santiago Munín
+ * AndroidManifest.xml: Added CreateIncidentActivity (new activity).
+ * src/pandroid_event_viewer/pandorafms/Core.java: Added some getAgents and getGroups
+ * res/values/strings.xml: Added new entries
+ * res/values/arrays.xml: Added new entries
+ * res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: Added "Incidents" entry
+ * res/layout/create_incident.xml: CreateIncidentActivity's layout.
+
2012-06-01 Santiago Munín
* AndroidManifest.xml: Added IncidenList (new activity)
* src/pandroid_event_viewer/pandorafms/IncidentListItem.java: Added, value object of incidents.
@@ -7,7 +15,6 @@
* res/layout/item_list_incident_layout.xml: Layout of IncidentList items.
* res/values/strings.xml: Added new entries.
-
2012-06-01 Santiago Munín
* Little changes on the whole app: Fixed some Lint errors.
diff --git a/extras/pandroid_event_viewer/bin/classes.dex b/extras/pandroid_event_viewer/bin/classes.dex
new file mode 100644
index 0000000000..8df1d4ab25
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/classes.dex differ
diff --git a/extras/pandroid_event_viewer/bin/jarlist.cache b/extras/pandroid_event_viewer/bin/jarlist.cache
new file mode 100644
index 0000000000..1b5ec3f9c5
--- /dev/null
+++ b/extras/pandroid_event_viewer/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependecy. DO NOT EDIT.
+# format is
+# Encoding is UTF-8
diff --git a/extras/pandroid_event_viewer/bin/pandroid_event_viewer.apk b/extras/pandroid_event_viewer/bin/pandroid_event_viewer.apk
new file mode 100644
index 0000000000..4003afb972
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/pandroid_event_viewer.apk differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/about.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/about.png
new file mode 100644
index 0000000000..ddaad9b4ec
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/about.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/config.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/config.png
new file mode 100644
index 0000000000..90bc4b9ce1
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/config.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_0.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_0.png
new file mode 100644
index 0000000000..5333fb1ee3
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_0.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_1.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_1.png
new file mode 100644
index 0000000000..35b916a89c
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_1.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_2.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_2.png
new file mode 100644
index 0000000000..65779a2d6f
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_2.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_3.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_3.png
new file mode 100644
index 0000000000..aa13be2ea4
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_3.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_4.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_4.png
new file mode 100644
index 0000000000..e869b27937
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_4.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_default.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_default.png
new file mode 100644
index 0000000000..35b916a89c
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/criticity_default.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/cross.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/cross.png
new file mode 100644
index 0000000000..4c0bdf4cc1
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/cross.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/help.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/help.png
new file mode 100644
index 0000000000..83e2bed562
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/help.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/house.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/house.png
new file mode 100644
index 0000000000..694b17823c
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/house.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/lightning_go.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/lightning_go.png
new file mode 100644
index 0000000000..fae2b6b6f3
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/lightning_go.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/ok.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/ok.png
new file mode 100644
index 0000000000..199356ed75
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/ok.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/pandorafms_logo.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/pandorafms_logo.png
new file mode 100644
index 0000000000..a131b45231
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/pandorafms_logo.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/refresh.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/refresh.png
new file mode 100644
index 0000000000..8e6e721806
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/refresh.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick.png
new file mode 100644
index 0000000000..9f50d6238f
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick.png differ
diff --git a/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick_off.png b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick_off.png
new file mode 100644
index 0000000000..65b7135caf
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/res/drawable-ldpi/tick_off.png differ
diff --git a/extras/pandroid_event_viewer/bin/resources.ap_ b/extras/pandroid_event_viewer/bin/resources.ap_
new file mode 100644
index 0000000000..fcb1356429
Binary files /dev/null and b/extras/pandroid_event_viewer/bin/resources.ap_ differ
diff --git a/extras/pandroid_event_viewer/project.properties b/extras/pandroid_event_viewer/project.properties
new file mode 100644
index 0000000000..85aac54016
--- /dev/null
+++ b/extras/pandroid_event_viewer/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-8
diff --git a/extras/pandroid_event_viewer/res/layout/create_incident.xml b/extras/pandroid_event_viewer/res/layout/create_incident.xml
new file mode 100644
index 0000000000..70407ef3aa
--- /dev/null
+++ b/extras/pandroid_event_viewer/res/layout/create_incident.xml
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/menu/options_menu.xml b/extras/pandroid_event_viewer/res/menu/options_menu.xml
index f01c63c371..4ef0444d5c 100644
--- a/extras/pandroid_event_viewer/res/menu/options_menu.xml
+++ b/extras/pandroid_event_viewer/res/menu/options_menu.xml
@@ -25,4 +25,8 @@
android:title="@string/about_label_str"
android:icon="@drawable/about"
/>
+ - All
- Maintenance
- Informational
- Normal
- Warning
- Critical
-
-
-
-
+
+
+
+
- 30 seconds
- 1 minute
- 5 minutes
@@ -46,37 +48,65 @@
- 24 hours
- 36 hours
- 48 hours
-
-
-
-
-
-
-
- - Only new
- - Only validated
- - Only in process
- - Only not validated
-
-
-
-
- - 30 minutes
- - 1 hour
- - 2 hours
- - 3 hours
- - 4 hours
- - 5 hours
- - 8 hours
- - 10 hours
- - 12 hours
- - 1 day
- - 2 days
- - 3 days
- - 4 days
- - 5 days
- - 1 week
- - 2 weeks
- - 1 month
-
+
+
+
+
+
+
+
+
+ - Only new
+ - Only validated
+ - Only in process
+ - Only not validated
+
+
+
+
+ - 30 minutes
+ - 1 hour
+ - 2 hours
+ - 3 hours
+ - 4 hours
+ - 5 hours
+ - 8 hours
+ - 10 hours
+ - 12 hours
+ - 1 day
+ - 2 days
+ - 3 days
+ - 4 days
+ - 5 days
+ - 1 week
+ - 2 weeks
+ - 1 month
+
+
+ - Informative
+ - Low
+ - Medium
+ - Serious
+ - Very serious
+ - Maintenance
+
+
+ - Application data
+ - Database event
+ - Firewall records
+ - Logfiles
+ - Operating System event
+ - Other data source
+ - Pandora FMS event
+ - Unknown resource
+ - User report
+
+
+ - Active incidents
+ - Active incidents, with comments
+ - Rejected incidents
+ - Expired incidents
+ - Closed incidents
+
+
\ 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 4bab07375f..3c94f0a7a6 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -107,4 +107,9 @@
PandoraFMS\'s logo
Description
Close incident
+ Incidents
+ Title
+ Priority
+ Create
+ Source
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Core.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Core.java
index 57e87c4d8e..886d3b92dc 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Core.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Core.java
@@ -266,9 +266,9 @@ public class Core {
}
/**
- *
+ * Converts params to string.
* @param params
- * @return
+ * @return All params in a single string.
*/
public static String serializeParams2Api(String[] params) {
String return_var = params[0];
@@ -276,7 +276,6 @@ public class Core {
for (int i = 1; i < params.length; i++) {
return_var += "|" + params[i];
}
-
Log.i(TAG + " serializeParams2Api", return_var);
return return_var;
}
@@ -391,11 +390,72 @@ public class Core {
* TextView.
* @param image
* Image.
- * @param size Image size
+ * @param size
+ * Image size
*/
public static void setTextViewLeftImage(TextView view, Drawable image,
int size) {
image.setBounds(0, 0, size, size);
view.setCompoundDrawables(image, null, null, null);
}
+
+ /**
+ * Get groups through an api call.
+ *
+ * @param context
+ * Application context.
+ * @return Map containing id -> group.
+ */
+ public static Map getGroups(Context context) {
+ Map result = new HashMap();
+ try {
+ List parameters = new ArrayList();
+ parameters.add(new BasicNameValuePair("op", "get"));
+ parameters.add(new BasicNameValuePair("op2", "groups"));
+ parameters.add(new BasicNameValuePair("other_mode",
+ "url_encode_separator_|"));
+ parameters.add(new BasicNameValuePair("return_type", "csv"));
+ parameters.add(new BasicNameValuePair("other", ";"));
+
+ String return_api = Core.httpGet(context, parameters);
+ String[] lines = return_api.split("\n");
+
+ for (int i = 0; i < lines.length; i++) {
+ String[] groups = lines[i].split(";", 21);
+
+ result.put(Integer.valueOf(groups[0]), groups[1]);
+ }
+ } catch (Exception e) {
+ Log.e(TAG + ": getting groups", e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * Get agents through an api call.
+ *
+ * @param context
+ * @return Map containing id -> agent.
+ */
+ public static Map getAgents(Context context) {
+ Map result = new HashMap();
+ try {
+ List parameters = new ArrayList();
+ parameters.add(new BasicNameValuePair("op", "get"));
+ parameters.add(new BasicNameValuePair("op2", "all_agents"));
+ parameters.add(new BasicNameValuePair("return_type", "csv"));
+
+ String return_api = Core.httpGet(context, parameters);
+ String[] lines = return_api.split("\n");
+
+ for (int i = 0; i < lines.length; i++) {
+ String[] agents = lines[i].split(";");
+
+ result.put(Integer.valueOf(agents[0]), agents[1]);
+ }
+ } catch (Exception e) {
+ Log.e(TAG + ": getting groups", e.getMessage());
+ }
+ return result;
+ }
}
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java
new file mode 100644
index 0000000000..52cd757f15
--- /dev/null
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java
@@ -0,0 +1,183 @@
+package pandroid_event_viewer.pandorafms;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
+
+import android.app.Activity;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+/**
+ * Allows user to create an incident.
+ *
+ * @author Santiago Munín González
+ *
+ */
+public class CreateIncidentActivity extends Activity {
+ private static String TAG = "CreateIncidentActivity";
+ EditText title, description;
+ Spinner source, priority, group, status;
+ int priority_code, status_code;
+ Map groups;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.create_incident);
+ setViews();
+ }
+
+ private void setViews() {
+ title = (EditText) findViewById(R.id.incident_title);
+ title.setText("");
+ description = (EditText) findViewById(R.id.incident_description);
+ description.setText("");
+ priority = (Spinner) findViewById(R.id.incident_priority);
+ priority.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+ @Override
+ public void onItemSelected(AdapterView arg0, View arg1,
+ int arg2, long arg3) {
+ priority_code = arg0.getSelectedItemPosition();
+ if (priority_code == 5) {
+ priority_code = 10;
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView arg0) {
+ }
+ });
+ group = (Spinner) findViewById(R.id.incident_group);
+ source = (Spinner) findViewById(R.id.incident_source);
+ status = (Spinner) findViewById(R.id.incident_status);
+ status.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+ @Override
+ public void onItemSelected(AdapterView arg0, View arg1,
+ int arg2, long arg3) {
+ status_code = arg0.getSelectedItemPosition();
+ if (status_code == 4) {
+ status_code = 13;
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView arg0) {
+ }
+ });
+ new GetGroupsAsyncTask().execute((Void) null);
+
+ ((Button) findViewById(R.id.incident_create_button))
+ .setOnClickListener(new OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ sendNewIncident();
+ }
+ });
+ }
+
+ /**
+ * Performs the create incident petition.
+ */
+ private void sendNewIncident() {
+ Log.i(TAG, "Sending new incident");
+ List parameters = new ArrayList();
+ parameters.add(new BasicNameValuePair("op", "set"));
+ parameters.add(new BasicNameValuePair("op2", "new_incident"));
+ /*
+ *
+ * op=set&op2=new_incident&other=titulo|descripcion%20texto|Logfiles|2|10
+ * |12&other_mode=url_encode_separator_|
+ */
+ parameters.add(new BasicNameValuePair("other_mode",
+ "url_encode_separator_|"));
+ String incidentParams[] = new String[6];
+ incidentParams[0] = title.getText().toString();
+ incidentParams[1] = description.getText().toString();
+ incidentParams[2] = String.valueOf(source.getSelectedItem().toString());
+ incidentParams[3] = String.valueOf(priority_code);
+ incidentParams[4] = String.valueOf(status_code);
+ incidentParams[5] = String.valueOf(groups.get(group
+ .getSelectedItemPosition()));
+ parameters.add(new BasicNameValuePair("other", Core
+ .serializeParams2Api(incidentParams)));
+ Core.httpGet(getApplicationContext(), parameters);
+
+ }
+
+ /**
+ * Async task which get groups.
+ *
+ * @author Santiago Munín González
+ *
+ */
+ private class GetGroupsAsyncTask extends
+ AsyncTask> {
+
+ @Override
+ protected Map doInBackground(Void... params) {
+ return Core.getGroups(getApplicationContext());
+ }
+
+ @Override
+ protected void onPostExecute(Map result) {
+ groups = result;
+ List list = new LinkedList();
+ for (Entry entry : result.entrySet()) {
+ list.add(entry.getValue());
+ }
+ ArrayAdapter spinnerArrayAdapter = new ArrayAdapter(
+ getApplicationContext(),
+ android.R.layout.simple_spinner_item, list);
+ group.setAdapter(spinnerArrayAdapter);
+ group.setSelection(0);
+ /*
+ * ProgressBar loadingGroup = (ProgressBar)
+ * findViewById(R.id.loading_group);
+ *
+ * loadingGroup.setVisibility(ProgressBar.GONE);
+ * combo.setVisibility(Spinner.VISIBLE);
+ */
+ }
+ }
+
+ /*
+ * private class GetAgentsAsyncTask extends AsyncTask> {
+ *
+ * @Override protected Map doInBackground(Void... params) {
+ * return Core.getAgents(getApplicationContext()); }
+ *
+ * @Override protected void onPostExecute(Map result) {
+ * agents = result; List list = new LinkedList(); for
+ * (Entry entry : result.entrySet()) {
+ * list.add(entry.getValue()); } ArrayAdapter spinnerArrayAdapter =
+ * new ArrayAdapter( getApplicationContext(),
+ * android.R.layout.simple_spinner_item, list);
+ * agent.setAdapter(spinnerArrayAdapter); agent.setSelection(0); /*
+ * ProgressBar loadingGroup = (ProgressBar)
+ * findViewById(R.id.loading_group);
+ *
+ * loadingGroup.setVisibility(ProgressBar.GONE);
+ * combo.setVisibility(Spinner.VISIBLE);
+ */
+ // }
+ // }
+}
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
index b8513a2d54..f0d419b69f 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
@@ -177,6 +177,9 @@ public class EventList extends ListActivity {
i = new Intent(this, About.class);
startActivity(i);
break;
+ case R.id.incidents_button_menu_options:
+ startActivity(new Intent(this, CreateIncidentActivity.class));
+ break;
}
return true;
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/IncidentList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/IncidentList.java
index 41d2b8a80d..7536b81346 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/IncidentList.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/IncidentList.java
@@ -18,17 +18,15 @@ package pandroid_event_viewer.pandorafms;
import java.util.ArrayList;
import java.util.List;
+
import android.app.ListActivity;
import android.content.Context;
-import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.LinearLayout;
@@ -139,7 +137,7 @@ public class IncidentList extends ListActivity {
@Override
public int getCount() {
// TODO +1?
- return incidents.size()+1;
+ return incidents.size();
}
@Override
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 ac1f7184d0..bdf76e54eb 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
@@ -210,7 +210,8 @@ public class Main extends Activity {
parameters.add(new BasicNameValuePair("return_type", "csv"));
parameters.add(new BasicNameValuePair("other", ";"));
- String return_api = Core.httpGet(getApplicationContext(), parameters);
+ String return_api = Core.httpGet(getApplicationContext(),
+ parameters);
String[] lines = return_api.split("\n");
for (int i = 0; i < lines.length; i++) {
@@ -369,8 +370,11 @@ public class Main extends Activity {
i = new Intent(this, About.class);
startActivity(i);
break;
- }
+ case R.id.incidents_button_menu_options:
+ startActivity(new Intent(this, CreateIncidentActivity.class));
+ break;
+ }
return true;
}