diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-10 14:11:33 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-10 14:11:33 +0200 |
commit | 7680d58d2ab0d5edc4fcc5214001b3880eb78e8a (patch) | |
tree | 16fa7054582daff5ea3014c1e14c11670074f917 /same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java | |
parent | 248378a24ced97cd70409dc4bbf8dab46d2a8bfc (diff) |
Change network discovery in Android app.
– Activity discovers networks instead of getting SameService to do it.
Diffstat (limited to 'same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java')
-rw-r--r-- | same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java b/same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java index 88073f4..446c550 100644 --- a/same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java +++ b/same-android/src/main/java/com/orbekk/same/android/widget/NetworkListAdapter.java @@ -23,6 +23,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; + +import com.orbekk.same.Services; +import com.orbekk.same.Services.NetworkDirectory; import com.orbekk.same.android.R; /** @@ -32,15 +35,13 @@ import com.orbekk.same.android.R; * * list.setAdapter(new NetworkListAdapter(...)); */ -public class NetworkListAdapter extends ArrayAdapter<String> { - private List<String> networkNames; - private List<String> masterUrls; +public class NetworkListAdapter extends ArrayAdapter<Services.MasterState> { + private NetworkDirectory networks; public NetworkListAdapter(Context context, int resource_id, - List<String> networkNames, List<String> masterUrls) { - super(context, resource_id, networkNames); - this.networkNames = networkNames; - this.masterUrls = masterUrls; + Services.NetworkDirectory networks) { + super(context, resource_id, networks.getNetworkList()); + this.networks = networks; } public View getView(int position, View convertView, ViewGroup parent) { @@ -48,13 +49,14 @@ public class NetworkListAdapter extends ArrayAdapter<String> { LayoutInflater inflater = getLayoutInflater(); convertView = inflater.inflate(R.layout.network_list_item, null); } - if (networkNames.get(position) != null) { + Services.MasterState network = networks.getNetwork(position); + if (network != null) { TextView nameText = (TextView)convertView.findViewById( R.id.network_name_text); TextView urlText = (TextView)convertView.findViewById( R.id.master_url_text); - nameText.setText(networkNames.get(position)); - urlText.setText(masterUrls.get(position)); + nameText.setText(network.getNetworkName()); + urlText.setText(network.getMasterLocation()); } return convertView; } |