summaryrefslogtreecommitdiff
path: root/src/se/leap/bitmaskclient/ProviderListFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/se/leap/bitmaskclient/ProviderListFragment.java')
-rw-r--r--src/se/leap/bitmaskclient/ProviderListFragment.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java
index 862177a2..f074e665 100644
--- a/src/se/leap/bitmaskclient/ProviderListFragment.java
+++ b/src/se/leap/bitmaskclient/ProviderListFragment.java
@@ -156,11 +156,14 @@ public class ProviderListFragment extends ListFragment {
// Notify the active callbacks interface (the activity, if the
// fragment is attached to one) that an item has been selected.
mCallbacks.onItemSelected(ProviderListContent.ITEMS.get(position).name());
+//<<<<<<< HEAD
+//=======
for(int item_position = 0; item_position < listView.getCount(); item_position++) {
if(item_position != position)
content_adapter.hide(item_position);
}
+//>>>>>>> feature/token-based-auth
}
@Override
@@ -203,11 +206,23 @@ public class ProviderListFragment extends ListFragment {
}
public void hideAllBut(int position) {
- for(int i = 0; i < content_adapter.getCount(); i++)
+//<<<<<<< HEAD
+ int real_count = content_adapter.getCount();
+ for(int i = 0; i < real_count;)
+ if(i != position) {
+ content_adapter.hide(i);
+ position--;
+ real_count--;
+ } else {
+ i++;
+ }
+//=======
+/* for(int i = 0; i < content_adapter.getCount(); i++)
if(i != position)
content_adapter.hide(i);
else
content_adapter.unHide(i);
+*///>>>>>>> feature/token-based-auth
}
public void unhideAll() {