From 6280f853c07f518e0eb231a3258dfc7ca1fbd751 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 29 Sep 2011 15:50:20 +0000
Subject: [PATCH] 2011-09-29  Miguel de Dios  <miguel.dedios@artica.es>

	* AndroidManifest.xml: level down the SDK version requirements, need test in
	Android 2.1.

	* src/pandroid_event_viewer/pandorafms/Options.java: added the clean url
	the last '/' char.

	* src/pandroid_event_viewer/pandorafms/EventList.java: change the url to
	show agent in browser.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5025 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 extras/pandroid_event_viewer/AndroidManifest.xml      |  2 +-
 extras/pandroid_event_viewer/ChangeLog                | 11 +++++++++++
 .../pandroid_event_viewer/pandorafms/EventList.java   |  5 ++++-
 .../src/pandroid_event_viewer/pandorafms/Options.java |  6 +++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/extras/pandroid_event_viewer/AndroidManifest.xml b/extras/pandroid_event_viewer/AndroidManifest.xml
index f2315e7285..3d8cc33b41 100644
--- a/extras/pandroid_event_viewer/AndroidManifest.xml
+++ b/extras/pandroid_event_viewer/AndroidManifest.xml
@@ -18,7 +18,7 @@
       package="pandroid_event_viewer.pandorafms"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="7" />
     <uses-permission android:name="android.permission.INTERNET" />
 
 	<!--
diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 7ffcce3575..db1981def3 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-29  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* AndroidManifest.xml: level down the SDK version requirements, need test in
+	Android 2.1.
+	
+	* src/pandroid_event_viewer/pandorafms/Options.java: added the clean url
+	the last '/' char.
+	
+	* src/pandroid_event_viewer/pandorafms/EventList.java: change the url to
+	show agent in browser.
+
 2011-09-29  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* AndroidManifest.xml: added activity about.
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 03539f85f8..01b1133100 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
@@ -441,7 +441,10 @@ public class EventList extends ListActivity {
 						//http://127.0.0.1/pandora_console/mobile/index.php?page=agent&id=1
 						//Log.e("url", this.object.url);
 						text.setText(Html.fromHtml(
-							"<a href='" + this.object.url + "/mobile/index.php?page=agent&id=" + item.id_agent
+							"<a href='" + this.object.url +
+							"/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente="
+							//"/mobile/index.php?page=agent&id="
+							+ item.id_agent
 							+ "'>" + item.agent_name + "</a>"));
 						text.setMovementMethod(LinkMovementMethod.getInstance());
 						//text.setText(item.agent_name);
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java
index d2e571a472..adc3ab1133 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java
@@ -69,8 +69,12 @@ public class Options extends Activity {
     	SharedPreferences.Editor editorPreferences = preferences.edit();
     	
     	EditText text = (EditText) findViewById(R.id.url);
+    	String url = text.getText().toString();
+    	if (url.charAt(url.length() - 1) == '/') {
+    		url = url.substring(0, url.length() - 1);
+    	}
     	
-    	editorPreferences.putString("url", text.getText().toString());
+    	editorPreferences.putString("url", url);
     	text = (EditText) findViewById(R.id.user);
     	editorPreferences.putString("user", text.getText().toString());
     	text = (EditText) findViewById(R.id.password);