1 files changed, 0 insertions, 203 deletions
diff --git a/same-android/src/main/java/com/orbekk/discovery/SameService.java b/same-android/src/main/java/com/orbekk/discovery/SameService.java
deleted file mode 100644
index c43d4ff..0000000
--- a/same-android/src/main/java/com/orbekk/discovery/SameService.java
+++ /dev/null
@@ -1,203 +0,0 @@
-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;
-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;
-import org.slf4j.LoggerFactory;
-
-import com.orbekk.same.DiscoveryListener;
-import com.orbekk.same.NetworkNotificationListener;
-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;
-        
-        public DiscoveryThread(DiscoveryListener listener) {
-            broadcast = new Broadcaster(SameService.this);
-            this.listener = listener;
-        }
-        
-        @Override public void run() {
-            while (!Thread.interrupted()) {
-                DatagramPacket packet = broadcast.receiveBroadcast(PORT);
-                String content = new String(packet.getData(), 0, packet.getLength());
-                String[] words = content.split(" ");
-                
-                if (!content.startsWith("Discover") || content.length() < 2) {
-                    logger.warn("Invalid discovery message: {}", content);
-                    continue;
-                }
-                
-                String port = words[1];
-                String url = "http://" + packet.getAddress().getHostAddress() +
-                        ":" + port + "/ClientService.json";
-                listener.discover(url);
-                
-                Message message = Message.obtain();
-                message.obj = "New client: " + url;
-                toastHandler.sendMessage(message);
-            }
-        }
-        
-        @Override public void interrupt() {
-            super.interrupt();
-            broadcast.interrupt();
-        }
-    }
-    
-    private Handler toastHandler = new Handler() {
-        @Override public void handleMessage(Message message) {
-            Toast.makeText(SameService.this,
-                    (String)message.obj, Toast.LENGTH_SHORT)
-                            .show();
-            logger.info("Display toast: {}", (String)message.obj);
-        }
-    };
-    
-    
-    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) {
-                discoveryThread = new DiscoveryThread(sameController.getClient());
-                discoveryThread.start();
-            }
-            
-        }
-    }
-    
-    private void initializeConfiguration() {
-        Properties properties = new Properties();
-        properties.setProperty("port", ""+SERVICE_PORT);
-        properties.setProperty("localIp",
-                new Broadcaster(this).getWlanAddress().getHostAddress());
-        properties.setProperty("masterUrl", "http://10.0.0.6:10010/MasterService.json");
-        configuration = new Configuration(properties);
-    }
-    
-    private void sendBroadcastDiscovery(InetAddress ip) {
-        Broadcaster broadcaster = new Broadcaster(this);
-        String message = "Discover " + (PORT + 2);
-        byte[] data = message.getBytes();
-        if (ip.equals(broadcaster.getBroadcastAddress())) {
-            broadcaster.sendUdpData(data, ip, PORT);
-        } else {
-            String remoteAddress =
-                    String.format("http://%s:%s/ClientService.json",
-                    		ip.getHostAddress(), PORT + 2);
-            sameController.getClient().sendDiscoveryRequest(
-                    remoteAddress);
-        }
-    }
-    
-    private void searchNetworks(InetAddress ip) {
-        sameController.getClient().setNetworkListener(
-                new NetworkNotificationListener() {
-                    @Override
-                    public void notifyNetwork(String networkName, String masterUrl) {
-                        Message message = Message.obtain();
-                        message.obj = "notifyNetwork(" + networkName + ", " +
-                                    masterUrl;
-                        toastHandler.sendMessage(message);
-                    }
-                });
-        sendBroadcastDiscovery(ip);
-    }
-    
-    @Override
-    public IBinder onBind(Intent intent) {
-        return messenger.getBinder();
-    }
-    
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        System.setProperty("http.keepAlive", "false");
-        Toast.makeText(this, "service start: " + intent.getAction(),
-                Toast.LENGTH_SHORT).show();
-        if (sameController == null) {
-            initializeConfiguration();
-            sameController = SameController.create(configuration);
-            try {
-                sameController.start();
-            } catch (Exception e) {
-                logger.error("Failed to start server", e);
-                return START_STICKY;
-            }
-        }
-        
-        if (intent.getAction().equals("create")) {
-            createNetwork();
-        } else if (intent.getAction().equals("join")) {
-            String masterUrl = intent.getExtras().getString("masterUrl"); 
-            sameController.joinNetwork(masterUrl);
-        }
-        return START_STICKY;
-    }
-    
-    @Override
-    public void onDestroy() {
-        Toast.makeText(this, "service stopped", Toast.LENGTH_SHORT).show();
-        if (discoveryThread != null) {
-            discoveryThread.interrupt();
-        }
-        if (sameController != null) {
-            sameController.stop();
-        }
-    }
-
-}