From d989fd15232f111bedf79a36c9ec6870357fc26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 7 Feb 2012 15:04:02 +0100
Subject: Extend SameService.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Binding to SameService now possible.
– Broadcast created for available networks.
---
 .../java/com/orbekk/discovery/SameService.java     | 39 +++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'same-android/src/main/java/com/orbekk/discovery')

diff --git a/same-android/src/main/java/com/orbekk/discovery/SameService.java b/same-android/src/main/java/com/orbekk/discovery/SameService.java
index 44f0013..c43d4ff 100644
--- a/same-android/src/main/java/com/orbekk/discovery/SameService.java
+++ b/same-android/src/main/java/com/orbekk/discovery/SameService.java
@@ -1,8 +1,10 @@
 package com.orbekk.discovery;
 
+import java.util.List;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.Properties;
 
 import android.app.Service;
@@ -10,6 +12,7 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.os.Messenger;
 import android.widget.Toast;
 
 import org.slf4j.Logger;
@@ -21,13 +24,22 @@ import com.orbekk.same.SameController;
 import com.orbekk.same.config.Configuration;
 
 public class SameService extends Service {
+    public final static int DISPLAY_MESSAGE = 1;
+
+    public final static String AVAILABLE_NETWORKS_UPDATE =
+            "com.orbekk.same.SameService.action.AVAILABLE_NETWORKS_UPDATE";
+    public final static String AVAILABLE_NETWORKS =
+            "com.orbekk.same.SameService.action.AVAILABLE_NETWORKS";
+
     final static int PORT = 15066;
     final static int SERVICE_PORT = 15068;
+    
     private Logger logger = LoggerFactory.getLogger(getClass());
     private Thread discoveryThread = null;
     private SameController sameController = null;
     private Configuration configuration = null;
     
+    /** This class should go away >:-/ */
     public final class DiscoveryThread extends Thread {
         Broadcaster broadcast;
         DiscoveryListener listener;
@@ -74,6 +86,31 @@ public class SameService extends Service {
         }
     };
     
+    
+    class InterfaceHandler extends Handler {
+        @Override public void handleMessage(Message message) {
+            switch (message.what) {
+                case DISPLAY_MESSAGE:
+                    Toast.makeText(SameService.this,
+                        (String)message.obj, Toast.LENGTH_SHORT)
+                            .show();
+                            
+                    Intent intent = new Intent(AVAILABLE_NETWORKS_UPDATE);
+                    ArrayList<String> networkList = new ArrayList<String>();
+                    networkList.add("FirstNetwork");
+                    intent.putStringArrayListExtra(AVAILABLE_NETWORKS,
+                        networkList);
+                    sendBroadcast(intent);
+                        
+                    break;
+                default:
+                    super.handleMessage(message);
+            }
+        }
+    }
+    
+    private final Messenger messenger = new Messenger(new InterfaceHandler());
+    
     private void createNetwork() {
         if (discoveryThread == null) {
             synchronized (this) {
@@ -124,7 +161,7 @@ public class SameService extends Service {
     
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return messenger.getBinder();
     }
     
     @Override
-- 
cgit v1.2.3