diff options
author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
---|---|---|
committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
commit | 31e0ee7819ff6e852bc40f66858f0ac02659bf04 (patch) | |
tree | 85969d750a2473a95603e07f256681ca46c746cd /src/se/leap/bitmaskclient/ProviderListFragment.java | |
parent | 8bc035e5785b8a14c26cdb6ab409242b66554992 (diff) | |
parent | c500f60c9188c938b550b8741ca9a4f4939429e4 (diff) |
Merge branch 'feature/token-based-auth' into develop
Conflicts:
src/se/leap/bitmaskclient/ConfigurationWizard.java
src/se/leap/bitmaskclient/Dashboard.java
src/se/leap/bitmaskclient/ProviderAPI.java
src/se/leap/bitmaskclient/ProviderListFragment.java
Diffstat (limited to 'src/se/leap/bitmaskclient/ProviderListFragment.java')
-rw-r--r-- | src/se/leap/bitmaskclient/ProviderListFragment.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index 501da609..f074e665 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -156,6 +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
@@ -198,6 +206,7 @@ public class ProviderListFragment extends ListFragment { }
public void hideAllBut(int position) {
+//<<<<<<< HEAD int real_count = content_adapter.getCount();
for(int i = 0; i < real_count;)
if(i != position) {
@@ -207,6 +216,13 @@ public class ProviderListFragment extends ListFragment { } 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() {
|