project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerlistFragment.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerlistFragment.java Thu Jul 19 18:31:58 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerlistFragment.java Thu Jul 19 18:58:18 2012 +0200
@@ -1,9 +1,5 @@
package org.hedgewars.hedgeroid.netplay;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
import org.hedgewars.hedgeroid.R;
import org.hedgewars.hedgeroid.netplay.NetplayService.NetplayBinder;
@@ -14,7 +10,6 @@
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.app.ListFragment;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -41,13 +36,13 @@
private ServiceConnection serviceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder binder) {
netconn = ((NetplayBinder) binder).getNetconn();
- playerListAdapter.setPlayerList(netconn.playerList.getList());
- netconn.playerList.observePlayerList(playerListAdapter);
+ playerListAdapter.setPlayerList(netconn.playerList.getValues());
+ netconn.playerList.observe(playerListAdapter);
}
public void onServiceDisconnected(ComponentName className) {
// TODO navigate away
- netconn.playerList.unobservePlayerList(playerListAdapter);
+ netconn.playerList.unobserve(playerListAdapter);
netconn = null;
}
};