Fixed a bug with everything appearing twice in the filter list

pull/14/head
Sam Bosley 14 years ago
parent a7fabed823
commit 58e3c9f9b5

@ -80,8 +80,9 @@ public class FilterAdapter extends BaseExpandableListAdapter {
private final DisplayMetrics metrics = new DisplayMetrics(); private final DisplayMetrics metrics = new DisplayMetrics();
/** receiver for new filters */ /** receiver for new filters */
//private final FilterReceiver filterReceiver = new FilterReceiver(); private final FilterReceiver filterReceiver = new FilterReceiver();
private final BladeFilterReceiver bladeFilterReceiver = new BladeFilterReceiver(); private final BladeFilterReceiver bladeFilterReceiver = new BladeFilterReceiver();
private boolean shouldUseBladeFilter = true;
/** row layout to inflate */ /** row layout to inflate */
private final int layout; private final int layout;
@ -319,6 +320,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
extras.setClassLoader(FilterListHeader.class.getClassLoader()); extras.setClassLoader(FilterListHeader.class.getClassLoader());
final Parcelable[] filters = extras.getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE); final Parcelable[] filters = extras.getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE);
shouldUseBladeFilter = false;
populateFiltersToAdapter(filters); populateFiltersToAdapter(filters);
} catch (Exception e) { } catch (Exception e) {
Log.e("receive-filter-" + //$NON-NLS-1$ Log.e("receive-filter-" + //$NON-NLS-1$
@ -374,7 +376,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (getGroupCount() == 0 && filterExposerList != null && filterExposerList.size()>0) { if (shouldUseBladeFilter && getGroupCount() == 0 && filterExposerList != null && filterExposerList.size()>0) {
try { try {
for (ResolveInfo filterExposerInfo : filterExposerList) { for (ResolveInfo filterExposerInfo : filterExposerList) {
Log.d("BladeFilterReceiver", filterExposerInfo.toString()); Log.d("BladeFilterReceiver", filterExposerInfo.toString());
@ -448,10 +450,12 @@ public class FilterAdapter extends BaseExpandableListAdapter {
* Call this method from your activity's onResume() method * Call this method from your activity's onResume() method
*/ */
public void registerRecevier() { public void registerRecevier() {
/*activity.registerReceiver(filterReceiver, IntentFilter regularFilter = new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS);
new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS));//*/ regularFilter.setPriority(2);
activity.registerReceiver(bladeFilterReceiver, activity.registerReceiver(filterReceiver, regularFilter);
new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS)); IntentFilter bladeFilter = new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS);
bladeFilter.setPriority(1);
activity.registerReceiver(bladeFilterReceiver, bladeFilter);
if(getGroupCount() == 0) if(getGroupCount() == 0)
getLists(); getLists();
} }
@ -460,7 +464,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
* Call this method from your activity's onResume() method * Call this method from your activity's onResume() method
*/ */
public void unregisterRecevier() { public void unregisterRecevier() {
//activity.unregisterReceiver(filterReceiver); activity.unregisterReceiver(filterReceiver);
activity.unregisterReceiver(bladeFilterReceiver); activity.unregisterReceiver(bladeFilterReceiver);
} }

Loading…
Cancel
Save