From 5e9931fa039d11e2357a6fc64acd62ae66099511 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 24 Jun 2015 07:14:46 +1000
Subject: [PATCH] WIP: Make bluetooth/bonjour peers parcelable.

The Bluetooth peer need only parcel up the BluetoothDevice, which
itself is parcelable. The wifi peer requires the JmDNS ServiceInfo
class to be parcelled. For this, I took the most full on looking
constructor, and parcelled up each individual property of the service
info object which is required by that constructor.

Also made the scan qr button hooked up to the swap process, and fixed
minor bugs with the "visible via wifi" TextView setup.
---
 F-Droid/res/layout/swap_blank.xml             |  9 +++-
 .../fdroid/localrepo/peers/BluetoothPeer.java | 25 +++++++++++
 .../fdroid/localrepo/peers/BonjourFinder.java |  5 ++-
 .../fdroid/localrepo/peers/BonjourPeer.java   | 44 ++++++++++++++++++-
 .../fdroid/fdroid/localrepo/peers/Peer.java   |  5 +--
 .../fdroid/views/swap/StartSwapView.java      | 25 +++++++++--
 .../views/swap/SwapWorkflowActivity.java      |  5 +++
 7 files changed, 107 insertions(+), 11 deletions(-)

diff --git a/F-Droid/res/layout/swap_blank.xml b/F-Droid/res/layout/swap_blank.xml
index 788c51f05..75c7c1f55 100644
--- a/F-Droid/res/layout/swap_blank.xml
+++ b/F-Droid/res/layout/swap_blank.xml
@@ -61,7 +61,7 @@
             android:paddingStart="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/swap_visible_bluetooth"
+            tools:text="@string/swap_visible_bluetooth"
             android:textSize="18sp" />
 
         <TextView
@@ -77,6 +77,7 @@
         <Switch
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            tools:checked="true"
             android:id="@+id/switch_bluetooth" />
 
     </LinearLayout>
@@ -100,9 +101,10 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/wifi_visible"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/swap_not_visible_wifi"
+                tools:text="@string/swap_not_visible_wifi"
                 android:textSize="18sp" />
 
             <TextView
@@ -128,6 +130,7 @@
         <Switch
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            tools:checked="false"
             android:id="@+id/switch_wifi" />
 
     </LinearLayout>
@@ -176,6 +179,7 @@
         android:layout_height="wrap_content">
 
         <Button
+            android:id="@+id/btn_send_fdroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_fdroid_grey"
@@ -185,6 +189,7 @@
             android:background="@android:color/transparent" />
 
         <Button
+            android:id="@+id/btn_qr_scanner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_qr_grey"
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java
index ee263c209..c15a76a00 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java
@@ -1,6 +1,7 @@
 package org.fdroid.fdroid.localrepo.peers;
 
 import android.bluetooth.BluetoothDevice;
