Fix Locale plugin to read extras from forwarded bundle instead of straight from the intent

pull/14/head
Tim Su 14 years ago
parent 065e3ec6a9
commit 4011fb0eeb

@ -139,14 +139,14 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
*/ */
if (forwardedBundle != null) 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++) { for(int i = 0; i < INTERVALS.length; i++) {
if(intervalValue == INTERVALS[i]) { if(intervalValue == INTERVALS[i]) {
interval.setSelection(i); interval.setSelection(i);
break; break;
} }
} }
selectionToMatch = getIntent().getStringExtra(KEY_SQL); selectionToMatch = forwardedBundle.getString(KEY_SQL);
} }
} }
} catch (Exception e) { } catch (Exception e) {

@ -4,6 +4,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -50,10 +51,12 @@ public class LocaleReceiver extends BroadcastReceiver {
if(!PluginServices.getAddOnService().hasLocalePlugin()) if(!PluginServices.getAddOnService().hasLocalePlugin())
return; return;
final String title = intent.getStringExtra(LocaleEditAlerts.KEY_FILTER_TITLE); final Bundle forwardedBundle = intent.getBundleExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE);
final String sql = intent.getStringExtra(LocaleEditAlerts.KEY_SQL);
final String values = intent.getStringExtra(LocaleEditAlerts.KEY_VALUES); final String title = forwardedBundle.getString(LocaleEditAlerts.KEY_FILTER_TITLE);
final int interval = intent.getIntExtra(LocaleEditAlerts.KEY_INTERVAL, 24*3600); 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) || if(TextUtils.isEmpty(title) || TextUtils.isEmpty(sql) ||
sql.contains("--") || sql.contains(";") || interval == 0) sql.contains("--") || sql.contains(";") || interval == 0)

Loading…
Cancel
Save