From 4ed60b307a888bdb1aae290c66ca22932ba43ebe Mon Sep 17 00:00:00 2001
From: santimunin <noreply@pandorafms.org>
Date: Mon, 21 May 2012 18:07:59 +0000
Subject: [PATCH] 2012-05-21 Santiago Munin <burning1@gmail.com>
* EventList.java, PopupValidationEvent.java: Removed references to Core as an object.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
extras/pandroid_event_viewer/ChangeLog | 12 ++++++++++++
.../pandroid_event_viewer/pandorafms/EventList.java | 10 ++++------
.../pandorafms/PopupValidationEvent.java | 1 -
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index d3ce2b115b..3810db9b96 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,15 @@
+2012-05-21 Santiago Munín <burning1@gmail.com>
+
+ * EventList.java, PopupValidationEvent.java: Removed references to Core as an object.
+
+2012-05-19 Santiago Munín <burning1@gmail.com>
+
+ * AlarmReceiver.java: Removed. Now it's the service which will retrieve data.
+ * Core.java: The method of setting periodically data retrieval was changed.
+ Now, the AlarmManager will launch the Service instead of BroadcastReceiver.
+ * PandroidEventviewerService.java: Every time it receives a call from the AlarmManager, will search for new events.
+ * Most of files have little changes to adapt the new data retrieval subsystem.
+
2012-05-17 Santiago Munín <burning1@gmail.com>
* Core.java: Changed methods to static.
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 a194a1fcda..e44b6aad3f 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
@@ -65,7 +65,6 @@ public class EventList extends ListActivity {
private MyAdapter la;
private PandroidEventviewerActivity object;
- private Core core;
// private HashMap<Integer, Boolean> openedItem;
private HashMap<String, Bitmap> imgGroups;
@@ -85,7 +84,6 @@ public class EventList extends ListActivity {
Intent i = getIntent();
this.object = (PandroidEventviewerActivity) i
.getSerializableExtra("object");
- this.core = (Core) i.getSerializableExtra("core");
setContentView(R.layout.list_view_layout);
@@ -93,7 +91,7 @@ public class EventList extends ListActivity {
lv = (ListView) findViewById(android.R.id.list);
- la = new MyAdapter(getBaseContext(), object, core);
+ la = new MyAdapter(getBaseContext(), object);
lv.setAdapter(la);
@@ -228,6 +226,7 @@ public class EventList extends ListActivity {
* @return A bitmap of that image
*/
private Bitmap downloadImage(String fileUrl) {
+ Log.i(TAG, "Downloading image");
URL myFileUrl = null;
try {
@@ -239,7 +238,7 @@ public class EventList extends ListActivity {
InputStream is = conn.getInputStream();
return BitmapFactory.decodeStream(is);
} catch (IOException e) {
- Log.e(TAG, "Downloading image");
+ Log.e(TAG, "Downloading image: error");
}
return null;
}
@@ -349,8 +348,7 @@ public class EventList extends ListActivity {
public boolean showLoadingEvents;
- public MyAdapter(Context c, PandroidEventviewerActivity object,
- Core core) {
+ public MyAdapter(Context c, PandroidEventviewerActivity object) {
mContext = c;
this.object = object;
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java
index 669a1e44b7..63a8ffe7f4 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java
@@ -58,7 +58,6 @@ public class PopupValidationEvent extends Activity {
Intent i = getIntent();
this.id_event = i.getIntExtra("id_event", -1);
- // this.core = (Core)i.getSerializableExtra("core");
setContentView(R.layout.popup_validation_event);
final Button button = (Button) findViewById(R.id.button_validate_event);