+import android.os.Parcel;
 
 // TODO: Still to be implemented.
 public class BluetoothPeer implements Peer {
@@ -25,5 +26,29 @@ public class BluetoothPeer implements Peer {
     public boolean equals(Peer peer) {
         return peer != null && peer instanceof BluetoothPeer && ((BluetoothPeer)peer).device.getAddress() == device.getAddress();
     }
+    
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(this.device, 0);
+    }
+
+    protected BluetoothPeer(Parcel in) {
+        this.device = in.readParcelable(BluetoothDevice.class.getClassLoader());
+    }
+
+    public static final Creator<BluetoothPeer> CREATOR = new Creator<BluetoothPeer>() {
+        public BluetoothPeer createFromParcel(Parcel source) {
+            return new BluetoothPeer(source);
+        }
+
+        public BluetoothPeer[] newArray(int size) {
+            return new BluetoothPeer[size];
+        }
+    };
 
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java
index 4ae9b3728..bb0e50770 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java
@@ -115,7 +115,10 @@ public class BonjourFinder extends PeerFinder<BonjourPeer> implements ServiceLis
 
     @Override
     public void cancel() {
-        mMulticastLock.release();
+        if (mMulticastLock != null) {
+            mMulticastLock.release();
+        }
+
         if (mJmdns == null)
             return;
         mJmdns.removeServiceListener(HTTP_SERVICE_TYPE, this);
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java
index 03aed6e93..a11a91319 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java
@@ -1,5 +1,7 @@
 package org.fdroid.fdroid.localrepo.peers;
 
+import android.os.Parcel;
+
 import org.fdroid.fdroid.R;
 
 import javax.jmdns.ServiceInfo;
@@ -26,10 +28,50 @@ public class BonjourPeer implements Peer {
     public boolean equals(Peer peer) {
         if (peer != null && peer instanceof BonjourPeer) {
             BonjourPeer that = (BonjourPeer)peer;
-            // TODO: Don't us "name" for comparing, but rather fingerprint of the swap repo.
+            // TODO: Don't use "name" for comparing, but rather fingerprint of the swap repo.
             return that.serviceInfo.getName().equals(this.serviceInfo.getName());
         }
         return false;
     }
 
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(serviceInfo.getType());
+        dest.writeString(serviceInfo.getName());
+        dest.writeString(serviceInfo.getSubtype());
+        dest.writeInt(serviceInfo.getPort());
+        dest.writeInt(serviceInfo.getWeight());
+        dest.writeInt(serviceInfo.getPriority());
+        dest.writeByte(serviceInfo.isPersistent() ? (byte) 1 : (byte) 0);
+        dest.writeString(serviceInfo.getTextString());
+    }
+
+    protected BonjourPeer(Parcel in) {
+        String type = in.readString();
+        String name = in.readString();
+        String subtype = in.readString();
+        int port = in.readInt();
+        int weight = in.readInt();
+        int priority = in.readInt();
+        boolean persistent = in.readByte() != 0;
+        String text = in.readString();
+
+        this.serviceInfo = ServiceInfo.create(type, name, subtype, port, weight, priority, persistent, text);
+    }
+
+    public static final Creator<BonjourPeer> CREATOR = new Creator<BonjourPeer>() {
+        public BonjourPeer createFromParcel(Parcel source) {
+            return new BonjourPeer(source);
+        }
+
+        public BonjourPeer[] newArray(int size) {
+            return new BonjourPeer[size];
+        }
+    };
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java
index a7f5e765b..047fd0fdc 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java
@@ -1,10 +1,9 @@
 package org.fdroid.fdroid.localrepo.peers;
 
+import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
 
-import java.io.Serializable;
-
-public interface Peer extends Serializable {
+public interface Peer extends Parcelable {
 
     String getName();
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
index 1de14d0ad..6c0444f0b 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -19,6 +19,7 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -30,7 +31,6 @@ import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.localrepo.SwapManager;
 import org.fdroid.fdroid.localrepo.peers.Peer;
-import org.fdroid.fdroid.localrepo.peers.PeerFinder;
 
 public class StartSwapView extends LinearLayout implements SwapWorkflowActivity.InnerView {
 
@@ -107,6 +107,23 @@ public class StartSwapView extends LinearLayout implements SwapWorkflowActivity.
         uiInitPeers();
         uiInitBluetooth();
         uiInitWifi();
+        uiInitButtons();
+    }
+
+    private void uiInitButtons() {
+        findViewById(R.id.btn_send_fdroid).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().sendFDroid();
+            }
+        });
+
+        findViewById(R.id.btn_qr_scanner).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().showSelectApps();
+            }
+        });
     }
 
     /**
@@ -184,7 +201,7 @@ public class StartSwapView extends LinearLayout implements SwapWorkflowActivity.
 
     private void uiInitWifi() {
 
-        final TextView textBluetoothVisible = (TextView)findViewById(R.id.bluetooth_visible);
+        final TextView textWifiVisible = (TextView)findViewById(R.id.wifi_visible);
 
         viewWifiId = (TextView)findViewById(R.id.device_id_wifi);
         viewWifiNetwork = (TextView)findViewById(R.id.wifi_network);
@@ -195,10 +212,10 @@ public class StartSwapView extends LinearLayout implements SwapWorkflowActivity.
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
-                    textBluetoothVisible.setText(getContext().getString(R.string.swap_visible_wifi));
+                    textWifiVisible.setText(getContext().getString(R.string.swap_visible_wifi));
                     uiUpdatePeersInfo();
                 } else {
-                    textBluetoothVisible.setText(getContext().getString(R.string.swap_not_visible_wifi));
+                    textWifiVisible.setText(getContext().getString(R.string.swap_not_visible_wifi));
                     uiUpdatePeersInfo();
                 }
             }
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 5fb0ec98e..2118760a9 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -179,6 +179,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         inflateInnerView(R.layout.swap_select_apps);
     }
 
+    public void sendFDroid() {
+        // TODO: What is availble here? Currently we support Bluetooth (see main menu in F-Droid)
+        // and Android Beam (try touching two devices together when in the app details view).
+    }
+
     // TODO: Figure out whether they have changed since last time UpdateAsyncTask was run.
     // If the local repo is running, then we can ask it what apps it is swapping and compare with that.
     // Otherwise, probably will need to scan the file system.