From e75053195b00ca67acba42afe7dc49cadad922eb Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 26 Nov 2013 13:10:44 +0000 Subject: [PATCH] 2013-11-26 Sergio Martin * pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java: Clean old debug messages and fix version detection for use new API functions on SP1 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 6 ++++++ .../src/pandroid_event_viewer/pandorafms/Main.java | 4 +--- .../pandorafms/PandroidEventviewerActivity.java | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index 741306d0c7..663efe3125 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,9 @@ +2013-11-26 Sergio Martin + + * pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java + pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java: Clean old debug messages + and fix version detection for use new API functions on SP1 + 2013-11-06 Ramon Novoa * build_vars.sh: Added console dirs to auto-create OUM packages. 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 ccd5656c57..8ac3aff2f3 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 @@ -337,9 +337,7 @@ public class Main extends Activity { buttonSaveAsFilterWatcher.setEnabled(true); buttonSearch.setEnabled(true); - - Log.e("CACA", "CACA " + buttonSearch.isEnabled()); - + buttonDeleteProfile.setEnabled(true); buttonSaveProfile.setEnabled(true); } diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java index ba07aca0ab..a6ef4fc567 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java @@ -565,7 +565,10 @@ public class PandroidEventviewerActivity extends TabActivity implements Activity.MODE_PRIVATE); String api_version = preferences.getString("api_version", ""); - if (api_version.equals("v5.0")) { + // Get the short form of the version. I.E. "v5" for "v5.0SP1" + String[] api_version_short = api_version.split("\\."); + + if (api_version_short[0].equals("v5")) { this.getEvents_v50(lines); } else {