From 4011fb0eeb520f98c377ae914e28b6dd345f6920 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 7 Oct 2011 11:20:20 -0700 Subject: [PATCH] Fix Locale plugin to read extras from forwarded bundle instead of straight from the intent --- .../com/todoroo/astrid/locale/LocaleEditAlerts.java | 4 ++-- .../com/todoroo/astrid/locale/LocaleReceiver.java | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java index dccfb71a4..c3d76da81 100644 --- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java +++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java @@ -139,14 +139,14 @@ public final class LocaleEditAlerts extends ExpandableListActivity { */ if (forwardedBundle != null) { - final int intervalValue = getIntent().getIntExtra(KEY_INTERVAL, INTERVALS[interval.getSelectedItemPosition()]); + final int intervalValue = forwardedBundle.getInt(KEY_INTERVAL, INTERVALS[interval.getSelectedItemPosition()]); for(int i = 0; i < INTERVALS.length; i++) { if(intervalValue == INTERVALS[i]) { interval.setSelection(i); break; } } - selectionToMatch = getIntent().getStringExtra(KEY_SQL); + selectionToMatch = forwardedBundle.getString(KEY_SQL); } } } catch (Exception e) { diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java index cd9d13e5d..c97474ba4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java @@ -4,6 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.res.Resources; +import android.os.Bundle; import android.text.TextUtils; import android.util.Log; @@ -50,10 +51,12 @@ public class LocaleReceiver extends BroadcastReceiver { if(!PluginServices.getAddOnService().hasLocalePlugin()) return; - final String title = intent.getStringExtra(LocaleEditAlerts.KEY_FILTER_TITLE); - final String sql = intent.getStringExtra(LocaleEditAlerts.KEY_SQL); - final String values = intent.getStringExtra(LocaleEditAlerts.KEY_VALUES); - final int interval = intent.getIntExtra(LocaleEditAlerts.KEY_INTERVAL, 24*3600); + final Bundle forwardedBundle = intent.getBundleExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE); + + final String title = forwardedBundle.getString(LocaleEditAlerts.KEY_FILTER_TITLE); + final String sql = forwardedBundle.getString(LocaleEditAlerts.KEY_SQL); + final String values = forwardedBundle.getString(LocaleEditAlerts.KEY_VALUES); + final int interval = forwardedBundle.getInt(LocaleEditAlerts.KEY_INTERVAL, 24*3600); if(TextUtils.isEmpty(title) || TextUtils.isEmpty(sql) || sql.contains("--") || sql.contains(";") || interval == 0)