1 files changed, 46 insertions, 6 deletions
diff --git a/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java b/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
index 0dd93d55933..e7001f6f156 100644
--- a/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
+++ b/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
@@ -15,13 +15,16 @@ import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.widget.*;
+import android.view.View;
 
 public class ControllerActivity extends ListActivity
 {
     private WifiManager _wifiManager;
     private WifiManager.MulticastLock _lock;
-    private LinkedList<String> _strings = new LinkedList<String>();
-    private ArrayAdapter<String> _adapter;
+    private LinkedList<String> _output = new LinkedList<String>();
+    private ArrayAdapter<String> _outputAdapter;
+    private ArrayAdapter<String> _ipv4Adapter;
+    private ArrayAdapter<String> _ipv6Adapter;
 
     @Override
     public void onCreate(Bundle savedInstanceState)
@@ -33,15 +36,52 @@ public class ControllerActivity extends ListActivity
         _lock = _wifiManager.createMulticastLock("com.zeroc.testcontroller");
         _lock.acquire();
 
-        _adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _strings);
-        setListAdapter(_adapter);
+        _outputAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _output);
+        setListAdapter(_outputAdapter);
         final ControllerApp app = (ControllerApp)getApplication();
+        final java.util.List<String> ipv4Addresses = app.getAddresses(false);
+        _ipv4Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv4Addresses);
+        Spinner s = (Spinner)findViewById(R.id.ipv4);
+        s.setAdapter(_ipv4Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv4Address(ipv4Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
+
+        final java.util.List<String> ipv6Addresses = app.getAddresses(true);
+        _ipv6Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv6Addresses);
+        s = (Spinner)findViewById(R.id.ipv6);
+        s.setAdapter(_ipv6Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv6Address(ipv6Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
         app.startController(this);
     }
 
     public synchronized void println(String data)
     {
-        _strings.add(data);
-        _adapter.notifyDataSetChanged();
+        _output.add(data);
+        _outputAdapter.notifyDataSetChanged();
     }
 }