Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1

src/de/tudarmstadt/informatik/hostage/sync/wifi_direct/WiFiP2pEventHandler.java

@@ -51,8 +51,11 @@ public class WiFiP2pEventHandler implements WifiP2pManager.ChannelListener {
     }
 
     public void onPause() {
-        activity.unregisterReceiver(receiver);
-        receiver = null;
+        if (receiver != null) {
+            activity.unregisterReceiver(receiver);
+            receiver = null;
+        }
+
     }
 
     @Override

src/de/tudarmstadt/informatik/hostage/sync/wifi_direct/ui/WiFiP2pSyncActivity.java

@@ -108,6 +108,12 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
         super.onStop();
     }
 
+    @Override
+    protected void onDestroy(){
+        this.wifiEventHandler().onPause();
+        super.onDestroy();
+    }
+
     private WiFiP2pEventHandler.WiFiP2pEventListener eventListener(){
         if (_p2pEventListener == null){
             _p2pEventListener = new WiFiP2pEventHandler.WiFiP2pEventListener() {