From 2e22f5ed9976e8eeb8adbb3755f07e294a479e04 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Thu, 18 Jan 2018 19:51:39 +0100
Subject: [PATCH 01/29] fix #25

---
 .../com/flashwifi/wifip2p/MainActivity.java   |   9 ++
 .../flashwifi/wifip2p/RoamingActivity.java    |  91 +++++++-----
 .../com/flashwifi/wifip2p/SearchFragment.java |   6 +
 .../flashwifi/wifip2p/billing/Accountant.java |  48 ++++++-
 .../com/flashwifi/wifip2p/billing/Bill.java   |  23 +--
 .../wifip2p/billing/BillingClient.java        |  11 +-
 .../wifip2p/billing/BillingServer.java        |  25 +++-
 .../broadcast/WiFiDirectBroadcastService.java |   7 +-
 .../wifip2p/protocol/BillingOpenChannel.java  |   9 +-
 app/src/main/res/layout/activity_roaming.xml  | 132 +++++++++++++++---
 app/src/main/res/layout/itemlistview.xml      |  12 +-
 app/src/main/res/values/strings.xml           |   2 +
 12 files changed, 294 insertions(+), 81 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 96ffd6d..421e98a 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -19,8 +19,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.Toast;
 
@@ -50,6 +52,13 @@ public class MainActivity extends AppCompatActivity
         updateUIReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                try {
+                    // hide progress bar
+                    ProgressBar progressConnection = (ProgressBar) findViewById(R.id.progressConnection);
+                    progressConnection.setVisibility(View.VISIBLE);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
                     startRoamingView(intent.getStringExtra("peer_mac_address"),
                             intent.getStringExtra("ssid"),
diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index dec0f2c..2f2c86e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -1,5 +1,6 @@
 package com.flashwifi.wifip2p;
 
+import android.annotation.SuppressLint;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -26,6 +27,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -37,6 +39,8 @@ import com.flashwifi.wifip2p.broadcast.WiFiDirectBroadcastService;
 import com.flashwifi.wifip2p.datastore.PeerStore;
 import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
 
+import org.w3c.dom.Text;
+
 
 public class RoamingActivity extends AppCompatActivity {
     private static final String TAG = "RoamingActivity";
@@ -59,6 +63,7 @@ public class RoamingActivity extends AppCompatActivity {
 
     private Button stopButton;
     private boolean endRoamingFlag = false;
+    private boolean initiatedEnd;
 
     @Override
     protected void onStart() {
@@ -106,6 +111,11 @@ public class RoamingActivity extends AppCompatActivity {
                     flashEstablished.setChecked(true);
                 } else if (message.equals("Billing")) {
                     updateBillingCard();
+                } else if (message.equals("Channel closed")) {
+                    exitRoaming();
+                    if (mService.isInRoleHotspot()) {
+                        showRetransferCard();
+                    }
                 }
             }
 
@@ -118,25 +128,44 @@ public class RoamingActivity extends AppCompatActivity {
 
     }
 
+    private void showRetransferCard() {
+        CardView cardView = (CardView) findViewById(R.id.card_view_tangle_attachment);
+        cardView.setVisibility(View.VISIBLE);
+    }
+
+    @SuppressLint("DefaultLocale")
     private void updateBillingCard() {
         CardView summaryView = (CardView) findViewById(R.id.card_view_overview);
         if (summaryView.getVisibility() != View.VISIBLE) {
             summaryView.setVisibility(View.VISIBLE);
         }
-        String minutes = Integer.toString(Accountant.getInstance().getTotalDurance());
-        String megabytes_max = Integer.toString(Accountant.getInstance().getBookedMegabytes());
-        String megabytes_used = Integer.toString(Accountant.getInstance().getTotalMegabytes());
-        String iotas_transferred = Integer.toString(Accountant.getInstance().getTotalIotaPrice());
+        int minutes = Accountant.getInstance().getTotalDurance() / 60;
+        int minutes_max = Accountant.getInstance().getBookedMinutes();
+        int megabytes_max = Accountant.getInstance().getBookedMegabytes();
+        int megabytes_used = Accountant.getInstance().getTotalMegabytes();
+        int iotas_transferred = Accountant.getInstance().getTotalIotaPrice();
+        int iotas_max = Accountant.getInstance().getTotalIotaDeposit();
 
         TextView summaryMinutes = (TextView) findViewById(R.id.summaryMinutes);
-        summaryMinutes.setText(String.format("%s minutes active", minutes));
+        summaryMinutes.setText(String.format("%d/%d minutes active", minutes, minutes_max));
 
         TextView summaryMegabytes = (TextView) findViewById(R.id.summaryMegabytes);
-        summaryMegabytes.setText(String.format("%s/%s Megabytes roamed", megabytes_used, megabytes_max));
-
+        summaryMegabytes.setText(String.format("%d/%d Megabytes roamed", megabytes_used, megabytes_max));
 
         TextView summaryIota = (TextView) findViewById(R.id.summaryIota);
-        summaryMegabytes.setText(String.format("%s Iota transferred", iotas_transferred));
+        summaryIota.setText(String.format("%d/%d Iota transferred", iotas_transferred, iotas_max));
+
+        ProgressBar progressMinutes = (ProgressBar) findViewById(R.id.progressbarDurance);
+        progressMinutes.setMax(minutes_max);
+        progressMinutes.setProgress(minutes);
+
+        ProgressBar progressMegabytes = (ProgressBar) findViewById(R.id.progressbarMegabytes);
+        progressMegabytes.setMax(megabytes_max);
+        progressMegabytes.setProgress(megabytes_used);
+
+        ProgressBar progressIota = (ProgressBar) findViewById(R.id.progressbarIota);
+        progressIota.setProgress(iotas_transferred);
+        progressIota.setMax(iotas_max);
 
 
     }
@@ -227,30 +256,7 @@ public class RoamingActivity extends AppCompatActivity {
 
 
     private void initUI() {
-        //final EditText input = (EditText) findViewById(R.id.chat_input);
-        //Button button = (Button) findViewById(R.id.btn_send);
-        /*button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                addMessageRight(name, input.getText().toString());
-                // send the message to the peer
-                //mService.sendMessageToSocketServer(groupOwnerAddress, input.getText().toString());
-            }
-        });*/
-
-        /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                toggleHotspot();
-            }
-        });
-
-        listView = (ListView) findViewById(R.id.peer_list);
-        arrayList = new ArrayList<>();
-
-        listAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, arrayList);
-        listView.setAdapter(listAdapter);*/
+        updateBillingCard();
     }
 
     /** Defines callbacks for service binding, passed to bindService() */
@@ -298,6 +304,17 @@ public class RoamingActivity extends AppCompatActivity {
     }
 
     private void endRoaming() {
+        if (!initiatedEnd) {
+            initiatedEnd = true;
+            Accountant.getInstance().setCloseAfterwards(true);
+            // the next bill will send the close request
+            // meanwhile show a loading icon
+            ProgressBar stopProgressBar = (ProgressBar) findViewById(R.id.stopProgressBar);
+            stopProgressBar.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void exitRoaming() {
         endRoamingFlag = true;
         cancelNotification();
         if (mService.isInRoleHotspot()){
@@ -306,6 +323,16 @@ public class RoamingActivity extends AppCompatActivity {
             mService.disconnectAP();
         }
         mService.setRoaming(false);
+        // hide the spinner and the stop button
+        ProgressBar stopProgressBar = (ProgressBar) findViewById(R.id.stopProgressBar);
+        stopProgressBar.setVisibility(View.GONE);
+        Button stopButton = (Button) findViewById(R.id.stopRoamingButton);
+        stopButton.setVisibility(View.GONE);
+
+        TextView stopText = (TextView) findViewById(R.id.stopText);
+        stopText.setVisibility(View.VISIBLE);
+
+
         Toast.makeText(getApplicationContext(), "Press BACK now", Toast.LENGTH_LONG).show();
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index af6ee0e..cfdba69 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -21,6 +21,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
@@ -223,6 +224,11 @@ public class SearchFragment extends Fragment {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 if (!busy) {
                     busy = true;
+
+                    // show progress bar
+                    ProgressBar progressConnection = (ProgressBar) getActivity().findViewById(R.id.progressConnection);
+                    progressConnection.setVisibility(View.VISIBLE);
+
                     PeerInformation peer = PeerStore.getInstance().getPeerArrayList().get(i);
 
                     peer.setSelected(true);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
index 619f1ac..213aff4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
@@ -12,7 +12,11 @@ public class Accountant {
     private int totalIotaPrice;
     private int totalDurance;
     private int bookedMegabytes;
+    private int bookedMinutes;
+    private int totalIotaDeposit;
     private int timeoutMinutes;
+    private boolean closeAfterwards;
+    private long startTime;
 
     private FlashChannelHelper flashChannelHelper;
 
@@ -25,19 +29,39 @@ public class Accountant {
     private Accountant() {
     }
 
-    public void start(int bookedMegabytes, int timeoutMinutes){
+    public void start(int bookedMegabytes, int timeoutMinutes, int bookedMinutes, int totalIotaDeposit){
         if (closed) {
             bills = new ArrayList<Bill>();
             this.bookedMegabytes = bookedMegabytes;
             this.timeoutMinutes = timeoutMinutes;
+            this.totalIotaDeposit = totalIotaDeposit;
             totalMegabytes = 0;
             totalIotaPrice = 0;
             totalDurance = 0;
             flashChannelHelper = new FlashChannelHelper();
+            closeAfterwards = false;
+            startTime = System.currentTimeMillis() / 1000L;
+            this.bookedMinutes = bookedMinutes;
             closed = false;
         }
     }
 
+    private long getLastTime() {
+        if (bills.isEmpty()) {
+            return startTime;
+        } else {
+            return bills.get(bills.size()-1).getTime();
+        }
+    }
+
+    public boolean isCloseAfterwards() {
+        return closeAfterwards;
+    }
+
+    public void setCloseAfterwards(boolean closeAfterwards) {
+        this.closeAfterwards = closeAfterwards;
+    }
+
     public int getNextBillNumber() {
         return bills.size() + 1;
     }
@@ -56,20 +80,22 @@ public class Accountant {
 
         totalMegabytes += b.getMegabytesUsed();
         totalIotaPrice += b.getPriceInIota();
-        totalDurance += b.getDuranceInMinutes();
+        totalDurance += b.getDuranceInSeconds();
 
         // ToDo: apply transfer to flash channel
 
         return true;
     }
 
-    public Bill createBill(int megaByte, int priceInIota, int duranceMinutes){
+    public Bill createBill(int megaByte, int priceInIota){
         if (!closed) {
-            Bill b = new Bill(getNextBillNumber(), totalDurance, duranceMinutes, megaByte, priceInIota);
+            long now = System.currentTimeMillis() / 1000L;
+            long duranceInSeconds = now - getLastTime();
+            Bill b = new Bill(getNextBillNumber(), now, duranceInSeconds, megaByte, priceInIota);
 
             totalMegabytes += megaByte;
             totalIotaPrice += priceInIota;
-            totalDurance += duranceMinutes;
+            totalDurance += duranceInSeconds;
 
             // 1) modify flash channel
             applyTransferToFlashChannel(priceInIota);
@@ -114,4 +140,16 @@ public class Accountant {
     public int getBookedMegabytes() {
         return bookedMegabytes;
     }
+
+    public int getTimeoutMinutes() {
+        return timeoutMinutes;
+    }
+
+    public int getBookedMinutes() {
+        return bookedMinutes;
+    }
+
+    public int getTotalIotaDeposit() {
+        return totalIotaDeposit;
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
index b3bb0cb..4f3dd4b 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
@@ -3,17 +3,17 @@ package com.flashwifi.wifip2p.billing;
 
 public class Bill {
     private int index;
-    private int minuteStart;
-    private int duranceInMinutes = 1;
     private int megabytesUsed;
     private int priceInIota;
+    private long duranceInSeconds;
+    private long time;
 
     private boolean acceptedByPeer;
 
-    public Bill(int index, int minuteStart, int duranceInMinutes, int megabytesUsed, int priceInIota) {
+    public Bill(int index, long time, long duranceInSeconds, int megabytesUsed, int priceInIota) {
         this.index = index;
-        this.minuteStart = minuteStart;
-        this.duranceInMinutes = duranceInMinutes;
+        this.time = time;
+        this.duranceInSeconds = duranceInSeconds;
         this.megabytesUsed = megabytesUsed;
         this.priceInIota = priceInIota;
     }
@@ -30,12 +30,13 @@ public class Bill {
         return index;
     }
 
-    public int getMinuteStart() {
-        return minuteStart;
-    }
 
     public int getDuranceInMinutes() {
-        return duranceInMinutes;
+        return (int) duranceInSeconds/60;
+    }
+
+    public int getDuranceInSeconds() {
+        return (int) duranceInSeconds;
     }
 
     public int getMegabytesUsed() {
@@ -45,4 +46,8 @@ public class Bill {
     public int getPriceInIota() {
         return priceInIota;
     }
+
+    public long getTime() {
+        return time;
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
index 7555740..85a3e39 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
@@ -1,5 +1,6 @@
 package com.flashwifi.wifip2p.billing;
 
+import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
@@ -74,15 +75,17 @@ public class BillingClient {
                     String hotspotStateLine = socketWrapper.getLineThrowing();
                     if (hotspotStateLine.contains("INITIAL") || hotspotStateLine.contains("NOT_PAIRED")) {
                         // ask the hotspot to open the flash channel
+                        // ToDo: get real digests
                         String[] digests = new String[]{"1234", "2345", "3456"};
-                        billingOpenChannel = new BillingOpenChannel(100, 100, "clientAddress", 8, digests, 20 * 60 * 1000);
+                        // ToDo: replace magic numbers
+                        billingOpenChannel = new BillingOpenChannel(100, 100, "clientAddress", 8, digests, 20 * 60 * 1000, 60);
                         String billingOpenChannelString = gson.toJson(billingOpenChannel);
                         socketWrapper.sendLine(billingOpenChannelString);
                         // receive the hotspot details for the flash channel
                         String billingOpenChannelAnswerString = socketWrapper.getLineThrowing();
                         billingOpenChannelAnswer = gson.fromJson(billingOpenChannelAnswerString, BillingOpenChannelAnswer.class);
                         // now create the flash channel on our side
-                        Accountant.getInstance().start(billingOpenChannel.getTotalMegabytes(), billingOpenChannel.getTimeoutMinutesClient());
+                        Accountant.getInstance().start(billingOpenChannel.getTotalMegabytes(), billingOpenChannel.getTimeoutMinutesClient(), billingOpenChannel.getTotalMinutes(), billingOpenChannelAnswer.getClientDepositIota());
                         sendUpdateUIBroadcastWithMessage("Channel established");
                         state = State.ROAMING;
                     } else {
@@ -106,7 +109,7 @@ public class BillingClient {
                         // ToDo: flash object -> diff()
                         // ToDo: sign flash transaction
                         sendUpdateUIBroadcastWithMessage("Billing");
-                        latestBillAnswer = new BillMessageAnswer("id", true, "", false);
+                        latestBillAnswer = new BillMessageAnswer("id", true, "", Accountant.getInstance().isCloseAfterwards());
                         latestBillAnswerString = gson.toJson(latestBillAnswer);
                         socketWrapper.sendLine(latestBillAnswerString);
 
@@ -128,6 +131,8 @@ public class BillingClient {
                     String billingCloseChannelAnswerString = gson.toJson(billingCloseChannelAnswer);
                     socketWrapper.sendLine(billingCloseChannelAnswerString);
 
+                    sendUpdateUIBroadcastWithMessage("Channel closed");
+
                     state = State.CLOSED;
                 }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index 1b21a17..cef1ee2 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -2,6 +2,8 @@ package com.flashwifi.wifip2p.billing;
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.text.format.Formatter;
 import android.util.Log;
 
 import com.flashwifi.wifip2p.negotiation.SocketWrapper;
@@ -20,6 +22,8 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 
+import static android.content.Context.WIFI_SERVICE;
+
 /**
  * 1) This class keeps the socket connection alive.
  * 2) It tracks the state of the communication.
@@ -48,9 +52,9 @@ public class BillingServer {
         context.sendBroadcast(local);
     }
 
-    public BillingServer(int bookedMegabytes, int timeoutMinutes, Context context){
+    public BillingServer(int bookedMegabytes, int timeoutMinutes, int maxMinutes, int iotaDepositClient, Context context){
         this.context = context;
-        Accountant.getInstance().start(bookedMegabytes,timeoutMinutes);
+        Accountant.getInstance().start(bookedMegabytes, timeoutMinutes, maxMinutes, iotaDepositClient);
         gson = new GsonBuilder().create();
     }
 
@@ -59,6 +63,10 @@ public class BillingServer {
         createDeadlineGuard();
         // 1) create a socket
 
+        Log.d(TAG, "start: Billing server has been started");
+
+        // ToDo: receive end of roaming broadcast
+
         while (state != State.CLOSED) {
             try {
                 // create server socket
@@ -117,10 +125,9 @@ public class BillingServer {
                         Log.d(TAG, "start: Good morning!");
                         // create new bill
                         // ToDo: integrate real network data
-                        // ToDo: calculate time correctly
-                        b = Accountant.getInstance().createBill(0,0,1);
+                        b = Accountant.getInstance().createBill(3,9);
                         // ToDo: integrate real flash channel
-                        latestBill = new BillMessage(b, "", false);
+                        latestBill = new BillMessage(b, "<flash obj>", Accountant.getInstance().isCloseAfterwards());
                         latestBillString = gson.toJson(latestBill);
                         socketWrapper.sendLine(latestBillString);
 
@@ -136,11 +143,14 @@ public class BillingServer {
                         if (latestBill.isCloseAfterwards() || latestBillAnswer.isCloseAfterwards()) {
                             state = State.CLOSE;
                         }
+
+                        sendUpdateUIBroadcastWithMessage("Billing");
                     }
 
                 }
 
                 if (state == State.CLOSE) {
+                    Log.d(TAG, "start: state is CLOSE now");
                     // ToDo: handle the final deposit of the flash channel
                     // ToDo: sign the transaction
                     BillingCloseChannel billingCloseChannel = new BillingCloseChannel(0,0,0,0,"", "", "");
@@ -150,6 +160,9 @@ public class BillingServer {
                     String billingCloseChannelAnswerString = socketWrapper.getLineThrowing();
                     BillingCloseChannelAnswer billingCloseChannelAnswer = gson.fromJson(billingCloseChannelAnswerString, BillingCloseChannelAnswer.class);
                     // ToDo: validate the signature
+
+                    // change the ui
+                    sendUpdateUIBroadcastWithMessage("Channel closed");
                     state = State.CLOSED;
                 }
 
@@ -162,7 +175,7 @@ public class BillingServer {
                     state = State.FULLY_ATTACHED;
                 }
             } catch (IOException e) {
-
+                e.printStackTrace();
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index abdf621..217cb66 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -101,8 +101,9 @@ public class WiFiDirectBroadcastService extends Service {
             Runnable task = new Runnable() {
                 @Override
                 public void run() {
+                    Log.d(TAG, "run: instantiate billing server");
                     // ToDo: remove magic numbers
-                    BillingServer billingServer = new BillingServer(100, 20, getApplicationContext());
+                    BillingServer billingServer = new BillingServer(100, 20, 60, 100, getApplicationContext());
 
                     try {
                         billingServer.start();
@@ -115,8 +116,10 @@ public class WiFiDirectBroadcastService extends Service {
             };
             Log.d(TAG, "startBillingServer");
             Thread thread = new Thread(task);
+            //asyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
+            //AsyncTask.execute(thread);
             threads.add(thread);
-            AsyncTask.execute(thread);
+            thread.start();
         }
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/protocol/BillingOpenChannel.java b/app/src/main/java/com/flashwifi/wifip2p/protocol/BillingOpenChannel.java
index 9ce6cd1..067b795 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/protocol/BillingOpenChannel.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/protocol/BillingOpenChannel.java
@@ -3,6 +3,7 @@ package com.flashwifi.wifip2p.protocol;
 
 public class BillingOpenChannel {
     private int totalMegabytes;
+    private int totalMinutes;
     private int iotaPerMegabyte;
     private int timeoutMinutesClient;
     private String clientRefundAddress;
@@ -10,8 +11,10 @@ public class BillingOpenChannel {
     private String[] clientDigests;
 
     public BillingOpenChannel(int totalMegabytes, int iotaPerMegabyte, String clientRefundAddress,
-                              int treeDepth, String[] clientDigests, int timeoutMinutesClient) {
+                              int treeDepth, String[] clientDigests, int timeoutMinutesClient,
+                              int totalMinutes) {
         this.totalMegabytes = totalMegabytes;
+        this.totalMinutes = totalMinutes;
         this.iotaPerMegabyte = iotaPerMegabyte;
         this.clientRefundAddress = clientRefundAddress;
         this.treeDepth = treeDepth;
@@ -42,4 +45,8 @@ public class BillingOpenChannel {
     public String[] getClientDigests() {
         return clientDigests;
     }
+
+    public int getTotalMinutes() {
+        return totalMinutes;
+    }
 }
diff --git a/app/src/main/res/layout/activity_roaming.xml b/app/src/main/res/layout/activity_roaming.xml
index e7c87f8..4ca539a 100644
--- a/app/src/main/res/layout/activity_roaming.xml
+++ b/app/src/main/res/layout/activity_roaming.xml
@@ -60,21 +60,88 @@
                 android:clickable="false"
                 android:text="Flash channel" />
 
-            <Button
-                android:id="@+id/stopRoamingButton"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="STOP"
+                android:orientation="horizontal"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_marginBottom="10dp" >
 
+                <Button
+                    android:id="@+id/stopRoamingButton"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:text="STOP"
+                    />
+
+                <ProgressBar
+                    android:id="@+id/stopProgressBar"
+                    android:layout_marginTop="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    />
+
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/stopText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/channelClosed"
+                android:visibility="invisible"/>
 
         </LinearLayout>
 
 
     </android.support.v7.widget.CardView>
 
+        <android.support.v7.widget.CardView
+            xmlns:card_view="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/card_view_tangle_attachment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="15dp"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_margin="15dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:text="Retransfer deposits"
+                    android:textSize="20sp" />
+
+                <ProgressBar
+                    android:id="@+id/progressbarRetransfer"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:max="100"
+                    android:progress="5"
+                    />
+
+                <TextView
+                    android:id="@+id/retransferText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/initRetransfer"/>
+
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
     <android.support.v7.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/card_view_overview"
@@ -98,14 +165,14 @@
                 android:textSize="20sp" />
 
 
-            <TextView
+            <ProgressBar
+                android:id="@+id/progressbarMegabytes"
+                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:id="@+id/summaryMinutes"
-                android:text="0 minutes open"
-                android:textSize="15sp" />
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                />
 
             <TextView
                 android:id="@+id/summaryMegabytes"
@@ -116,25 +183,44 @@
                 android:text="0/0 Megabytes"
                 android:textSize="15sp" />
 
+            <ProgressBar
+                android:id="@+id/progressbarDurance"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginTop="20dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:id="@+id/summaryMinutes"
+                android:text="0/0 seconds"
+                android:textSize="15sp" />
+
+            <ProgressBar
+                android:id="@+id/progressbarIota"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginTop="20dp"
+                />
+
             <TextView
                 android:id="@+id/summaryIota"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
-                android:text="0 Iota transferred"
-                android:textSize="15sp" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:text="0.1 Miota still locked"
+                android:text="0/0 Iota transferred"
                 android:textSize="15sp"
-                android:layout_marginBottom="20dp"/>
-
-
+                android:paddingBottom="20dp"/>
 
         </LinearLayout>
 
@@ -142,6 +228,8 @@
 
 
 
+
+
 </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/itemlistview.xml b/app/src/main/res/layout/itemlistview.xml
index 9833098..1befd94 100644
--- a/app/src/main/res/layout/itemlistview.xml
+++ b/app/src/main/res/layout/itemlistview.xml
@@ -34,7 +34,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="left"
-                    android:layout_marginRight="50dp"
+                    android:layout_weight="1"
+                    android:layout_marginRight="20dp"
                     android:text="Device name"
                     android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
 
@@ -83,6 +84,15 @@
 
             </LinearLayout>
 
+            <ProgressBar
+                android:id="@+id/progressConnection"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:visibility="gone"
+                />
+
 
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91a9fdc..2fa5a37 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,5 +64,7 @@
     <string name="startSearch">Start Search</string>
     <string name="roaming_title">Roaming (This is your hotspot)</string>
     <string name="roaming_title_client">Roaming (You are consuming)</string>
+    <string name="channelClosed">The payment channel was closed.</string>
+    <string name="initRetransfer">Initializing retransfer</string>
 
 </resources>
\ No newline at end of file

From 82f544e8b0202fe5fc7893357907fc906cc0888c Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Thu, 18 Jan 2018 23:04:08 +0100
Subject: [PATCH 02/29] fix #27

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  7 +-
 .../com/flashwifi/wifip2p/HomeActivity.java   | 73 +++++++++++++++++++
 3 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ddf1ce7..3913c71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "jenny.daniel.wifip2p"
-        minSdkVersion 22
-        targetSdkVersion 22
+        minSdkVersion 23
+        targetSdkVersion 23
         multiDexEnabled = true
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96cd9cb..714f849 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.flashwifi.wifip2p">
 
-    <uses-sdk android:minSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="23" />
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -14,6 +15,10 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission-sdk-23 android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions"/>
 
 
     <application
diff --git a/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java b/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
index f7abc69..41c9868 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
@@ -1,9 +1,17 @@
 package com.flashwifi.wifip2p;
 
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
@@ -12,6 +20,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.flashwifi.wifip2p.iotaFlashWrapper.IotaFlashBridge;
 import com.flashwifi.wifip2p.iotaFlashWrapper.Main;
@@ -73,6 +82,21 @@ public class HomeActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
 
+
+        ActivityCompat.requestPermissions(HomeActivity.this,
+                new String[]{
+                        Manifest.permission.ACCESS_WIFI_STATE,
+                        Manifest.permission.CHANGE_WIFI_STATE,
+                        Manifest.permission.CHANGE_NETWORK_STATE,
+                        Manifest.permission.INTERNET,
+                        Manifest.permission.ACCESS_NETWORK_STATE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.READ_PHONE_STATE,
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.CAMERA
+                },
+                1);
+
         // iotalibflash
         String iotaflash = readFile("iotaflash");
         String iotaflashhelper = readFile("iotaflashhelper");
@@ -87,6 +111,55 @@ public class HomeActivity extends AppCompatActivity {
         }*/
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case 1: {
+
+                // If request is cancelled, the result arrays are empty.
+                int i = 0;
+                if (grantResults.length > 0) {
+                    boolean ok = true;
+                    for (int grantResult: grantResults) {
+                        if (grantResult != PackageManager.PERMISSION_GRANTED) {
+                            ok = false;
+                            Log.d(TAG, "onRequestPermissionsResult: denied: " + permissions[i]);
+                        }
+                        i++;
+                    }
+                    if (ok) {
+                        Toast.makeText(HomeActivity.this, "Permissions granted", Toast.LENGTH_SHORT).show();
+                    } else {
+                        Toast.makeText(HomeActivity.this, "Permissions denied", Toast.LENGTH_SHORT).show();
+                    }
+                    AppOpsManager appOps = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
+                    int mode = appOps.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS,
+                            android.os.Process.myUid(), getPackageName());
+                    if (mode != AppOpsManager.MODE_ALLOWED) {
+                        Intent intent = new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS);
+                        startActivity(intent);
+                    }
+
+                    int mode2 = appOps.checkOpNoThrow(AppOpsManager.OPSTR_WRITE_SETTINGS,
+                            android.os.Process.myUid(), getPackageName());
+                    if (mode2 != AppOpsManager.MODE_ALLOWED) {
+                        Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
+                        startActivity(intent);
+                    }
+                } else {
+
+                    // permission denied, boo! Disable the
+                    // functionality that depends on this permission.
+                    Toast.makeText(HomeActivity.this, "Permission denied to read your External storage", Toast.LENGTH_SHORT).show();
+                }
+            }
+
+            // other 'case' lines to check for other
+            // permissions this app might request
+        }
+    }
+
     private void setProgressBar(int percentage) {
         ProgressBar prog = (ProgressBar) findViewById(R.id.progressbar);
         prog.setProgress(percentage);

From 76d06a60cf7f4f14bebfcd8f662ff5bfe559478b Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Thu, 18 Jan 2018 23:47:24 +0100
Subject: [PATCH 03/29] add rx and tx bytes to the billing

---
 .../flashwifi/wifip2p/RoamingActivity.java    | 14 ++++---
 .../flashwifi/wifip2p/billing/Accountant.java | 37 ++++++++++++++-----
 .../com/flashwifi/wifip2p/billing/Bill.java   | 10 ++---
 .../wifip2p/billing/BillingClient.java        |  3 +-
 .../wifip2p/billing/BillingServer.java        | 30 +++++++++++++--
 .../broadcast/WiFiDirectBroadcastService.java |  2 +-
 6 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index 2f2c86e..fdd496b 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -141,8 +141,8 @@ public class RoamingActivity extends AppCompatActivity {
         }
         int minutes = Accountant.getInstance().getTotalDurance() / 60;
         int minutes_max = Accountant.getInstance().getBookedMinutes();
-        int megabytes_max = Accountant.getInstance().getBookedMegabytes();
-        int megabytes_used = Accountant.getInstance().getTotalMegabytes();
+        int bytes_max = Accountant.getInstance().getBookedBytes();
+        int bytes_used = Accountant.getInstance().getTotalBytes();
         int iotas_transferred = Accountant.getInstance().getTotalIotaPrice();
         int iotas_max = Accountant.getInstance().getTotalIotaDeposit();
 
@@ -150,7 +150,7 @@ public class RoamingActivity extends AppCompatActivity {
         summaryMinutes.setText(String.format("%d/%d minutes active", minutes, minutes_max));
 
         TextView summaryMegabytes = (TextView) findViewById(R.id.summaryMegabytes);
-        summaryMegabytes.setText(String.format("%d/%d Megabytes roamed", megabytes_used, megabytes_max));
+        summaryMegabytes.setText(String.format("%d/%d Megabytes roamed", bytes_used, bytes_max));
 
         TextView summaryIota = (TextView) findViewById(R.id.summaryIota);
         summaryIota.setText(String.format("%d/%d Iota transferred", iotas_transferred, iotas_max));
@@ -160,8 +160,8 @@ public class RoamingActivity extends AppCompatActivity {
         progressMinutes.setProgress(minutes);
 
         ProgressBar progressMegabytes = (ProgressBar) findViewById(R.id.progressbarMegabytes);
-        progressMegabytes.setMax(megabytes_max);
-        progressMegabytes.setProgress(megabytes_used);
+        progressMegabytes.setMax(bytes_max);
+        progressMegabytes.setProgress(bytes_used);
 
         ProgressBar progressIota = (ProgressBar) findViewById(R.id.progressbarIota);
         progressIota.setProgress(iotas_transferred);
@@ -256,7 +256,7 @@ public class RoamingActivity extends AppCompatActivity {
 
 
     private void initUI() {
-        updateBillingCard();
+
     }
 
     /** Defines callbacks for service binding, passed to bindService() */
@@ -300,6 +300,8 @@ public class RoamingActivity extends AppCompatActivity {
             }
         });
 
+        updateBillingCard();
+
         showNotification();
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
index 213aff4..e796d91 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
@@ -8,13 +8,14 @@ public class Accountant {
 
 
     private ArrayList<Bill> bills;
-    private int totalMegabytes;
+    private int totalBytes;
     private int totalIotaPrice;
     private int totalDurance;
     private int bookedMegabytes;
     private int bookedMinutes;
     private int totalIotaDeposit;
     private int timeoutMinutes;
+    private int iotaPerMegaByte;
     private boolean closeAfterwards;
     private long startTime;
 
@@ -29,13 +30,14 @@ public class Accountant {
     private Accountant() {
     }
 
-    public void start(int bookedMegabytes, int timeoutMinutes, int bookedMinutes, int totalIotaDeposit){
+    public void start(int bookedMegabytes, int timeoutMinutes, int bookedMinutes, int totalIotaDeposit, int iotaPerMegaByte){
         if (closed) {
             bills = new ArrayList<Bill>();
             this.bookedMegabytes = bookedMegabytes;
             this.timeoutMinutes = timeoutMinutes;
             this.totalIotaDeposit = totalIotaDeposit;
-            totalMegabytes = 0;
+            this.iotaPerMegaByte = iotaPerMegaByte;
+            totalBytes = 0;
             totalIotaPrice = 0;
             totalDurance = 0;
             flashChannelHelper = new FlashChannelHelper();
@@ -46,7 +48,7 @@ public class Accountant {
         }
     }
 
-    private long getLastTime() {
+    public long getLastTime() {
         if (bills.isEmpty()) {
             return startTime;
         } else {
@@ -78,7 +80,7 @@ public class Accountant {
 
         // ToDo: check bill
 
-        totalMegabytes += b.getMegabytesUsed();
+        totalBytes += b.getBytesUsed();
         totalIotaPrice += b.getPriceInIota();
         totalDurance += b.getDuranceInSeconds();
 
@@ -87,13 +89,14 @@ public class Accountant {
         return true;
     }
 
-    public Bill createBill(int megaByte, int priceInIota){
+    public Bill createBill(int bytes){
         if (!closed) {
             long now = System.currentTimeMillis() / 1000L;
             long duranceInSeconds = now - getLastTime();
-            Bill b = new Bill(getNextBillNumber(), now, duranceInSeconds, megaByte, priceInIota);
+            int priceInIota = (int) (bytes * getIotaPerByte());
+            Bill b = new Bill(getNextBillNumber(), now, duranceInSeconds, bytes, priceInIota);
 
-            totalMegabytes += megaByte;
+            totalBytes += bytes;
             totalIotaPrice += priceInIota;
             totalDurance += duranceInSeconds;
 
@@ -126,7 +129,11 @@ public class Accountant {
     }
 
     public int getTotalMegabytes() {
-        return totalMegabytes;
+        return totalBytes / (1024*1024);
+    }
+
+    public int getTotalBytes() {
+        return totalBytes / (1024*1024);
     }
 
     public int getTotalIotaPrice() {
@@ -141,6 +148,10 @@ public class Accountant {
         return bookedMegabytes;
     }
 
+    public int getBookedBytes() {
+        return bookedMegabytes;
+    }
+
     public int getTimeoutMinutes() {
         return timeoutMinutes;
     }
@@ -152,4 +163,12 @@ public class Accountant {
     public int getTotalIotaDeposit() {
         return totalIotaDeposit;
     }
+
+    public int getIotaPerMegaByte() {
+        return iotaPerMegaByte;
+    }
+
+    public double getIotaPerByte() {
+        return ((double)getIotaPerMegaByte()) / (1024.0d * 1024.0d);
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
index 4f3dd4b..0b8df8e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Bill.java
@@ -3,18 +3,18 @@ package com.flashwifi.wifip2p.billing;
 
 public class Bill {
     private int index;
-    private int megabytesUsed;
+    private int bytesUsed;
     private int priceInIota;
     private long duranceInSeconds;
     private long time;
 
     private boolean acceptedByPeer;
 
-    public Bill(int index, long time, long duranceInSeconds, int megabytesUsed, int priceInIota) {
+    public Bill(int index, long time, long duranceInSeconds, int bytesUsed, int priceInIota) {
         this.index = index;
         this.time = time;
         this.duranceInSeconds = duranceInSeconds;
-        this.megabytesUsed = megabytesUsed;
+        this.bytesUsed = bytesUsed;
         this.priceInIota = priceInIota;
     }
 
@@ -39,8 +39,8 @@ public class Bill {
         return (int) duranceInSeconds;
     }
 
-    public int getMegabytesUsed() {
-        return megabytesUsed;
+    public int getBytesUsed() {
+        return bytesUsed;
     }
 
     public int getPriceInIota() {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
index 85a3e39..8deae55 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
@@ -85,7 +85,8 @@ public class BillingClient {
                         String billingOpenChannelAnswerString = socketWrapper.getLineThrowing();
                         billingOpenChannelAnswer = gson.fromJson(billingOpenChannelAnswerString, BillingOpenChannelAnswer.class);
                         // now create the flash channel on our side
-                        Accountant.getInstance().start(billingOpenChannel.getTotalMegabytes(), billingOpenChannel.getTimeoutMinutesClient(), billingOpenChannel.getTotalMinutes(), billingOpenChannelAnswer.getClientDepositIota());
+                        Accountant.getInstance().start(billingOpenChannel.getTotalMegabytes(), billingOpenChannel.getTimeoutMinutesClient(), billingOpenChannel.getTotalMinutes(), billingOpenChannelAnswer.getClientDepositIota(),
+                                billingOpenChannel.getIotaPerMegabyte());
                         sendUpdateUIBroadcastWithMessage("Channel established");
                         state = State.ROAMING;
                     } else {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index cef1ee2..8c5a1d0 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -1,8 +1,12 @@
 package com.flashwifi.wifip2p.billing;
 
+import android.app.usage.NetworkStats;
+import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+import android.os.RemoteException;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -17,6 +21,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
@@ -44,6 +49,7 @@ public class BillingServer {
     private static final int serverTimeoutMillis = 2 * 60 * 1000;
 
     Context context;
+    NetworkStatsManager networkStatsManager;
 
     private void sendUpdateUIBroadcastWithMessage(String message){
         Intent local = new Intent();
@@ -52,10 +58,11 @@ public class BillingServer {
         context.sendBroadcast(local);
     }
 
-    public BillingServer(int bookedMegabytes, int timeoutMinutes, int maxMinutes, int iotaDepositClient, Context context){
+    public BillingServer(int bookedMegabytes, int timeoutMinutes, int maxMinutes, int iotaDepositClient, int iotaPerMegabyte, Context context){
         this.context = context;
-        Accountant.getInstance().start(bookedMegabytes, timeoutMinutes, maxMinutes, iotaDepositClient);
+        Accountant.getInstance().start(bookedMegabytes, timeoutMinutes, maxMinutes, iotaDepositClient, iotaPerMegabyte);
         gson = new GsonBuilder().create();
+        networkStatsManager = (NetworkStatsManager) context.getSystemService(Context.NETWORK_STATS_SERVICE);
     }
 
     public void start() throws IOException {
@@ -98,7 +105,7 @@ public class BillingServer {
                     // answer with billingOpenChannelAnswerString
                     // ToDo: create the flash channel
                     String[] myDigests = new String[]{"1234", "2345", "3456"};
-                    BillingOpenChannelAnswer billingOpenChannelAnswer = new BillingOpenChannelAnswer(0, 0, "", "", myDigests);
+                    BillingOpenChannelAnswer billingOpenChannelAnswer = new BillingOpenChannelAnswer(1000, 1000, "", "", myDigests);
                     String billingOpenChannelAnswerString = gson.toJson(billingOpenChannelAnswer);
                     socketWrapper.sendLine(billingOpenChannelAnswerString);
 
@@ -125,7 +132,21 @@ public class BillingServer {
                         Log.d(TAG, "start: Good morning!");
                         // create new bill
                         // ToDo: integrate real network data
-                        b = Accountant.getInstance().createBill(3,9);
+                        NetworkStats.Bucket bucket;
+                        long total_bytes;
+                        try {
+                            bucket = networkStatsManager.querySummaryForDevice(ConnectivityManager.TYPE_WIFI,
+                                    "",
+                                    Accountant.getInstance().getLastTime() * 1000,
+                                    System.currentTimeMillis());
+                            long bytes_received = bucket.getRxBytes();
+                            long bytes_transmitted = bucket.getTxBytes();
+                            total_bytes = bytes_received + bytes_transmitted;
+                        } catch (RemoteException e) {
+                            Log.d(TAG, "start: Can't get the network traffic.");
+                            total_bytes = 0;
+                        }
+                        b = Accountant.getInstance().createBill((int)total_bytes);
                         // ToDo: integrate real flash channel
                         latestBill = new BillMessage(b, "<flash obj>", Accountant.getInstance().isCloseAfterwards());
                         latestBillString = gson.toJson(latestBill);
@@ -183,6 +204,7 @@ public class BillingServer {
 
     }
 
+
     private void createDeadlineGuard() {
         // this method measures the time and stops the connection if
         // nothing happened after <timeoutMinutes>
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index 217cb66..954d1b3 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -103,7 +103,7 @@ public class WiFiDirectBroadcastService extends Service {
                 public void run() {
                     Log.d(TAG, "run: instantiate billing server");
                     // ToDo: remove magic numbers
-                    BillingServer billingServer = new BillingServer(100, 20, 60, 100, getApplicationContext());
+                    BillingServer billingServer = new BillingServer(10, 20, 30, 10000, 1000, getApplicationContext());
 
                     try {
                         billingServer.start();

From a159b21e32bb6636916e803afa411f16cf0cef19 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Thu, 18 Jan 2018 18:55:53 -0500
Subject: [PATCH 04/29] Settings Fragment Initial UI

-Added Settings Fragment
---
 .../com/flashwifi/wifip2p/MainActivity.java   | 17 +++-
 .../flashwifi/wifip2p/SettingsFragment.java   | 20 ++++
 app/src/main/res/xml/preferences.xml          | 92 +++++++++++++++++++
 3 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
 create mode 100644 app/src/main/res/xml/preferences.xml

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 4ac6ed7..79d1a63 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -11,6 +11,7 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -101,9 +102,10 @@ public class MainActivity extends AppCompatActivity
         Intent intent2 = new Intent(this, WiFiDirectBroadcastService.class);
         bindService(intent2, mConnection, Context.BIND_AUTO_CREATE);
 
+        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+
         subscribeToBroadcasts();
         initUi();
-
     }
 
     @Override
@@ -155,7 +157,7 @@ public class MainActivity extends AppCompatActivity
         } else if (id == R.id.nav_conditions) {
 
         } else if (id == R.id.nav_settings) {
-
+            startSettingsFragment();
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -231,6 +233,17 @@ public class MainActivity extends AppCompatActivity
                 .commit();
     }
 
+    private void startSettingsFragment() {
+        Fragment fragment = new WithdrawWalletFragment();
+        fragment.setRetainInstance(true);
+
+        // Insert the fragment by replacing any existing fragment
+        FragmentManager fragmentManager = getFragmentManager();
+        fragmentManager.beginTransaction()
+                .replace(R.id.content_frame, fragment)
+                .commit();
+    }
+
     @Override
     public void onBackPressed() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
new file mode 100644
index 0000000..074531a
--- /dev/null
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -0,0 +1,20 @@
+package com.flashwifi.wifip2p;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+/**
+ * Created by Toby on 1/16/2018.
+ */
+
+public class SettingsFragment extends PreferenceFragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.preferences);
+    }
+
+
+}
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..537ee3c
--- /dev/null
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:title="WiFi"
+        android:key="pref_key_wifi_settings"
+        android:elevation="10dp">
+
+        <ListPreference
+            android:key="pref_key_security"
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:title="Security" />
+
+        <Preference
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:key="pref_key_reset_data_usage"
+            android:title="Reset Data Usage"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="IOTA"
+        android:elevation="10dp"
+        android:key="pref_key_IOTA_settings">
+
+
+        <ListPreference
+            android:key="pref_key_network_timeout"
+            android:title="Network Timeout" />
+
+        <ListPreference
+            android:key="pref_key_units"
+            android:title="Units" />
+
+
+        <PreferenceScreen
+            android:key="button_testnet_category_key"
+            android:title="Testnet"
+            android:persistent="false">
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="switch_preference_testnet"
+                android:title="Testnet" />
+
+            <Preference
+                android:key="pref_key_reset_password"
+                android:title="Reset Password"/>
+
+        </PreferenceScreen>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="Payment"
+        android:elevation="10dp"
+        android:key="pref_key_payment_settings">
+
+        <EditTextPreference
+            android:defaultValue="Default value"
+            android:key="edit_text_buy_price"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="Buy Price" />
+
+        <EditTextPreference
+            android:defaultValue="Default value"
+            android:key="edit_text_sell_price"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="Sell Price" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="Wallet"
+        android:elevation="10dp"
+        android:key="pref_key_wallet_settings">
+
+        <Preference
+            android:key="pref_key_reset_password"
+            android:title="Reset Password"/>
+
+        <Preference
+            android:key="pref_key_reset_wallet"
+            android:title="Reset Wallet"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file

From fc96ad539b289d27f86b233416baefcece83ae60 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Fri, 19 Jan 2018 00:46:10 -0500
Subject: [PATCH 05/29] Settings Listeners

Added click and change listeners
---
 .../com/flashwifi/wifip2p/MainActivity.java   |  2 +-
 .../flashwifi/wifip2p/SettingsFragment.java   | 74 ++++++++++++++++++-
 app/src/main/res/values/preferencesArrays.xml | 25 +++++++
 app/src/main/res/xml/preferences.xml          | 37 +++++-----
 4 files changed, 119 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/values/preferencesArrays.xml

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 9c922ee..02ea6f4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -247,7 +247,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void startSettingsFragment() {
-        Fragment fragment = new WithdrawWalletFragment();
+        Fragment fragment = new SettingsFragment();
         fragment.setRetainInstance(true);
 
         // Insert the fragment by replacing any existing fragment
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 074531a..e4dfab0 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -1,20 +1,92 @@
 package com.flashwifi.wifip2p;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.widget.Toast;
+
+import com.pddstudio.preferences.encrypted.EncryptedPreferences;
 
 /**
  * Created by Toby on 1/16/2018.
  */
 
-public class SettingsFragment extends PreferenceFragment {
+public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
+
+        //Set change listener
+        getPreferenceScreen().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(this);
+
     }
 
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch(key){
+            case "pref_key_security":
+                Toast.makeText(getActivity(), "Security Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_network_timeout":
+                Toast.makeText(getActivity(), "Network Timeout Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_units":
+                Toast.makeText(getActivity(), "Units Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_switch_testnet":
+                Toast.makeText(getActivity(), "Testnet on/off Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "edit_text_buy_price":
+                Toast.makeText(getActivity(), "Buy Price Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "edit_text_sell_price":
+                Toast.makeText(getActivity(), "Sell Price Changed", Toast.LENGTH_SHORT).show();
+                break;
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        String key = preference.getKey();
+
+        switch (key) {
+            case "pref_key_reset_data_usage":
+                Toast.makeText(getActivity(), "Reset Data Usage", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_testnet_fund_add":
+                Toast.makeText(getActivity(), "Testnet fund add", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_reset_password":
+                Toast.makeText(getActivity(), "Reset Password", Toast.LENGTH_SHORT).show();
+                break;
+            case "pref_key_reset_wallet":
+                Toast.makeText(getActivity(), "Reset Wallet", Toast.LENGTH_SHORT).show();
+                break;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    public void updatePassword(String password){
+
+        Context context = getActivity();
+        EncryptedPreferences encryptedPreferences = new EncryptedPreferences.Builder(context).withEncryptionPassword(password).build();
+        String seed = encryptedPreferences.getString(getString(R.string.encrypted_seed), null);
+
+        if (seed != null && context != null) {
+            //Correct password, re-store seed with new password
+            EncryptedPreferences encryptedPreferencesUpdated = new EncryptedPreferences.Builder(context).withEncryptionPassword(password).build();
+            encryptedPreferencesUpdated.edit().putString(getString(R.string.encrypted_seed), seed).apply();
+        }
+        else{
+            //Wrong Password
+        }
+    }
 
 }
diff --git a/app/src/main/res/values/preferencesArrays.xml b/app/src/main/res/values/preferencesArrays.xml
new file mode 100644
index 0000000..66e78a1
--- /dev/null
+++ b/app/src/main/res/values/preferencesArrays.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="securityPref" >
+        <item>One</item>
+        <item>Two</item>
+    </string-array>
+
+    <string-array name="networkTimeoutPref" >
+        <item>15 seconds</item>
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>3 minutes</item>
+        <item>No timeout</item>
+    </string-array>
+
+    <string-array name="unitsPref" >
+        <item>Iota (i)</item>
+        <item>Kilo Iota (Ki)</item>
+        <item>Mega Iota (Mi)</item>
+        <item>Giga Iota (Gi)</item>
+        <item>Tera Iota (Ti)</item>
+        <item>Peta Iota (Pi)</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 537ee3c..317afcd 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -10,6 +10,8 @@
             android:key="pref_key_security"
             android:divider="@null"
             android:dividerHeight="0dp"
+            android:entries="@array/securityPref"
+            android:entryValues="@array/securityPref"
             android:title="Security" />
 
         <Preference
@@ -28,28 +30,27 @@
 
         <ListPreference
             android:key="pref_key_network_timeout"
+            android:entries="@array/networkTimeoutPref"
+            android:entryValues="@array/networkTimeoutPref"
             android:title="Network Timeout" />
 
         <ListPreference
             android:key="pref_key_units"
+            android:entries="@array/unitsPref"
+            android:entryValues="@array/unitsPref"
             android:title="Units" />
 
 
-        <PreferenceScreen
-            android:key="button_testnet_category_key"
-            android:title="Testnet"
-            android:persistent="false">
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="pref_key_switch_testnet"
+            android:title="Testnet" />
 
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="switch_preference_testnet"
-                android:title="Testnet" />
-
-            <Preference
-                android:key="pref_key_reset_password"
-                android:title="Reset Password"/>
-
-        </PreferenceScreen>
+        <Preference
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:key="pref_key_testnet_fund_add"
+            android:title="Add 2000i testnet"/>
 
     </PreferenceCategory>
 
@@ -59,15 +60,17 @@
         android:key="pref_key_payment_settings">
 
         <EditTextPreference
-            android:defaultValue="Default value"
+            android:defaultValue="10"
             android:key="edit_text_buy_price"
+            android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Buy Price" />
+            android:title="Max Buy Price" />
 
         <EditTextPreference
-            android:defaultValue="Default value"
+            android:defaultValue="10"
             android:key="edit_text_sell_price"
+            android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Sell Price" />

From 224c94bd8cfc93c68c5b96333a3647519a2db993 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Fri, 19 Jan 2018 12:29:37 +0100
Subject: [PATCH 06/29] fix #30 fix #24

---
 .../broadcast/WiFiDirectBroadcastService.java |  28 ++-
 .../wifip2p/negotiation/Negotiator.java       | 173 +++++++++++++-----
 app/src/main/res/values/errorCodes.xml        |  19 ++
 app/src/main/res/xml/preferences.xml          |  39 +++-
 4 files changed, 203 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/res/values/errorCodes.xml

diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index 954d1b3..f5d4840 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -1,4 +1,5 @@
 package com.flashwifi.wifip2p.broadcast;
+import android.app.Activity;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -14,6 +15,7 @@ import android.net.wifi.p2p.WifiP2pManager;
 import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.util.Log;
 
 import com.flashwifi.wifip2p.accesspoint.AccessPointTask;
@@ -217,17 +219,23 @@ public class WiFiDirectBroadcastService extends Service {
         }
     }
 
+
     public void startNegotiationServer(final boolean isClient, String macAddress) {
         Runnable task = new Runnable() {
             @Override
             public void run() {
-                Negotiator negotiator = new Negotiator(isClient, getWFDMacAddress());
+                Negotiator negotiator = new Negotiator(isClient,
+                        getWFDMacAddress(),
+                        PreferenceManager.getDefaultSharedPreferences(getApplicationContext()),
+                        getBaseContext()
+                        );
+
                 String peer_mac_address = null;
                 while (!isRoaming && enabled && peer_mac_address == null) {
                     Log.d(TAG, "run: " + enabled);
-                    peer_mac_address = negotiator.workAsServer();
-                    // ToDo: use other broadcast for this
-                    // sendUpdateUIBroadcast();
+                    Negotiator.NegotiationReturn ret = negotiator.workAsServer();
+                    peer_mac_address = ret.mac;
+                    sendUpdateUIBroadcastWithMessage(getString(ret.code));
                     try {
                         Thread.sleep(2000);
                     } catch (InterruptedException e) {
@@ -272,12 +280,20 @@ public class WiFiDirectBroadcastService extends Service {
         Runnable task = new Runnable() {
             @Override
             public void run() {
-                Negotiator negotiator = new Negotiator(isClient, getWFDMacAddress());
+                Negotiator negotiator = new Negotiator(
+                        isClient,
+                        getWFDMacAddress(),
+                        PreferenceManager.getDefaultSharedPreferences(getApplicationContext()),
+                        getBaseContext()
+                );
                 String peer_mac_address = null;
+                Negotiator.NegotiationReturn negotiationReturn;
                 while (!isRoaming && enabled && peer_mac_address == null) {
                     Log.d(TAG, "run: " + enabled);
                     System.out.println(" *******+ work as client *******");
-                    peer_mac_address = negotiator.workAsClient(address.getHostAddress());
+                    negotiationReturn = negotiator.workAsClient(address.getHostAddress());
+                    peer_mac_address = negotiationReturn.mac;
+                    sendUpdateUIBroadcastWithMessage(getString(negotiationReturn.code));
                     try {
                         Thread.sleep(2000);
                     } catch (InterruptedException e) {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
index 79609bf..67c487a 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
@@ -1,8 +1,12 @@
 package com.flashwifi.wifip2p.negotiation;
 
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.util.Log;
 
+import com.flashwifi.wifip2p.R;
 import com.flashwifi.wifip2p.datastore.PeerStore;
 import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
 import com.flashwifi.wifip2p.protocol.NegotiationOffer;
@@ -11,6 +15,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -34,7 +39,12 @@ public class Negotiator {
     // consumer as in consumer-hotspot
     private boolean isConsumer;
 
+    String mac = null;
+    String peer_mac_address = null;
+
     private Gson gson;
+    private SharedPreferences prefs;
+    private Context context;
 
     public enum ConsumerState {
         INITIAL,
@@ -59,18 +69,22 @@ public class Negotiator {
         ERROR
     }
 
-    public Negotiator(boolean isConsumer, String ownMacAddress) {
+    public Negotiator(boolean isConsumer, String ownMacAddress, SharedPreferences prefs, Context context) {
         this.isConsumer = isConsumer;
         gson = new GsonBuilder().create();
         this.ownMacAddress = ownMacAddress;
+        this.prefs = prefs;
+        this.context = context;
         Log.d(TAG, "Negotiator: " + ownMacAddress);
     }
 
-    public String workAsClient(String serverIPAddress) {
+    public NegotiationReturn workAsClient(String serverIPAddress) {
         this.isClient = true;
-
-        String success = null;
         Socket socket = null;
+        NegotiationReturn negReturn;
+        int code = 0;
+        boolean restartAfterwards = false;
+
 
         try {
             // create client socket that connects to server
@@ -87,13 +101,23 @@ public class Negotiator {
 
             // Whether we want to provide a hotspot or use one
             if (isConsumer) {
-                success = runConsumerProtocol(serverIPAddress);
+                negReturn = runConsumerProtocol(serverIPAddress);
             } else {
-                success = runHotspotProtocol(serverIPAddress);
+                negReturn = runHotspotProtocol(serverIPAddress);
             }
+
+            mac = negReturn.mac;
+            restartAfterwards = negReturn.restartAfterwards;
+            code = negReturn.code;
         } catch (SocketTimeoutException ste) {
-            Log.d(TAG, "workAsServer: ### Timed out after 1 seconds");
+            mac = null;
+            restartAfterwards = true;
+            code = R.string.err_timeout;
+            Log.d(TAG, "workAsServer: ### Timed out");
         } catch (IOException e) {
+            mac = null;
+            restartAfterwards = true;
+            code = R.string.err_io_exception;
             Log.d("", e.getMessage());
         } finally {
             if (socket != null) {
@@ -104,16 +128,19 @@ public class Negotiator {
                 }
             }
         }
-        return success;
+        return new NegotiationReturn(code, mac, restartAfterwards);
     }
 
-    public String workAsServer() {
+    public NegotiationReturn workAsServer() {
         // this device is the socket server
         this.isClient = false;
 
-        String peer_mac_address = null;
+        peer_mac_address = null;
         ServerSocket serverSocket = null;
         Socket socket = null;
+        int code = 0;
+        NegotiationReturn negReturn;
+        boolean restartAfterwards = false;
 
         try {
             // use the port to start
@@ -132,27 +159,35 @@ public class Negotiator {
             String hello = socketWrapper.getLine();
 
             if (hello == null) {
-                error(0, "no hello received");
-                return null;
+                return error(R.string.no_hello_received, true);
             }
 
             // Check: Is the peer in the same role as we are
             // server and server or client and client MAKES NO SENSE
             if (hello.contains("SERVER") && !isClient || hello.contains("CLIENT") && isClient){
-                error(1, "Pairing roles are broken");
-                return null;
+                return error(R.string.err_pairing_roles_broken, true);
             }
 
             // Whether we want to provide a hotspot or use one
             if (isConsumer) {
-                peer_mac_address = runConsumerProtocol(socketWrapper.getClientAddress().getHostAddress());
+                negReturn = runConsumerProtocol(socketWrapper.getClientAddress().getHostAddress());
             } else {
-                peer_mac_address = runHotspotProtocol(socketWrapper.getClientAddress().getHostAddress());
+                negReturn = runHotspotProtocol(socketWrapper.getClientAddress().getHostAddress());
             }
+            peer_mac_address = negReturn.mac;
+            code = negReturn.code;
+            restartAfterwards = negReturn.restartAfterwards;
+
         } catch (SocketTimeoutException ste) {
-            Log.d(TAG, "workAsServer: ### Timed out after 1 seconds");
+            Log.d(TAG, "workAsServer: ### Timed out");
+            code = R.string.err_timeout;
+            peer_mac_address = null;
+            restartAfterwards = true;
         } catch (IOException e) {
-            Log.d("", e.getMessage());
+            Log.d(TAG, e.getMessage());
+            code = R.string.err_io_exception;
+            peer_mac_address = null;
+            restartAfterwards = true;
         } finally {
             if (socket != null) {
                 try {
@@ -168,19 +203,17 @@ public class Negotiator {
                     e.printStackTrace();
                 }
             }
-
         }
-        return peer_mac_address;
+        return new NegotiationReturn(code, peer_mac_address, restartAfterwards);
     }
 
-    private String runConsumerProtocol(String ipAddress) throws IOException {
+    private NegotiationReturn runConsumerProtocol(String ipAddress) throws IOException {
         consumer_state = ConsumerState.WAIT_FOR_OFFER;
 
         // RECEIVE OFFER
         String offerString = socketWrapper.getLine();
         if (offerString == null) {
-            error(2, "No offer received");
-            return null;
+            return error(R.string.err_no_offer_received, true);
         }
 
         // CHECK OFFER
@@ -190,15 +223,29 @@ public class Negotiator {
         // Write offer to the PeerStore
         PeerStore.getInstance().setLatestOffer(otherMac, offer);
 
-        // ToDo: implement accept or deny logic
-        if (!true) {
-            error(3, "Offer not acceptable");
-            return null;
+        // accept or deny logic
+        int iotaPerMegabyte = Integer.valueOf(prefs.getString("edit_text_buy_price", "-1"));
+        if (iotaPerMegabyte < 0) {
+            return error(R.string.err_buy_price_bad_setting, false);
+        }
+        if (offer.getIotaPerMegabyte() > iotaPerMegabyte) {
+            return error(R.string.err_price_too_high, false);
+        }
+
+        int hotspot_max_minutes = offer.getMaxMinutes();
+        int hotspot_min_minutes = offer.getMinMinutes();
+        int client_roaming_minutes = Integer.valueOf(prefs.getString("edit_text_client_minutes", "-1"));
+
+        if (client_roaming_minutes < 0) {
+            return error(R.string.err_client_minutes_bad_setting, false);
+        }
+
+        if (client_roaming_minutes < hotspot_min_minutes || client_roaming_minutes > hotspot_max_minutes) {
+            return error(R.string.err_client_minutes_not_acceptable_for_hotspot, false);
         }
 
         // SEND NegotiationAnswer
-        // ToDo: where shall the input come from?
-        NegotiationOfferAnswer answer = new NegotiationOfferAnswer(true, 10, ownMacAddress);
+        NegotiationOfferAnswer answer = new NegotiationOfferAnswer(true, client_roaming_minutes, ownMacAddress);
         PeerStore.getInstance().setLatestOfferAnswer(otherMac, answer);
         String answerString = gson.toJson(answer);
         socketWrapper.sendLine(answerString);
@@ -208,8 +255,7 @@ public class Negotiator {
         String finalizationString = socketWrapper.getLine();
 
         if (finalizationString == null) {
-            error(4, "No finalization received");
-            return null;
+            return error(R.string.err_no_finalization_received, true);
         }
 
         NegotiationFinalization finalization = gson.fromJson(finalizationString, NegotiationFinalization.class);
@@ -224,16 +270,27 @@ public class Negotiator {
         // End
         socketWrapper.close();
 
-        return otherMac;
+        return new NegotiationReturn(0, otherMac, false);
     }
 
-    private String runHotspotProtocol(String ipAddress) throws IOException {
+    private NegotiationReturn runHotspotProtocol(String ipAddress) throws IOException {
         // CHECK_CLIENT_REQUEST
         hotspot_state = HotspotState.CHECK_CLIENT_REQUEST;
 
         // send offer
-        int iotaPerMegabyte = (int) (Math.random() * (1000 - 10)) + 10;
-        NegotiationOffer offer = new NegotiationOffer(1, 100, iotaPerMegabyte, ownMacAddress);
+        int iotaPerMegabyte = Integer.valueOf(prefs.getString("edit_text_sell_price", "-1"));
+        if (iotaPerMegabyte < 0) {
+            return error(R.string.err_sell_price_bad_setting, false);
+        }
+        int minMinutes = Integer.valueOf(prefs.getString("edit_text_min_minutes", "-1"));
+        if (minMinutes < 0) {
+            return error(R.string.err_min_minutes_bad_setting, false);
+        }
+        int maxMinutes = Integer.valueOf(prefs.getString("edit_text_max_minutes", "-1"));
+        if (maxMinutes < 0) {
+            return error(R.string.err_max_minutes_bad_setting, false);
+        }
+        NegotiationOffer offer = new NegotiationOffer(minMinutes, maxMinutes, iotaPerMegabyte, ownMacAddress);
 
         String offerString = gson.toJson(offer);
         socketWrapper.sendLine(offerString);
@@ -243,13 +300,13 @@ public class Negotiator {
         String answerString = socketWrapper.getLine();
 
         if (answerString == null) {
-            error(8, "No answer received");
-            return null;
+            return error(R.string.err_no_answer_received, true);
         }
 
         // Parse the answer
         NegotiationOfferAnswer answer = gson.fromJson(answerString, NegotiationOfferAnswer.class);
         String otherMac = answer.getConsumerMac();
+        peer_mac_address = otherMac;
         PeerStore.getInstance().setLatestOffer(otherMac, offer);
         PeerStore.getInstance().setLatestOfferAnswer(otherMac, answer);
 
@@ -257,8 +314,11 @@ public class Negotiator {
         hotspot_state = HotspotState.CHECK_ANSWER;
 
         if (!answer.isAgreeToConditions()) {
-            error(5, "Client does not agree to conditions");
-            return null;
+            return error(R.string.err_client_does_not_agree, false);
+        }
+
+        if (answer.getDuranceInMinutes() > maxMinutes || answer.getDuranceInMinutes() < minMinutes) {
+            return error(R.string.err_client_minutes_out_of_bounds, false);
         }
 
         // CHECK_ITP
@@ -266,7 +326,6 @@ public class Negotiator {
 //        if (!true) {
 //            writeError(0, "");
 //            server_state = NegotiationServerTask.State.ERROR;
-//            // ToDo: Error handling
 //        }
 
         // GENERATE_PASSWORD and hotspot name
@@ -274,11 +333,18 @@ public class Negotiator {
         int min = 100000000;
         int max = 999999999;
         String password = Integer.toString(ThreadLocalRandom.current().nextInt(min, max + 1));
-        String hotspotName = "Iotify-"+Integer.toString(ThreadLocalRandom.current().nextInt(100, 10000));;
+        String hotspotName = "Iotify-"+Integer.toString(ThreadLocalRandom.current().nextInt(100, 10000));
 
-        // send password and hotspot name
+
+        // ToDo: get depositAddressFlashChannel from SharedPreferences
+        // ToDo: get the bandwidth of the hotspot
+        // ToDo: create initial flash object
+        double bandwidth = 0.1; // megabyte per second;
+        int max_data_volume_megabytes = (int) (answer.getDuranceInMinutes() * bandwidth);
+        int max_iota_transferred = max_data_volume_megabytes * offer.getIotaPerMegabyte();
+        // send the most important message to the user
         NegotiationFinalization finalization = new NegotiationFinalization(hotspotName, password,
-                "Address", 0, 0, "");
+                "Address", max_iota_transferred, max_iota_transferred, "");
         PeerStore.getInstance().setLatestFinalization(otherMac, finalization);
         String finalizationString = gson.toJson(finalization);
 
@@ -296,20 +362,35 @@ public class Negotiator {
 
         socketWrapper.close();
 
-        return otherMac;
+        return new NegotiationReturn(0, otherMac, false);
     }
 
     // ------------------------
     //   HELPER METHODS BELOW
     // ------------------------
 
-    private void error(int code, String msg) throws IOException {
-        Log.d(TAG, "error: " + msg);
+    private NegotiationReturn error(int err_no, boolean restartAfterwards) throws IOException {
+        String str = context.getString(err_no);
+        Log.d(TAG, "error: " + str);
         if (isConsumer) {
             consumer_state = ConsumerState.ERROR;
         } else {
             hotspot_state = HotspotState.ERROR;
         }
+        String macAdd = (restartAfterwards) ? null : this.peer_mac_address;
         socketWrapper.close();
+        return new NegotiationReturn(err_no, macAdd, restartAfterwards);
+    }
+
+    public class NegotiationReturn {
+        public int code;
+        public String mac;
+        public boolean restartAfterwards;
+
+        public NegotiationReturn(int code, String mac, boolean restartAfterwards) {
+            this.mac = mac;
+            this.code = code;
+            this.restartAfterwards = restartAfterwards;
+        }
     }
 }
diff --git a/app/src/main/res/values/errorCodes.xml b/app/src/main/res/values/errorCodes.xml
new file mode 100644
index 0000000..fd4bd3a
--- /dev/null
+++ b/app/src/main/res/values/errorCodes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="err_no_finalization_received">No finalization received</string>
+    <string name="err_pairing_roles_broken">Pairing roles are broken</string>
+    <string name="no_hello_received">No hello received</string>
+    <string name="err_no_offer_received">No offer received</string>
+    <string name="err_buy_price_bad_setting">Buy price bad setting</string>
+    <string name="err_price_too_high">Price too high</string>
+    <string name="err_client_minutes_bad_setting">Client minutes bad setting</string>
+    <string name="err_client_minutes_not_acceptable_for_hotspot">Client minutes not acceptable for hotspot</string>
+    <string name="err_sell_price_bad_setting">Sell price bad setting</string>
+    <string name="err_min_minutes_bad_setting">Min minutes bad setting</string>
+    <string name="err_max_minutes_bad_setting">Max minutes bad setting</string>
+    <string name="err_no_answer_received">No answer received</string>
+    <string name="err_client_does_not_agree">Client does not agree to conditions</string>
+    <string name="err_client_minutes_out_of_bounds">Client minutes is out of bounds</string>
+    <string name="err_timeout">Timeout</string>
+    <string name="err_io_exception">IO Exception</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 317afcd..40eda9e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -55,7 +55,38 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="Payment"
+        android:title="Hotspot payment conditions"
+        android:elevation="10dp"
+        android:key="pref_key_payment_settings">
+
+        <EditTextPreference
+            android:defaultValue="10"
+            android:key="edit_text_sell_price"
+            android:inputType="number"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="Sell Price" />
+
+        <EditTextPreference
+            android:defaultValue="15"
+            android:key="edit_text_min_minutes"
+            android:inputType="number"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="Minimum selling durance [minutes]" />
+
+        <EditTextPreference
+            android:defaultValue="100"
+            android:key="edit_text_max_minutes"
+            android:inputType="number"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="Maximum selling durance [minutes]" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="Client payment conditions"
         android:elevation="10dp"
         android:key="pref_key_payment_settings">
 
@@ -68,12 +99,12 @@
             android:title="Max Buy Price" />
 
         <EditTextPreference
-            android:defaultValue="10"
-            android:key="edit_text_sell_price"
+            android:defaultValue="60"
+            android:key="edit_text_client_minutes"
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Sell Price" />
+            android:title="Client roaming durance" />
 
     </PreferenceCategory>
 

From 3e0948356435abb712af4976c3592e3cb03529f4 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Fri, 19 Jan 2018 16:27:51 +0100
Subject: [PATCH 07/29] clean error codes fix #31

---
 .../flashwifi/wifip2p/HotspotFragment.java    |  4 +-
 .../com/flashwifi/wifip2p/MainActivity.java   | 28 +++++++++++++-
 .../flashwifi/wifip2p/RoamingActivity.java    |  7 ++++
 .../com/flashwifi/wifip2p/SearchFragment.java | 29 ++++++++------
 .../wifip2p/accesspoint/AccessPointTask.java  |  5 ++-
 .../wifip2p/billing/BillingClient.java        | 36 +++++++++++++++++-
 .../broadcast/WiFiDirectBroadcastService.java | 36 ++++++++++++++----
 .../wifip2p/datastore/PeerInformation.java    |  9 +++++
 .../wifip2p/datastore/PeerListAdapter.java    | 20 +++++-----
 .../wifip2p/datastore/PeerStore.java          | 14 +++++++
 .../wifip2p/negotiation/Negotiator.java       | 38 +++++++++++++++++--
 app/src/main/res/layout/itemlistview.xml      | 11 +-----
 app/src/main/res/values/errorCodes.xml        |  1 +
 13 files changed, 190 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
index c3e1a97..cbfe89f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
@@ -83,7 +83,7 @@ public class HotspotFragment extends Fragment {
             WifiP2pInfo p2p_info = mService.getP2p_info();
             WifiP2pGroup wifiP2pGroup = mService.getP2p_group();
 
-            //if (intent.hasExtra("currentDeviceConnected")) {
+            if (intent.hasExtra("currentDeviceConnected")) {
                 //String macAddress = intent.getExtras().getString("currentDeviceConnected");
                 if (network_info.getState() == NetworkInfo.State.CONNECTED) {
                     // ToDo: look for the other device and make sure we are only two
@@ -98,7 +98,7 @@ public class HotspotFragment extends Fragment {
                     }
 
                 }
-            //}
+            }
 
 
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 02ea6f4..d43d39a 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -176,9 +177,32 @@ public class MainActivity extends AppCompatActivity
         return true;
     }
 
+    private boolean settingsAreReady(){
+        // check whether all necessary settings were set by the user
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        String[] intVariables = new String[]{
+                "edit_text_min_minutes",
+                "edit_text_sell_price",
+                "edit_text_min_minutes",
+                "edit_text_max_minutes",
+                "edit_text_buy_price",
+                "edit_text_client_minutes"
+        };
+        String val;
+        for (String variable: intVariables) {
+            val = prefs.getString(variable, null);
+            if (val == null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void startSearchFragment() {
         if (mBound && mService.isInRoleHotspot()) {
             Toast.makeText(this, "Can't start search because you are hotspot", Toast.LENGTH_SHORT).show();
+        } else if (!settingsAreReady()) {
+            Toast.makeText(this, "Navigate to settings and assign all variables", Toast.LENGTH_SHORT).show();
         } else {
             Fragment fragment = new SearchFragment();
 
@@ -202,11 +226,11 @@ public class MainActivity extends AppCompatActivity
     public void startHotspotFragment() {
         if (mBound && mService.isInRoleConsumer()) {
             Toast.makeText(this, "Can't start hotspot because you are searching", Toast.LENGTH_SHORT).show();
+        } else if (!settingsAreReady()) {
+            Toast.makeText(this, "Navigate to settings and assign all variables", Toast.LENGTH_SHORT).show();
         } else {
             Fragment fragment = new HotspotFragment();
             Bundle args = new Bundle();
-            //args.putInt(PlanetFragment.ARG_PLANET_NUMBER, position);
-            //fragment.setArguments(args);
 
             // Insert the fragment by replacing any existing fragment
             FragmentManager fragmentManager = getFragmentManager();
diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index fdd496b..00b8a44 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -105,6 +105,7 @@ public class RoamingActivity extends AppCompatActivity {
                 } else if (message.equals("AP FAILED")) {
                     apConnected.setChecked(false);
                     Toast.makeText(getApplicationContext(), "Could not create Access point", Toast.LENGTH_LONG).show();
+                    exitRoaming();
                 } else if (message.equals("AP STOPPED")) {
                     apConnected.setChecked(false);
                 } else if (message.equals("Channel established")) {
@@ -116,6 +117,12 @@ public class RoamingActivity extends AppCompatActivity {
                     if (mService.isInRoleHotspot()) {
                         showRetransferCard();
                     }
+                } else if (message.equals("Socket exception")) {
+                    //Toast.makeText(getApplicationContext(), "Socket exception", Toast.LENGTH_LONG).show();
+                    //exitRoaming();
+                } else if (message.equals("Exit")) {
+                    Toast.makeText(getApplicationContext(), "Can't connect", Toast.LENGTH_LONG).show();
+                    exitRoaming();
                 }
             }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index cfdba69..131a2ca 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -43,7 +43,7 @@ public class SearchFragment extends Fragment {
 
     WiFiDirectBroadcastService mService;
     boolean mBound = false;
-    BroadcastReceiver updateUIReceiver;
+    BroadcastReceiver updateUIReceiver = null;
 
     ArrayList<String> arrayList;
     PeerListAdapter peerListAdapter;
@@ -87,8 +87,8 @@ public class SearchFragment extends Fragment {
     }
 
     private void updateList() {
-        peerListAdapter.notifyDataSetInvalidated();
         peerListAdapter.clear();
+        // peerListAdapter.notifyDataSetInvalidated();
         peerListAdapter.addAll(PeerStore.getInstance().getPeerArrayList());
         peerListAdapter.notifyDataSetChanged();
     }
@@ -97,16 +97,18 @@ public class SearchFragment extends Fragment {
         updateList();
 
         String what = intent.getStringExtra("what");
-        Log.d(">>>>>>>>>>>>", "updateUi: " + what);
+        String message = intent.getStringExtra("message");
 
-        if (what == null) {
-            what = "";
-        }
-
-        if (what.equals("connectivity_changed")) {
+        if (what != null && what.equals("connectivity_changed")) {
             String currentDeviceConnected = intent.getStringExtra("currentDeviceConnected");
             startNegotiationProtocol(currentDeviceConnected);
         }
+
+        if (message != null && message.equals("error")) {
+            String snd_message = intent.getStringExtra("snd_message");
+            Snackbar.make(view, snd_message, Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            updateList();
+        }
     }
 
     private void startNegotiationProtocol(String macAddress){
@@ -153,9 +155,14 @@ public class SearchFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        getActivity().unbindService(mConnection);
-        getActivity().unregisterReceiver(updateUIReceiver);
-        mBound = false;
+        if (mBound) {
+            getActivity().unbindService(mConnection);
+            mBound = false;
+        }
+        if (updateUIReceiver != null) {
+            getActivity().unregisterReceiver(updateUIReceiver);
+            updateUIReceiver = null;
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/accesspoint/AccessPointTask.java b/app/src/main/java/com/flashwifi/wifip2p/accesspoint/AccessPointTask.java
index 5844a4e..c159e7c 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/accesspoint/AccessPointTask.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/accesspoint/AccessPointTask.java
@@ -86,17 +86,20 @@ public class AccessPointTask extends AsyncTask<Object, Void, String> {
                 }
                 catch (IllegalArgumentException e) {
                     e.printStackTrace();
+                    sendUpdateUIBroadcastWithMessage("AP FAILED");
                 }
                 catch (IllegalAccessException e) {
                     e.printStackTrace();
+                    sendUpdateUIBroadcastWithMessage("AP FAILED");
                 }
                 catch (InvocationTargetException e) {
                     e.printStackTrace();
+                    sendUpdateUIBroadcastWithMessage("AP FAILED");
                 }
             }
         }
         if (!methodFound){
-            // ToDo: implement this
+            sendUpdateUIBroadcastWithMessage("AP FAILED");
             //statusView.setText("Your phone's API does not contain setWifiApEnabled method to configure an access point");
         }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
index 8deae55..fad4a75 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
@@ -36,6 +36,7 @@ public class BillingClient {
     private SocketWrapper socketWrapper;
     private static final int PORT = 9199;
     private static final int clientTimeoutMillis = 2 * 60 * 1000;
+    private static final int maxErrorCount = 5;
 
     private BillingOpenChannel billingOpenChannel;
     private BillingOpenChannelAnswer billingOpenChannelAnswer;
@@ -58,7 +59,9 @@ public class BillingClient {
 
 
     public void start(String serverIPAddress) {
-        while (state != State.CLOSED) {
+        int error_count = 0;
+
+        while (state != State.CLOSED && state != State.ERROR) {
             try {
                 // create client socket that connects to server
                 socket = new Socket(serverIPAddress, PORT);
@@ -140,10 +143,38 @@ public class BillingClient {
 
             } catch (SocketException e) {
                 e.printStackTrace();
+                sendUpdateUIBroadcastWithMessage("Socket exception");
+                error_count++;
             } catch (UnknownHostException e) {
+                sendUpdateUIBroadcastWithMessage("UnknownHostException exception");
                 e.printStackTrace();
+                error_count++;
             } catch (IOException e) {
+                sendUpdateUIBroadcastWithMessage("IOException");
                 e.printStackTrace();
+                error_count++;
+            } finally {
+                if (socket != null) {
+                    try {
+                        socketWrapper.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                // sleep in finally case 5 seconds
+                try {
+                    Thread.sleep(1000*5);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+                if (error_count >= maxErrorCount) {
+                    // stop trying to connect
+                    state = State.ERROR;
+                    sendUpdateUIBroadcastWithMessage("Exit");
+                }
+
             }
         }
     }
@@ -152,6 +183,7 @@ public class BillingClient {
         NOT_PAIRED,
         ROAMING,
         CLOSE,
-        CLOSED
+        CLOSED,
+        ERROR
     }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index f5d4840..8039d26 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -231,21 +231,33 @@ public class WiFiDirectBroadcastService extends Service {
                         );
 
                 String peer_mac_address = null;
-                while (!isRoaming && enabled && peer_mac_address == null) {
+                boolean restartAfterwards = true;
+                int error_count = 0;
+                int max_error_count = 10;
+                Negotiator.NegotiationReturn ret = null;
+                while (!isRoaming && enabled && peer_mac_address == null && restartAfterwards && (error_count < max_error_count)) {
+                    Log.d(TAG, String.format("%d/%d errors", error_count, max_error_count));
                     Log.d(TAG, "run: " + enabled);
-                    Negotiator.NegotiationReturn ret = negotiator.workAsServer();
+                    ret = negotiator.workAsServer();
                     peer_mac_address = ret.mac;
-                    sendUpdateUIBroadcastWithMessage(getString(ret.code));
+                    restartAfterwards = ret.restartAfterwards;
+                    if (ret.code != 0) {
+                        sendUpdateUIBroadcastWithMessage(getString(ret.code));
+                        if (restartAfterwards) {
+                            error_count++;
+                        }
+                    }
                     try {
                         Thread.sleep(2000);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        error_count++;
                     }
                     if (peer_mac_address == null) {
                         deletePersistentGroups();
                     }
                 }
-                if (peer_mac_address != null) {
+                if (peer_mac_address != null && ret != null && ret.code == 0) {
                     // block the discovery mode due to switch to roaming state
                     setRoaming(true);
                     // tell the UI
@@ -253,6 +265,8 @@ public class WiFiDirectBroadcastService extends Service {
                     String ssid = negFin.getHotspotName();
                     String key = negFin.getHotspotPassword();
                     sendStartRoamingBroadcast(peer_mac_address, ssid, key);
+                } else if (peer_mac_address != null) {
+                    PeerStore.getInstance().unselectAll();
                 }
             }
 
@@ -262,6 +276,7 @@ public class WiFiDirectBroadcastService extends Service {
             Thread thread = new Thread(task);
             threads.add(thread);
             AsyncTask.execute(thread);
+            //stopDiscovery(null);
         } else {
             Log.d(TAG, "startNegServer: BLOCKED due to roaming state");
         }
@@ -287,13 +302,17 @@ public class WiFiDirectBroadcastService extends Service {
                         getBaseContext()
                 );
                 String peer_mac_address = null;
-                Negotiator.NegotiationReturn negotiationReturn;
-                while (!isRoaming && enabled && peer_mac_address == null) {
+                boolean restartAfterwards = true;
+                Negotiator.NegotiationReturn negotiationReturn = null;
+                while (!isRoaming && enabled && peer_mac_address == null && restartAfterwards) {
                     Log.d(TAG, "run: " + enabled);
                     System.out.println(" *******+ work as client *******");
                     negotiationReturn = negotiator.workAsClient(address.getHostAddress());
                     peer_mac_address = negotiationReturn.mac;
-                    sendUpdateUIBroadcastWithMessage(getString(negotiationReturn.code));
+                    restartAfterwards = negotiationReturn.restartAfterwards;
+                    if (negotiationReturn.code != 0) {
+                        sendUpdateUIBroadcastWithMessage(getString(negotiationReturn.code));
+                    }
                     try {
                         Thread.sleep(2000);
                     } catch (InterruptedException e) {
@@ -303,7 +322,7 @@ public class WiFiDirectBroadcastService extends Service {
                         deletePersistentGroups();
                     }
                 }
-                if (peer_mac_address != null) {
+                if (peer_mac_address != null && negotiationReturn != null && negotiationReturn.code == 0) {
                     // block the discovery mode due to switch to roaming state
                     setRoaming(true);
                     // tell the UI
@@ -312,6 +331,7 @@ public class WiFiDirectBroadcastService extends Service {
                     String key = negFin.getHotspotPassword();
                     sendStartRoamingBroadcast(peer_mac_address, ssid, key);
                 }
+                PeerStore.getInstance().unselectAll();
             }
         };
         if (!isRoaming()) {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
index e25caf5..fe941bb 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
@@ -17,6 +17,7 @@ public class PeerInformation  {
     private WifiP2pDevice wifiP2pDevice;
     private Date lastUpdate;
     private boolean selected;
+    private String errorMessage = "info";
 
     // age stores how long it has been since the last signal from this peer
     // it is not stored in seconds but in update cycles
@@ -86,4 +87,12 @@ public class PeerInformation  {
     public void setSelected(boolean selected) {
         this.selected = selected;
     }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerListAdapter.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerListAdapter.java
index 69e2364..9d998f7 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerListAdapter.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerListAdapter.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ProgressBar;
 import android.widget.TableRow;
 import android.widget.TextView;
 
@@ -41,8 +42,7 @@ public class PeerListAdapter extends ArrayAdapter<PeerInformation> {
             TextView tt1 = (TextView) v.findViewById(R.id.deviceName);
             TextView tt2 = (TextView) v.findViewById(R.id.categoryId);
             TextView tt3 = (TextView) v.findViewById(R.id.description);
-            TextView tt4 = (TextView) v.findViewById(R.id.ipAddr);
-            TextView tt5 = (TextView) v.findViewById(R.id.iotaPrice);
+            TextView tt4 = (TextView) v.findViewById(R.id.iotaPrice);
 
 
             WifiP2pDevice device = p.getWifiP2pDevice();
@@ -58,22 +58,22 @@ public class PeerListAdapter extends ArrayAdapter<PeerInformation> {
 
             NegotiationOffer offer = p.getLatestNegotiationOffer();
             if (offer != null) {
-                tt5.setText(Integer.toString(offer.getIotaPerMegabyte()));
+                tt4.setText(Integer.toString(offer.getIotaPerMegabyte()) + "i");
             }
 
-            if (p.getIpAddress() != null) {
-                tt4.setText(p.getIpAddress());
+            if (!p.isSelected()) {
+                ProgressBar progress_bar = (ProgressBar) v.findViewById(R.id.progressConnection);
+                progress_bar.setVisibility(View.GONE);
             }
 
-
-            if (tt3 != null)
-                tt3.setText(String.format("%s", Integer.toString(p.getAge())));
+            if (tt3 != null) {
+                tt3.setText(p.getErrorMessage());
             }
 
-
-
+        }
 
         return v;
     }
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
index 84b05bc..85cb6c2 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
@@ -87,6 +87,20 @@ public class PeerStore {
         getOrCreatePeer(macAddress.toLowerCase()).setLatestOffer(offer);
     }
 
+    public void setErrorMessage(String macAddress, String msg) {
+        getOrCreatePeer(macAddress.toLowerCase()).setErrorMessage(msg);
+    }
+
+    public void setSelected(String macAddress, boolean selected) {
+        getOrCreatePeer(macAddress.toLowerCase()).setSelected(selected);
+    }
+
+    public void unselectAll() {
+        for (PeerInformation p: peers.values()) {
+            p.setSelected(false);
+        }
+    }
+
     public void setLatestOfferAnswer(String macAddress, NegotiationOfferAnswer answer) {
         getOrCreatePeer(macAddress.toLowerCase()).setLatestOfferAnswer(answer);
     }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
index 67c487a..067d619 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
@@ -2,6 +2,7 @@ package com.flashwifi.wifip2p.negotiation;
 
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -69,6 +70,14 @@ public class Negotiator {
         ERROR
     }
 
+    private void sendUpdateUIBroadcastWithMessage(String message, String snd_message){
+        Intent local = new Intent();
+        local.putExtra("message", message);
+        local.putExtra("snd_message", snd_message);
+        local.setAction("com.flashwifi.wifip2p.update_ui");
+        context.sendBroadcast(local);
+    }
+
     public Negotiator(boolean isConsumer, String ownMacAddress, SharedPreferences prefs, Context context) {
         this.isConsumer = isConsumer;
         gson = new GsonBuilder().create();
@@ -224,12 +233,15 @@ public class Negotiator {
         PeerStore.getInstance().setLatestOffer(otherMac, offer);
 
         // accept or deny logic
+        boolean agree = true;
+        int disagree_reason = 0;
         int iotaPerMegabyte = Integer.valueOf(prefs.getString("edit_text_buy_price", "-1"));
         if (iotaPerMegabyte < 0) {
             return error(R.string.err_buy_price_bad_setting, false);
         }
         if (offer.getIotaPerMegabyte() > iotaPerMegabyte) {
-            return error(R.string.err_price_too_high, false);
+            agree = false;
+            disagree_reason = R.string.err_price_too_high;
         }
 
         int hotspot_max_minutes = offer.getMaxMinutes();
@@ -241,21 +253,28 @@ public class Negotiator {
         }
 
         if (client_roaming_minutes < hotspot_min_minutes || client_roaming_minutes > hotspot_max_minutes) {
-            return error(R.string.err_client_minutes_not_acceptable_for_hotspot, false);
+            agree = false;
+            disagree_reason = R.string.err_client_minutes_not_acceptable_for_hotspot;
         }
 
         // SEND NegotiationAnswer
-        NegotiationOfferAnswer answer = new NegotiationOfferAnswer(true, client_roaming_minutes, ownMacAddress);
+        NegotiationOfferAnswer answer = new NegotiationOfferAnswer(agree, client_roaming_minutes, ownMacAddress);
         PeerStore.getInstance().setLatestOfferAnswer(otherMac, answer);
         String answerString = gson.toJson(answer);
         socketWrapper.sendLine(answerString);
 
+        if (!agree) {
+            return error(disagree_reason, false);
+        }
+
         // WAIT FOR PASSWORD and hostname
         consumer_state = ConsumerState.WAIT_FOR_PASSWORD;
         String finalizationString = socketWrapper.getLine();
 
         if (finalizationString == null) {
             return error(R.string.err_no_finalization_received, true);
+        } else if (answerString.equals("BYE")) {
+            return error(R.string.err_peer_quit, false);
         }
 
         NegotiationFinalization finalization = gson.fromJson(finalizationString, NegotiationFinalization.class);
@@ -301,6 +320,8 @@ public class Negotiator {
 
         if (answerString == null) {
             return error(R.string.err_no_answer_received, true);
+        } else if (answerString.equals("BYE")) {
+            return error(R.string.err_peer_quit, false);
         }
 
         // Parse the answer
@@ -378,6 +399,17 @@ public class Negotiator {
             hotspot_state = HotspotState.ERROR;
         }
         String macAdd = (restartAfterwards) ? null : this.peer_mac_address;
+        sendUpdateUIBroadcastWithMessage("error", str);
+        if (this.peer_mac_address != null) {
+            PeerStore.getInstance().setErrorMessage(this.peer_mac_address, str);
+        }
+        if (!restartAfterwards) {
+            try {
+                socketWrapper.sendLine("BYE");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         socketWrapper.close();
         return new NegotiationReturn(err_no, macAdd, restartAfterwards);
     }
diff --git a/app/src/main/res/layout/itemlistview.xml b/app/src/main/res/layout/itemlistview.xml
index 1befd94..b9167e3 100644
--- a/app/src/main/res/layout/itemlistview.xml
+++ b/app/src/main/res/layout/itemlistview.xml
@@ -62,21 +62,14 @@
                 <TextView android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:textColor="#000000"
-                    android:gravity="right"
+                    android:layout_weight="1"
                     android:id="@+id/description"
                     android:text="description"
                     android:layout_marginRight="20dp"/>
 
-                <TextView android:textColor="#000000"
-                    android:id="@+id/ipAddr"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="ipAddr"
-                    android:layout_marginRight="20dp"/>
-
                 <TextView android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="0"
                     android:textColor="#000000"
                     android:id="@+id/iotaPrice"
                     android:text="iotaPrice" />
diff --git a/app/src/main/res/values/errorCodes.xml b/app/src/main/res/values/errorCodes.xml
index fd4bd3a..863ccda 100644
--- a/app/src/main/res/values/errorCodes.xml
+++ b/app/src/main/res/values/errorCodes.xml
@@ -16,4 +16,5 @@
     <string name="err_client_minutes_out_of_bounds">Client minutes is out of bounds</string>
     <string name="err_timeout">Timeout</string>
     <string name="err_io_exception">IO Exception</string>
+    <string name="err_peer_quit">Peer quit the conversation</string>
 </resources>
\ No newline at end of file

From 001b25dae4d653e24ba4916abfddc66ea5a4ee3c Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Fri, 19 Jan 2018 22:49:48 -0500
Subject: [PATCH 08/29] App switch crash fix and Settings Listener case update

-Fixed error where unregisterReceiver would crash app if no BroadcastReceiver was registered
-Update settings UI
---
 .../com/flashwifi/wifip2p/MainActivity.java    |  9 +++++++--
 .../flashwifi/wifip2p/SettingsFragment.java    | 13 +++++++++++--
 app/src/main/res/xml/preferences.xml           | 18 +++++++++---------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index d43d39a..61e92f9 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -123,8 +123,13 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onStop() {
         super.onStop();
-        unregisterReceiver(updateUIReceiver);
-        unbindService(mConnection);
+
+        try {unregisterReceiver(updateUIReceiver);
+            unbindService(mConnection);
+        }
+        catch(IllegalArgumentException e) {
+            System.out.println(e);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index e4dfab0..08989dc 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -43,11 +43,20 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
             case "pref_key_switch_testnet":
                 Toast.makeText(getActivity(), "Testnet on/off Changed", Toast.LENGTH_SHORT).show();
                 break;
+            case "edit_text_sell_price":
+                Toast.makeText(getActivity(), "Hotspot Sell Price Changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "edit_text_sell_min_minutes":
+                Toast.makeText(getActivity(), "Hotspot Min sell duration changed", Toast.LENGTH_SHORT).show();
+                break;
+            case "edit_text_sell_max_minutes":
+                Toast.makeText(getActivity(), "Hotspot Max sell duration changed", Toast.LENGTH_SHORT).show();
+                break;
             case "edit_text_buy_price":
                 Toast.makeText(getActivity(), "Buy Price Changed", Toast.LENGTH_SHORT).show();
                 break;
-            case "edit_text_sell_price":
-                Toast.makeText(getActivity(), "Sell Price Changed", Toast.LENGTH_SHORT).show();
+            case "edit_text_client_minutes":
+                Toast.makeText(getActivity(), "Client duration duration changed", Toast.LENGTH_SHORT).show();
                 break;
         }
     }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 40eda9e..48a44ad 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -18,7 +18,7 @@
             android:divider="@null"
             android:dividerHeight="0dp"
             android:key="pref_key_reset_data_usage"
-            android:title="Reset Data Usage"/>
+            android:title="Reset data usage"/>
 
     </PreferenceCategory>
 
@@ -32,7 +32,7 @@
             android:key="pref_key_network_timeout"
             android:entries="@array/networkTimeoutPref"
             android:entryValues="@array/networkTimeoutPref"
-            android:title="Network Timeout" />
+            android:title="Network timeout" />
 
         <ListPreference
             android:key="pref_key_units"
@@ -65,23 +65,23 @@
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Sell Price" />
+            android:title="Sell price" />
 
         <EditTextPreference
             android:defaultValue="15"
-            android:key="edit_text_min_minutes"
             android:inputType="number"
+            android:key="edit_text_sell_min_minutes"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Minimum selling durance [minutes]" />
+            android:title="Minimum sell duration (minutes)" />
 
         <EditTextPreference
             android:defaultValue="100"
-            android:key="edit_text_max_minutes"
+            android:key="edit_text_sell_max_minutes"
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Maximum selling durance [minutes]" />
+            android:title="Maximum sell duration (minutes)" />
 
     </PreferenceCategory>
 
@@ -96,7 +96,7 @@
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Max Buy Price" />
+            android:title="Max buy price" />
 
         <EditTextPreference
             android:defaultValue="60"
@@ -104,7 +104,7 @@
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Client roaming durance" />
+            android:title="Client roaming duration" />
 
     </PreferenceCategory>
 

From 806407f5fdccd2a0ad499130886ff366a1412820 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Sat, 20 Jan 2018 00:26:19 -0500
Subject: [PATCH 09/29] Change password

Implemented change password via settings
---
 .../flashwifi/wifip2p/SettingsFragment.java   | 81 ++++++++++++++++++-
 1 file changed, 77 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 08989dc..98a21ae 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -1,11 +1,15 @@
 package com.flashwifi.wifip2p;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.text.InputType;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import com.pddstudio.preferences.encrypted.EncryptedPreferences;
@@ -15,6 +19,9 @@ import com.pddstudio.preferences.encrypted.EncryptedPreferences;
  */
 
 public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    String password = "";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -74,6 +81,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
                 break;
             case "pref_key_reset_password":
                 Toast.makeText(getActivity(), "Reset Password", Toast.LENGTH_SHORT).show();
+                askPassword();
                 break;
             case "pref_key_reset_wallet":
                 Toast.makeText(getActivity(), "Reset Wallet", Toast.LENGTH_SHORT).show();
@@ -82,19 +90,84 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
-    public void updatePassword(String password){
+    private void askPassword() {
+        Context context = getActivity();
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle("Enter current password");
+
+        final EditText input = new EditText(context);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        builder.setView(input);
+
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                password = input.getText().toString();
+                updatePassword();
+            }
+        });
+        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+                password = "";
+            }
+        });
+        builder.show();
+    }
+
+    public void updatePassword(){
+
+        if(password.equals("")){
+            //Blank Password
+            Toast.makeText(getActivity(), "Current password cannot be blank.", Toast.LENGTH_SHORT).show();
+            return;
+        }
 
         Context context = getActivity();
         EncryptedPreferences encryptedPreferences = new EncryptedPreferences.Builder(context).withEncryptionPassword(password).build();
         String seed = encryptedPreferences.getString(getString(R.string.encrypted_seed), null);
 
         if (seed != null && context != null) {
-            //Correct password, re-store seed with new password
-            EncryptedPreferences encryptedPreferencesUpdated = new EncryptedPreferences.Builder(context).withEncryptionPassword(password).build();
-            encryptedPreferencesUpdated.edit().putString(getString(R.string.encrypted_seed), seed).apply();
+            //Correct password, re-store seed with new input password
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle("Enter new password");
+
+            final EditText input = new EditText(context);
+            input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+            builder.setView(input);
+
+            builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    String newPassword = input.getText().toString();
+                    if(!newPassword.equals("")){
+                        EncryptedPreferences encryptedPreferencesRemove = new EncryptedPreferences.Builder(context).withEncryptionPassword(password).build();
+                        encryptedPreferencesRemove.edit().remove(getString(R.string.encrypted_seed)).apply();
+
+                        EncryptedPreferences encryptedPreferencesUpdated = new EncryptedPreferences.Builder(context).withEncryptionPassword(newPassword).build();
+                        encryptedPreferencesUpdated.edit().putString(getString(R.string.encrypted_seed), seed).apply();
+                        password = "";
+                        Toast.makeText(getActivity(), "Password changed.", Toast.LENGTH_SHORT).show();
+                    }
+                    else{
+                        password = "";
+                        Toast.makeText(getActivity(), "New password cannot be blank.", Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+            builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.cancel();
+                    password = "";
+                }
+            });
+            builder.show();
         }
         else{
             //Wrong Password
+            Toast.makeText(getActivity(), "Wrong Password. Please try again.", Toast.LENGTH_SHORT).show();
         }
     }
 

From cafae5c8e23106e5a950bccd3d35e7ba55be551d Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Sat, 20 Jan 2018 01:50:49 -0500
Subject: [PATCH 10/29] Testnet Setting

-Added testnet usage based on SharedPreference. Use code below:

SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
---
 .../WalletAddressAndBalanceChecker.java       | 34 ++++++++++--------
 .../Requests/WalletTransferRequest.java       | 35 +++++++++++--------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java
index 751c004..398b481 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
+import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
 
@@ -46,22 +47,25 @@ public class WalletAddressAndBalanceChecker extends AsyncTask<Void, Void, Void>
         type = inType;
         updateMessage = inUpdateMessage;
 
-        //Mainnet node:
-        /*
-        api = new IotaAPI.Builder()
-                .protocol("http")
-                .host("node.iotawallet.info")
-                .port("14265")
-                .build();
-        */
-
-        //Testnet node:
-        api = new IotaAPI.Builder()
-                .protocol("https")
-                .host("testnet140.tangle.works")
-                .port("443")
-                .build();
+        SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+        Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
 
+        if(testnet){
+            //Testnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("https")
+                    .host("testnet140.tangle.works")
+                    .port("443")
+                    .build();
+        }
+        else{
+            //Mainnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("http")
+                    .host("node.iotawallet.info")
+                    .port("14265")
+                    .build();
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index 3156f56..37d364b 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -1,9 +1,11 @@
 package com.flashwifi.wifip2p.iotaAPI.Requests;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
+import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
 
@@ -39,22 +41,25 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         context = inContext;
         mHandler = inMHandler;
 
-        //Mainnet node:
-        /*
-        api = new IotaAPI.Builder()
-                .protocol("http")
-                .host("node.iotawallet.info")
-                .port("14265")
-                .build();
-        */
-
-        //Testnet node:
-        api = new IotaAPI.Builder()
-                .protocol("https")
-                .host("testnet140.tangle.works")
-                .port("443")
-                .build();
+        SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+        Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
 
+        if(testnet){
+            //Testnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("https")
+                    .host("testnet140.tangle.works")
+                    .port("443")
+                    .build();
+        }
+        else{
+            //Mainnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("http")
+                    .host("node.iotawallet.info")
+                    .port("14265")
+                    .build();
+        }
     }
 
     @Override

From d326070e128a408cb413b3475ad54298b72509b9 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:46:45 +0100
Subject: [PATCH 11/29] fix #38

---
 app/src/main/ic_launcher-web.png              | Bin 0 -> 17581 bytes
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3418 -> 1536 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2206 -> 1082 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 2105 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7718 -> 3301 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 10486 -> 4757 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/src/main/ic_launcher-web.png

diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..18e7b0a0ae5c77154d179ab07de9ce241f694bbc
GIT binary patch
literal 17581
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
KONE;D_x=wfWi5~Z

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bcccec65160d92116f20ffce4fce0b5245c..7b27c104b7c7250fe7fa78c703cb04d59a5f1cf7 100644
GIT binary patch
delta 1519
zcmV<L1rYk$8h{LtBYy?QNkl<Zc-rlpdrVtZ9LFg_;^UwFL3~X19%{zK&N{am9WbNN
zjym0N>ToZOL^k(`Zi|D-a5J*$#Jb6todJm>CNQ1M$jmZmL1Zk@X<HT?L>a^gUB#BJ
zls<r;=Xa%~YjkUG@4dbEt|$5C_LTOtzYpi$d(QX#PGe%CC4X9?C0e3I*aZM2L~$aM
zgef?&BL2t6GS&cjtR&h;R6=x+=p%vY;KX;w7?fc{^1YE96Nt3q<KuuD8yge6CSuXr
z?e+v(ko?b2(vS`t9336?ib)s~0n|i7j17!A7(j7&bh%tvJ~(3NIRU-M>vTGyqoX6+
zKju&XNgNKx0e`UqBJz4X9_Z}s`~+jA11Q#Jvz1|EVg!USk%EBAF;+T&;w%=+QLzHT
z9)y65Mq>rWN*B;)Hvyn8Xah2v%^EfVk#@oD_JGUfhT-86a5$XcbdFGUkH<^>oozq{
zgP}6wfG|*-%??^!8)%Mw1NjA?!s?uSSd#iG$QG`K<bMaVVfNfCNSvNQ9kGtj<KOXh
z1-nb(*yksqu~830Lk_0EMHUeDjOON_p|I#EWGdc(8MBlyHSy`NHFNedP-bm`clT=G
zT&t1lX@UZzzt9Q0@(+V_!3&H4xskA^749hmlc}4(fZT33)YfW2wR{`gJ1v6~FoD9)
zUHSYDIDh>^Gu3-}0SLSI$!{Cr@g*A~0_FddzBCu=PX7pA?`Y%zH8trWBXbk4zy$Uv
z?9u1Xo45ruVEzlXZu=0X&B$adn7obe!=b}pO$zHwwLN{N65if*2nGjj>;l4D>#0*Z
zcu30p#TTz%{$C#JOn=5BkLJLcGcD`@vfAw4w|};mP~#LfP6sXkp|IEQey0?!UL9r@
zP-A2JD0Wr0t`}SZ`uCJmfKJ!W{3%v?q?)x`_>r<|xOnlmNnxEWKqVg^XXhG(x6I93
z4)FG_6^wFUf6ss9&HP;q&t1i`&4PsUR7M^(k7NBd-`Cd<(uZFZ6r2?4D)_zU5AFtv
zIDbi;H783DaBy;qgIdl<(qA6`p0SHIS|HuseUrjEQ={qfirUCbHE`gFz7C&n^E-B`
zujd`HKUp0aaY6Q~oxB9}>~n8Y?qtO64zqa><d3c66`+NSUWWdD3xE6|qp=H;?qALe
zKy#8*lxfF1M-hXfJ6B^05Pp8miL?B*Tz`xAS40%h-hCQ=d(t?JU$?$6B7kz%6a;Iv
zM%J{qT8AJl{WVSj;quUb7-IZg_UY>Cg?aN=asudqc`Kmv*B;@mi=C}+g<w4-x`5Ez
z32+I8wXzzluR|9Q`qzS9dZs+2tsk%gXyc~ha8_0Mvo?<&5-t_rXylvzWbUM}et*5!
z<5ITW?hsG%LT_(BERem#$OII<sLQ>7iYvPV)pE{2Wp0E62R*3fpMDWv`U?{t627mp
z@;h<n2QlFx;p!;E303?9gu?7G%)$r-&Wh~ql=mds46{I8x$-wGmah#8&Z5O@D9=gM
zDR^`}q`CJ!Ljvd$e~uy@4+)>g+<&8+B8iiZhg7`3oRc(Q-UC7pXZ?mf*T6wfDMW8a
zynuWj5~j`h(&w<wRU)|{0HH2jx(rXGzCs<j%(NE_Am7B6>#Ydk0uudR4FZV%UJZ-I
zq7f?~-*zaI$wa>g4GavZ#lE4gwY6148&FG2%UWM!EbqMGy7y39GVOLdRDV@f<zcMt
z?d|cQZtA^-=$@XQo(tF&u|WhS24O51lU}bkkQfs&){uW_pt`ym0Zmb<RH;Uz(O|V&
zsXZCku#knPmCa^@wzf8-LZMiSF%}gS#l_GmX=!P<lEYLYsambhudA!8(&=<x*VotA
zXtmlC{%UAwxaM(SJ=oW<(P-wxu?D|8#(=S4Oc<M7F260DA77BjWU|}I@ou6dqGY1^
z0$1`xEO(`(q}+iqhW#5C1X4WdO;gA*fi!xjkcBZ!#1bFFLXn6>(Go4u5-ox#{{Y1|
VwkXAZo96%k002ovPDHLkV1oF9?d|{o

literal 3418
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

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..6f545f00518e2b7f5c5b63cff5e1c7640d91ed86 100644
GIT binary patch
delta 1062
zcmV+>1ljwZ5xNMFBYy+|Nkl<Zc-rk*ZAep57_Mef3H_-*m6{fnWqxE4$dD+TRwfl>
zDP~lbxjw8Qg9s$DTu`Kzm3@cU%4($*l@N$dH(^^}&<uZMV5zjZ&Cj{b`F7rmlQFir
z-QDfpA02o&FZbT}p65CDoO{muo=KDb7Y-Ky;1L9|3?3cgQ-2T~>PXM|*gr_@*#uz(
zp)3L0p6!gATk@oyNpN#?bhO)Qwf3-yF%CD8(}W^yH%CTBDu^QxN6x@tFx(~7Cc6}1
zn=E~OeRGI_zvx726REAFW(8wyo3JwpFHK`(<6L{Ljsk+PR;$&EEf$M@On{Z`o<|O2
z0t_`ZHOuX}I)4=)l}eWo0Xi-U5R1i8o(k~k3lKjrnanUeY@&cRUh`EzWo6|G#sv%v
z41rAk70RwXfx|~cuqpKz#KmX8(#UNP7QUGR+IS7`9XWalu9rWBmX>cYIA~-?0QTye
zw+(RcP!TMN+zRtTl4${j<q0psyZ2J^l}!E@px5_8X@A*cSh*^bHfdK_y(SCFZ&ZV!
zx1V_dM&mHts(217Vs<c2+!3*HyWrmaSL0vAX903DR@bf1^_s|@y@k}!K%nidzaT{j
zDwUeP037GVqWhzv3pUc~$-;9L<HG=LI`0Sz-vpPhJhGb2X72@bbaX>Z+)mm<fe8VK
zsOTMlTz_Z{q2}f<R{RapX*h1>F4(*!p90!+zd%ES%C|Z2;9;%bC$1~pz9aE{65|Sb
zs-Ps`<d2`YOs(FG{YJNLJLwgHg43nY)uo|;wl}`1Y56cTWMp<B>+050i;cf0as28`
z=<NLKpOskksTCG2PV<|9h(%jKq4@6Kz0eEEM}L?fn!>mMd}noaU0^nI=Zo$zF2MeI
zzYD<qeb(-?j0wodJQJARs6BMLUPxTK-)8~*#C@RE>e&fsT7R^|(q-Fe3&40l-TIT=
zi0ngMGdSDu2@e;8Qu&<%+K%_p2Y0Hhhm?rYGO^by?bVVhZp6e0i)93I^DcNy{y=UK
z<$uE&0f_$oLD-NioREByAdiq4;7(S;9__#WxQ!vAW7FYh`)_WgRUFaO^ckGR5O_^0
z{lvYzkTW=oA@CX}6I-q_bM`R=+MLbIxq>Z*K%mV;ZqyqAj3jq4hCl=~xhs>&BDtDg
zud1qwb|-*3G>}LnA!f5#i%wiQ;2_+{=6_MwBNB-gBFFmr`XF~lOw-%i+MZ!D2@48g
ztJvDct+rCBd`Y;?@Z^k)$LI5-6bePHMx)W`_4;0--hg!=VQW*X)#~JO`Rjy)1ROp*
zPfsdm5JU(Bf~1_BoV4uhY*v76Zy*J^OxXL5BGS{-rx7!lU>3^=MlQ4t-f^;!u^%^;
gO}Lz}{|iUTKgsKP{XeqMqW}N^07*qoM6N<$f@!!5asU7T

delta 2195
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
VFwL6zQVak9002ovPDHLkV1mZv3FQC)

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..2b1380a03c0b6c9853f1c34a626f558c59f98da1 100644
GIT binary patch
delta 2093
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
X!u&;=&G2Dt00000NkvXXu0mjfleXaI

literal 4842
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

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..90e008bc27f338cccd71f6e6480de437b814c574 100644
GIT binary patch
delta 3298
zcmV<83?1{PJmndXBYzC6Nkl<Zc-rlq2~<_p8plN>Fnxo|oIq0p=UGa{S5MSZ(VS3o
zKut|?%qLly<0E`#Jv0-|q!;VGw5NvkObaz9G)Zv)ho^v&kcjgDD1vyw@9qET+_&y>
zV7&L7eGcEZ)_+}w3-{df|J{AQz0bGzu26x4gM)*EgM)*EgMWjAgM)*EgM)*EgM)*E
zgM*_)K}1eM6@{Exx(XgR83~$7IB5O|N#{*P)f*>S53tfh-@6Ib6KW{bfTfEXsvfu%
z=9LWaI9m@)XpB&l&^e)Oq5DF4EM0V8_28W9$rvj<R?lRDr;AV`*~Ehf4_K1OCK4?c
zi?0+ASq~sTKYu^K1{zC2K>>t#z>-1*swWnBBpxXvBV)9#5Luf-&};+GeH<K1YT>d*
zIXO9$l9JLxmz>C&$sav>)I~s(#PApoB0OHacriIBD5$cnr&_i?PPw_c<7_TlY>a^<
z!XhqX6dxZy9bTd_&~!{eJUENoXPbIWWq=GOeCYG?@_#5HAt73LSt&9y(pk&Pms3PU
z#P7s`q^bZFuqlR90eWZ2$;lVSjvZSAo@#O#v$j65v9XQB0o=twsF^;SVk{|r`?R#Q
zoUpL4Ht<xFRwz0;8u?G9n3$LrXa*S|V@jkS3P9=U>6Vo%S9XM_;o;#fS^?w|6&2MA
zJue2x*na?BxNyM|8XD>YPc;EZeGymD+_hzZ%mGkHNXVbyX>f4xQ<?#^e*OA(43Ieh
z65zbZ0I>`OkQ)PJI)L05AQl6}Vt@>#`}Zw$?_M6|<mA$wJ9jB7E1NPhvgqc`OuBaM
zmLhzOpW%0S4xWp@!QV1K<piM2tUHvPoJI#@Pk++aU;jvd5B-v+PWzCC4ttLV419}v
z_L@pve8*EKpV8E&?NDmcbO1fuptmA?ji2Fncn+S6zZpJaw(>thm#m?U-|V7T@xRZV
zyP!bE02ve@v<lhTIdt;mS^6Sk6HS@An0oY@Lf$Wopr+0J1rUDZUblxs1lXFj@TccH
z1b<L3ziIU5^pEIYUv8n(3FqkU-CVL*@);o601_vHE?>Dp`}fDw^04(Za`Zf<wQv+9
zrB(aqhtt?`!SvbcjY=zc<3<Jpq!&Pd2A8BQTlUiU2_cF(_3HPM4w@&oRDRT<(@5p=
zw`0cvrNv}`v}kEAU#HERqiMp#h194?e}BUOQ<QMon-R2xcJ4f=B<&24ofQ|Cpqyaj
zF&_1Lng*PQRrlGR)UnejnlpDLB_^dZKxOJRW!_d=8~;Hw9h&&cdztI4<a4`r$2z1}
zXIg-+UcE^xR&JoK-2zSB+LWYK^6T@a(woDFiUE3paP9wi*;h&riotnQI43W39Dk_{
zP1pk@(*T6g-G6+siF`W0&Y%=iUAqTTWaJLY&AnHC0m5}Xa^p_w(q+8TOfwiI6NW7?
zSczeP(tu=GfY2R3bm+g-Z$J=(V5b}@VANbXefpgF0m4nm`3qJ_JBFj&_i8q<P~kZ;
z9((hagJ|i;Ym41uGZa9$KlR<_J%7~s#W7NUnlY+f)QQJ)WPT5?^qfq4_8eAPdQ$+D
zo_>`kPFf`GC)aEMLC<-;O7G1MqwCi*j0+H2ov5w*scrjVhRG+)0+3Z`@o|&+aa90P
z1BC1Fy!oF}L(f+Ym5`bZAgFQE{<LK2nn!wSQUZkQ?vW#>soTpF4cVhHBY!|v4fLO>
z++VZiMp6QVvV^|<XBf6iY-WI<K7FVEzn3QMCG6PoBx==W2m>UUP>mV$^KoP3K<Kg?
zq1RPj0K%yC+OMLFlSCuyN1?fqssth2_5Suhy9*VbW3-X#1;MK+FYmswy78F$g7F`|
z-Jq{fQ}npeX+sPoqHr7|qkn9qK6<IkIHe5O&?C_ai784cDjTY;TDN_T;^Gs{aW8E5
zo<oLAs*QYy9y3-<bvHgd{F`!F+pI^A3nR~_E9byaI%Za|$&MAKJYg2BDeHmo#`<$1
znZtxR`<QTP>Wai)eo0dnDPY6xt9IVQl{xt3q9*#l!4pb#pKK<e%zqX&#)V17Qe3ab
z{gjSMxhkq(v-St+l4>K~%0Q26wdkOfyIC0+TK{YCYN=*q7!4rI6?^C1Pn5;3%H_N;
z46$QI0RvPzVcK_blV;OSEWC8-8vVJ;8w^khg^8HIp1;I1Q<c>>;uDpjcLu2V%fX-{
z!c&_csUh-XfQpecuYX&=jpxQcEYuKT2wu+`BG~}~JRu7|x64|Krd-|yBh`8uBs)Op
zaNNF~&C9zKwOWT>HAFH4ghePYHJsN6Du%F70EXrnpx=Z^3h~Dhd4;l)2=lu!MYp^I
z)Zn>3v~}BlUgEAa`gB#Krb)GI03m5EPHhhZ^aNpu{_S^`X@9ololF4XJ!7SNOio~c
z%9vDZRYN2bKz_ZaDI2`-GQW0EN=mvWYbeSB5cb+gI>YNk+f|sB>*yLH834j+8hfG-
z^GfxO5T@rkGO5-ZASBILv9_qy#TcM6Y~>XEez?PGi1Y*qNi$Xzdw2>m17v4mC?6ZW
znGGQS!Ecwkwtt5KD#dmP7}_@rKv;?nby2+ClZHBa^fa|-HQ4X~*`v0H0V<`w|6w21
zZ`j+g0Aac}mW<&Y3v~hry_F9?`lsEJYApdm(u~?3EqYuGP$9xl|D?%_3<uB~<KNe1
zt4jvxF}igti(c+A*)Rb4cAZe@BH#>=4#KovY`$9-V}G$97dFBzOn6RNUZZWhp>*QJ
zS>E<r#(m?lJ)~!&zS7QL$HME|w#V?k@v;Jhgml$sky7qIhGY6<`8wT_W(KGPHAI;1
zE7P`_IF`T62rbnVWClnFVNX$+R?NrJz)19EI!6pp5jubVvK0HUVjuXF)O3>V{4hYp
z5Vkr(eSeK!@L*@g=)Ffs#&g2}6;tasY}aMVG+q;HAjx`O7@!i=5MiHIEt6`z*6cYe
zG^_1lfE+BWLp193`I-SVB4Cc)rXVvwlIZf48_LrET5L0^b!`s=q><v{5*)e?QOnkY
z>G0uGWQ23U0F}0e==;46NviQbH+{E<jB*|rAb&|}h^)6MK3E(f&20(>NP`-p$x}YC
z8$f}R{#LB*1sEWc0A$_EtotjI$_!7}?t!}3_Ao#?3EN<oWiK<-A7MW<BffVA$WFrc
z1*p?0&AL6?fBcz@`o0+;J1YG1Z%Z^~8qY1w_5uu$NdZEgPS9IRiw%%$wLJ`w3^hbq
zcYl<v1B!xYp#Myz-pJ_hmjQCbIz*}IO8w50;OWq5q?ENi43I>Mi8-cBH+~qNrp^87
zr=Q};Ebo&6a-gu4fNfHZum8Pn8=2`nGC&&D5JC7FKVyIxpc1V^gc_oeqvuIq+rt1!
zsw-D-C^F-FV}Mu;5Q_m~fEb|C0kmPmhJW?~9t#6xe1JkiLSE7gAn_uV@L~}W5p4uK
zcNrjK1C)}Ik~3@8tj_Q>Ffh=?;Q$R8GQ=4#)~{bb_q@EkG!>u%HpOr%fOp4_AHU?|
z<KqQSeSLi^RnQ<RiWjUb9;;_&W=7*61kL$uh_NJm%g@ctrM-Li9u{6cqk39V6Muk4
zjT%)203AGdaF)fQjL<Sb#=3kd0Hvj+kw`@r!%J~xsj3w~PF`MKuHvy;-MV!fi6rb-
z6(S3pV;FcWBK@F!`}SR|Q>RWdc-f#q12=f92|z+F-rnBNh{t*>R;-wG{``6ClopGT
zrnZz<c#u5D$H&ux1q*`Uq3WfJmVW>t*{bT{;ZavSHWtm`qNJoG%E`%5nnnmo8Zv#B
z{!$ZW#g}{c?onJ^94%Y6EEL|kySvwem#U|l08~M}R-(zPUbALRPx07d;lhPMF)=Y0
zMYoW$v$FvbamW)$m{U_zY1gh@m*&o$`z}0Fy{oQzS+RnK;iNWsAh&k)>VMUnipN&s
zfPBKj!j^B{y7kzB0|&02I&~^HIXOB1%$YM5mi9V(_H2GaLPD<S>|BkCiaI7*oiO1M
z#(Y|-p4C=8bkVZ)v2BHrO#e~HLrun7y12Ns6>9J4>Dg`2ph2$%1O$u_89qw~4I4IW
zgulQ4(E9c3cN3m?!y9;{dVl4idgrQj>tovrIjhYd4#eHn)zzz3ty(RsRH@QheBWAy
ziKVmP1w4T_@CaV1p1G+WI#tjqY$5u+Pz@m@)(yphHmO>*YO`w9s<mY4CwL&dXbewO
zZ)&Js=?>4s5aCAL)9S$?F{`OwW9z7LXK5<yd9ST{0Z;y*di0bm@LSkIWCh7Zy{=YP
z54MV`sw_=qJ?~GeUbw2>INSIoU04sSqAF*W6temuEjUF1#nM+C92^`R92^`R92^`R
g92^`R9A%3C0na&3W!Uy{i2wiq07*qoM6N<$f&rR6*#H0l

literal 7718
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

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index aee44e138434630332d88b1680f33c4b24c70ab3..baa128cfa7ff9b0c5c4cb18b14f7c0f7b85ee8d5 100644
GIT binary patch
literal 4757
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
Ormn1`^zo5R`2PU@$;0>n

literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg


From 68e4a0fe34771083cfd98a94e9581daef449ad78 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:54:34 +0100
Subject: [PATCH 12/29] fix #37

---
 .../com/flashwifi/wifip2p/HomeActivity.java   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java b/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
index 41c9868..bb98373 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/HomeActivity.java
@@ -15,6 +15,7 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -210,7 +211,10 @@ public class HomeActivity extends AppCompatActivity {
         } else {
             final EditText field = (EditText) findViewById(R.id.password);
             field.setText("");
-            Snackbar.make(view, getString(R.string.wrong_password), Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            Toast toast= Toast.makeText(getApplicationContext(),
+                    getString(R.string.wrong_password), Toast.LENGTH_SHORT);
+            toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 0);
+            toast.show();
         }
     }
 
@@ -250,9 +254,17 @@ public class HomeActivity extends AppCompatActivity {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
-                setProgressBar(50);
-                String password = new_password_field.getText().toString();
-                storeNewSeed(seed, password);
+                if (new_password_field.getText().toString().length() > 0) {
+                    setProgressBar(50);
+                    String password = new_password_field.getText().toString();
+                    storeNewSeed(seed, password);
+                } else {
+                    Toast toast= Toast.makeText(getApplicationContext(),
+                            "No blank password allowed", Toast.LENGTH_SHORT);
+                    toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 0);
+                    toast.show();
+                }
+
             }
         });
     }

From f7a834dff8ae615d0d72bd45138c9a4784bd66b2 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:55:12 +0100
Subject: [PATCH 13/29] fix #39

---
 app/src/main/res/menu/activity_main_drawer.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index a25a16f..6e21ea1 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -12,10 +12,10 @@
             android:id="@+id/nav_start"
             android:icon="@drawable/icon_tethering_on"
             android:title="@string/menuStartHotspot" />
-        <item
+<!--        <item
             android:id="@+id/nav_itp"
             android:icon="@drawable/ic_highlight_black"
-            android:title="@string/initialTrustPayment" />
+            android:title="@string/initialTrustPayment" />-->
 
     </group>
 
@@ -32,12 +32,12 @@
         </menu>
     </item>
 
-    <item android:title="Communicate">
+    <item android:title="Conditions">
         <menu>
-            <item
+<!--            <item
                 android:id="@+id/nav_conditions"
                 android:icon="@drawable/ic_compare_arrows"
-                android:title="@string/navConditions" />
+                android:title="@string/navConditions" />-->
             <item
                 android:id="@+id/nav_settings"
                 android:icon="@drawable/ic_menu_manage"

From 05f31939cd0772fbebb205896649cbd7523c913c Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:55:31 +0100
Subject: [PATCH 14/29] fix #36

---
 app/src/main/res/layout/fragment_hotspot.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/layout/fragment_hotspot.xml b/app/src/main/res/layout/fragment_hotspot.xml
index a976d8e..9d3d59a 100644
--- a/app/src/main/res/layout/fragment_hotspot.xml
+++ b/app/src/main/res/layout/fragment_hotspot.xml
@@ -9,6 +9,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:paddingTop="25dp"
             android:text="@string/hotspotIntroduction"
             android:textSize="20sp" />
 
@@ -25,6 +26,7 @@
             style="?android:attr/progressBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingTop="25dp"
             android:visibility="invisible" />
 
         <TextView
@@ -32,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:visibility="invisible"
             android:text="0 peers"
             android:textSize="30sp" />
 

From d3ab75e3a57cd81390e2bc4db87fe7fff8c6edcc Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:55:53 +0100
Subject: [PATCH 15/29] fix #34

---
 .../main/java/com/flashwifi/wifip2p/RoamingActivity.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index 00b8a44..b6da95d 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -135,6 +135,12 @@ public class RoamingActivity extends AppCompatActivity {
 
     }
 
+    private void stopRoamingBroadcast() {
+        Intent local = new Intent();
+        local.setAction("com.flashwifi.wifip2p.stop_roaming");
+        this.sendBroadcast(local);
+    }
+
     private void showRetransferCard() {
         CardView cardView = (CardView) findViewById(R.id.card_view_tangle_attachment);
         cardView.setVisibility(View.VISIBLE);
@@ -341,6 +347,7 @@ public class RoamingActivity extends AppCompatActivity {
         TextView stopText = (TextView) findViewById(R.id.stopText);
         stopText.setVisibility(View.VISIBLE);
 
+        stopRoamingBroadcast();
 
         Toast.makeText(getApplicationContext(), "Press BACK now", Toast.LENGTH_LONG).show();
     }

From 033210340ffffd47c797ca13e0fc3844a1a563e9 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sat, 20 Jan 2018 16:56:47 +0100
Subject: [PATCH 16/29] first steps for second connection

---
 .../flashwifi/wifip2p/HotspotFragment.java    | 48 +++++++++++-
 .../com/flashwifi/wifip2p/MainActivity.java   | 73 +++++++++++++++----
 .../com/flashwifi/wifip2p/SearchFragment.java | 49 +++++++++++--
 .../wifip2p/billing/BillingServer.java        |  1 +
 .../broadcast/WiFiDirectBroadcastService.java | 43 ++++++++---
 .../wifip2p/negotiation/Negotiator.java       |  8 +-
 app/src/main/res/layout/content_main.xml      |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 8 files changed, 189 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
index cbfe89f..0e5ad17 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
@@ -19,6 +19,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
@@ -74,6 +75,7 @@ public class HotspotFragment extends Fragment {
         Log.d(TAG, "updateUi: Got some network data into the hotspot fragment");
         String numberAvailableDevices = Integer.toString(mService.getArrayList().size());
         TextView text = (TextView) getActivity().findViewById(R.id.numberPeers);
+        text.setVisibility(View.VISIBLE);
         text.setText(String.format("%s peers", numberAvailableDevices));
         final View activity_view = getActivity().findViewById(R.id.drawer_layout);
 
@@ -118,15 +120,41 @@ public class HotspotFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        initFragment();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        initFragment();
+    }
+
+    private void initFragment(){
         IntentFilter filter = new IntentFilter();
         filter.addAction("com.flashwifi.wifip2p.update_ui");
+        filter.addAction("com.flashwifi.wifip2p.start_roaming");
+        filter.addAction("com.flashwifi.wifip2p.stop_roaming");
 
         updateUIReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                updateUi(intent);
+                if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
+                    String mac = intent.getStringExtra("peer_mac_address");
+                    ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startAPButton);
+                    toggle.setChecked(false);
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.INVISIBLE);
+                } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
+                    ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startAPButton);
+                    toggle.setChecked(false);
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.INVISIBLE);
+                } else {
+                    updateUi(intent);
+                }
             }
         };
+
         getActivity().registerReceiver(updateUIReceiver, filter);
 
         // Bind to Service
@@ -182,11 +210,16 @@ public class HotspotFragment extends Fragment {
             mService.getPeerList(new WifiP2pManager.ActionListener() {
                 @Override
                 public void onSuccess() {
+                    // show progress wheel
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.VISIBLE);
                 }
 
                 @Override
                 public void onFailure(int reasonCode) {
                     Snackbar.make(activity_view, "Aaaargh :( Searching problem!", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.INVISIBLE);
                 }
             });
         }
@@ -202,6 +235,8 @@ public class HotspotFragment extends Fragment {
                     mService.setInRoleConsumer(false);
                     mService.setInRoleHotspot(false);
                     Snackbar.make(activity_view, "Stopped Hotspot mode", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.INVISIBLE);
                 }
 
                 @Override
@@ -209,6 +244,8 @@ public class HotspotFragment extends Fragment {
                     mService.setInRoleConsumer(false);
                     mService.setInRoleHotspot(false);
                     Snackbar.make(activity_view, "Aaaargh :( Problem stopping discovery", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                    ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
+                    progressBar.setVisibility(View.INVISIBLE);
                 }
             });
         }
@@ -222,6 +259,13 @@ public class HotspotFragment extends Fragment {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if (mBound) {
+                    if (!mService.isSetup()) {
+                        Snackbar.make(activity_view, "Please enable WiFi P2P", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                        button.setChecked(false);
+                        return;
+                    }
+                }
                 if (button.isChecked()) {
                     startDiscovery();
                     Snackbar.make(activity_view, "Start Discovery Mode", Snackbar.LENGTH_LONG).setAction("Action", null).show();
@@ -244,8 +288,6 @@ public class HotspotFragment extends Fragment {
             mService = binder.getService();
             mBound = true;
 
-            final ToggleButton button = (ToggleButton) getActivity().findViewById(R.id.startAPButton);
-            button.setChecked(mService.isInRoleHotspot());
         }
 
         @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 61e92f9..822a22f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.net.wifi.p2p.WifiP2pManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -19,6 +20,7 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -59,7 +61,6 @@ public class MainActivity extends AppCompatActivity
                     ProgressBar progressConnection = (ProgressBar) findViewById(R.id.progressConnection);
                     progressConnection.setVisibility(View.VISIBLE);
                 } catch (Exception e) {
-                    e.printStackTrace();
                 }
                 if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
                     startRoamingView(intent.getStringExtra("peer_mac_address"),
@@ -71,6 +72,35 @@ public class MainActivity extends AppCompatActivity
         registerReceiver(updateUIReceiver, filter);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        //unbindWifiBroadcast();
+        unsubscribeFromBroadcast();
+    }
+
+    private void unbindWifiBroadcast() {
+        try {unregisterReceiver(updateUIReceiver);
+            unbindService(mConnection);
+        }
+        catch(IllegalArgumentException e) {
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initEverything();
+    }
+
+    private void unsubscribeFromBroadcast() {
+        try {
+            unregisterReceiver(updateUIReceiver);
+            updateUIReceiver = null;
+        } catch (Exception e){
+        }
+    }
+
     private void initUi() {
         final Switch switch_ = (Switch) findViewById(R.id.wifiSwitch);
         switch_.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
@@ -92,10 +122,16 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.activity_main);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        // get the secrets from the login screen
+        Intent intent = getIntent();
+        password = intent.getStringExtra("password");
+        seed = intent.getStringExtra("seed");
+
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -105,17 +141,13 @@ public class MainActivity extends AppCompatActivity
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
 
-        // get the secrets from the login screen
-        Intent intent = getIntent();
-        password = intent.getStringExtra("password");
-        seed = intent.getStringExtra("seed");
-
-        // Bind to Service
-        Intent intent2 = new Intent(this, WiFiDirectBroadcastService.class);
-        bindService(intent2, mConnection, Context.BIND_AUTO_CREATE);
-
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
+        Intent intent2 = new Intent(this, WiFiDirectBroadcastService.class);
+        bindService(intent2, mConnection, Context.BIND_AUTO_CREATE);
+    }
+
+    private void initEverything() {
         subscribeToBroadcasts();
         initUi();
     }
@@ -165,13 +197,13 @@ public class MainActivity extends AppCompatActivity
             startSearchFragment();
         } else if (id == R.id.nav_start) {
             startHotspotFragment();
-        } else if (id == R.id.nav_itp) {
-
+//        } else if (id == R.id.nav_itp) {
+//
         } else if (id == R.id.nav_fund) {
             startFundWalletFragment();
         } else if (id == R.id.nav_withdraw) {
             startWithdrawWalletFragment();
-        } else if (id == R.id.nav_conditions) {
+//        } else if (id == R.id.nav_conditions) {
 
         } else if (id == R.id.nav_settings) {
             startSettingsFragment();
@@ -221,6 +253,21 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void startRoamingView(String macAddress, String ssid, String key){
+        // disable WiFi P2P
+        if (mBound) {
+            mService.stopDiscovery(new WifiP2pManager.ActionListener() {
+                @Override
+                public void onSuccess() {
+                    Log.d("MainAct", "discovery stopped");
+                }
+
+                @Override
+                public void onFailure(int i) {
+                    Log.d("MainAct", "discovery could not be stopped");
+                }
+            });
+        }
+
         Intent intent = new Intent(this, RoamingActivity.class);
         intent.putExtra("address", macAddress);
         intent.putExtra("key", key);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index 131a2ca..85f3964 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -152,6 +152,19 @@ public class SearchFragment extends Fragment {
         }
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mBound) {
+            getActivity().unbindService(mConnection);
+            mBound = false;
+        }
+        if (updateUIReceiver != null) {
+            getActivity().unregisterReceiver(updateUIReceiver);
+            updateUIReceiver = null;
+        }
+    }
+
     @Override
     public void onStop() {
         super.onStop();
@@ -169,14 +182,36 @@ public class SearchFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+       initFragment();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        initFragment();
+    }
+
+    private void initFragment() {
         IntentFilter filter = new IntentFilter();
         filter.addAction("com.flashwifi.wifip2p.update_ui");
+        filter.addAction("com.flashwifi.wifip2p.start_roaming");
+        filter.addAction("com.flashwifi.wifip2p.stop_roaming");
 
         updateUIReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 Log.d("", "onReceive: FRAGMENT HAT WAS");
-                updateUi(intent);
+                if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
+                    String mac = intent.getStringExtra("peer_mac_address");
+                    ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
+                    toggle.setChecked(false);
+                } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
+                    peerListAdapter.clear();
+                    ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
+                    toggle.setChecked(false);
+                } else {
+                    updateUi(intent);
+                }
             }
         };
         getActivity().registerReceiver(updateUIReceiver, filter);
@@ -195,10 +230,17 @@ public class SearchFragment extends Fragment {
         toolbar.setTitle("Discover Peers");
 
         final ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
-        //toggle.setChecked(mService.isInRoleConsumer());
+
         toggle.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
+                if (mBound) {
+                    if (!mService.isSetup()) {
+                        Snackbar.make(view, "Please enable WiFi P2P", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                        toggle.setChecked(false);
+                        return;
+                    }
+                }
                 updateList();
                 if (toggle.isChecked()) {
                     if (mBound) {
@@ -314,9 +356,6 @@ public class SearchFragment extends Fragment {
             WiFiDirectBroadcastService.LocalBinder binder = (WiFiDirectBroadcastService.LocalBinder) service;
             mService = binder.getService();
             mBound = true;
-
-            final ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
-            toggle.setChecked(mService.isInRoleConsumer());
         }
 
         @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index 8c5a1d0..a0afdfb 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -192,6 +192,7 @@ public class BillingServer {
                     boolean attached = false;
                     while (!attached) {
                         Log.d(TAG, "start: Attach to tangle please");
+                        Thread.sleep(5000);
                     }
                     state = State.FULLY_ATTACHED;
                 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index 8039d26..ca77d3f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -77,6 +77,11 @@ public class WiFiDirectBroadcastService extends Service {
     AccessPointTask apTask;
     boolean apRuns = false;
     ConnectTask connectTask;
+    private boolean negotiatorRunning = false;
+
+    public boolean isSetup() {
+        return setup;
+    }
 
     public void enableWiFi() {
         WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
@@ -146,7 +151,8 @@ public class WiFiDirectBroadcastService extends Service {
             };
             Thread thread = new Thread(task);
             threads.add(thread);
-            AsyncTask.execute(thread);
+            thread.start();
+            //AsyncTask.execute(thread);
         }
     }
 
@@ -268,14 +274,18 @@ public class WiFiDirectBroadcastService extends Service {
                 } else if (peer_mac_address != null) {
                     PeerStore.getInstance().unselectAll();
                 }
+                negotiatorRunning = false;
             }
 
 
         };
-        if (!isRoaming()) {
+        if (!isRoaming() && !negotiatorRunning) {
+            negotiatorRunning = true;
             Thread thread = new Thread(task);
             threads.add(thread);
-            AsyncTask.execute(thread);
+            //AsyncTask.execute(thread);
+            stopAllTasks();
+            thread.start();
             //stopDiscovery(null);
         } else {
             Log.d(TAG, "startNegServer: BLOCKED due to roaming state");
@@ -304,7 +314,7 @@ public class WiFiDirectBroadcastService extends Service {
                 String peer_mac_address = null;
                 boolean restartAfterwards = true;
                 Negotiator.NegotiationReturn negotiationReturn = null;
-                while (!isRoaming && enabled && peer_mac_address == null && restartAfterwards) {
+                while (!isRoaming && enabled && peer_mac_address == null && restartAfterwards && negotiatorRunning) {
                     Log.d(TAG, "run: " + enabled);
                     System.out.println(" *******+ work as client *******");
                     negotiationReturn = negotiator.workAsClient(address.getHostAddress());
@@ -330,14 +340,19 @@ public class WiFiDirectBroadcastService extends Service {
                     String ssid = negFin.getHotspotName();
                     String key = negFin.getHotspotPassword();
                     sendStartRoamingBroadcast(peer_mac_address, ssid, key);
+                } else {
+                    Log.d(TAG, "run: could not start roaming");
                 }
                 PeerStore.getInstance().unselectAll();
+                negotiatorRunning = false;
             }
         };
-        if (!isRoaming()) {
+        if (!isRoaming() && !negotiatorRunning) {
+            negotiatorRunning = true;
             Thread thread = new Thread(task);
             threads.add(thread);
-            AsyncTask.execute(thread);
+            stopAllTasks();
+            thread.start();
         } else {
             Log.d(TAG, "startNegotiationClient: BLOCKED due to roaming state");
         }
@@ -424,8 +439,10 @@ public class WiFiDirectBroadcastService extends Service {
     }
 
     public void startDiscoveryMode(WifiP2pManager.ActionListener action_listener) {
-        mManager.discoverPeers(mChannel, action_listener);
-        discoveryModeActive = true;
+        if (setup) {
+            mManager.discoverPeers(mChannel, action_listener);
+            discoveryModeActive = true;
+        }
     }
 
     public boolean isInRoleHotspot() {
@@ -449,12 +466,16 @@ public class WiFiDirectBroadcastService extends Service {
     }
 
     public void setRoaming(boolean roaming) {
-        if (roaming) {
+        if (!roaming) {
             stopAllTasks();
         }
         isRoaming = roaming;
     }
 
+    public void freezeWiFiP2P() {
+
+    }
+
 
     /**
      * Class used for the client Binder.  Because we know this service always
@@ -493,7 +514,9 @@ public class WiFiDirectBroadcastService extends Service {
     }
 
     public void getPeerList(WifiP2pManager.ActionListener action_listener) {
-        mManager.discoverPeers(mChannel, action_listener);
+        if (setup) {
+            mManager.discoverPeers(mChannel, action_listener);
+        }
     }
 
     public void stopDiscovery(WifiP2pManager.ActionListener action_listener) {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
index 067d619..c506c4b 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
@@ -167,7 +167,7 @@ public class Negotiator {
             // WAIT FOR CLIENT
             String hello = socketWrapper.getLine();
 
-            if (hello == null) {
+            if (hello == null || hello.contains("java.net.SocketException")) {
                 return error(R.string.no_hello_received, true);
             }
 
@@ -221,7 +221,7 @@ public class Negotiator {
 
         // RECEIVE OFFER
         String offerString = socketWrapper.getLine();
-        if (offerString == null) {
+        if (offerString == null || offerString.contains("java.net.SocketException")) {
             return error(R.string.err_no_offer_received, true);
         }
 
@@ -271,7 +271,7 @@ public class Negotiator {
         consumer_state = ConsumerState.WAIT_FOR_PASSWORD;
         String finalizationString = socketWrapper.getLine();
 
-        if (finalizationString == null) {
+        if (finalizationString == null || finalizationString.contains("java.net.SocketException")) {
             return error(R.string.err_no_finalization_received, true);
         } else if (answerString.equals("BYE")) {
             return error(R.string.err_peer_quit, false);
@@ -318,7 +318,7 @@ public class Negotiator {
         hotspot_state = HotspotState.WAIT_FOR_ANSWER;
         String answerString = socketWrapper.getLine();
 
-        if (answerString == null) {
+        if (answerString == null || answerString.contains("java.net.SocketException")) {
             return error(R.string.err_no_answer_received, true);
         } else if (answerString.equals("BYE")) {
             return error(R.string.err_peer_quit, false);
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 5f183d4..0df6bba 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -12,6 +12,7 @@
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
     </FrameLayout>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2fa5a37..151b23a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,5 +66,6 @@
     <string name="roaming_title_client">Roaming (You are consuming)</string>
     <string name="channelClosed">The payment channel was closed.</string>
     <string name="initRetransfer">Initializing retransfer</string>
+    <string name="welcome">Welcome to the Wifi Iota Hotspot App</string>
 
 </resources>
\ No newline at end of file

From 1da893f1dbc3a89e3b0dd378f14203fbcd7a3b30 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Sun, 21 Jan 2018 01:14:01 -0500
Subject: [PATCH 17/29] Testnet token generation

-Added automatic token 2000i on testnet and automatic transfer to wallet
---
 app/build.gradle                              |   1 +
 .../flashwifi/wifip2p/FundWalletFragment.java |  14 +-
 .../com/flashwifi/wifip2p/MainActivity.java   |   3 +
 .../flashwifi/wifip2p/SettingsFragment.java   |  98 +++++++++---
 .../wifip2p/WithdrawWalletFragment.java       |  16 +-
 .../Requests/Model/TokenGenJSONResponse.java  |  48 ++++++
 .../Requests/WalletAddressChecker.java        | 116 ++++++++++++++
 ...Checker.java => WalletBalanceChecker.java} |  82 +---------
 .../Requests/WalletTestnetTokenGen.java       | 147 ++++++++++++++++++
 .../Requests/WalletTransferRequest.java       |  23 ++-
 10 files changed, 423 insertions(+), 125 deletions(-)
 create mode 100644 app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/Model/TokenGenJSONResponse.java
 create mode 100644 app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
 rename app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/{WalletAddressAndBalanceChecker.java => WalletBalanceChecker.java} (59%)
 create mode 100644 app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java

diff --git a/app/build.gradle b/app/build.gradle
index 3913c71..8288297 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,5 +48,6 @@ dependencies {
     compile 'com.github.kenglxn.QRGen:android:2.4.0'
     compile 'me.dm7.barcodescanner:zxing:1.9.8'
     compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.10'
+    compile 'com.google.api-client:google-api-client:1.23.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java b/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
index b7d76f0..e45b83a 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
@@ -15,7 +15,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.flashwifi.wifip2p.iotaAPI.Requests.WalletAddressAndBalanceChecker;
+import com.flashwifi.wifip2p.iotaAPI.Requests.WalletBalanceChecker;
 
 import net.glxn.qrgen.android.QRCode;
 
@@ -45,7 +45,7 @@ public class FundWalletFragment extends Fragment {
     private Handler mHandler;
 
     private static Boolean transactionInProgress = false;
-    private WalletAddressAndBalanceChecker addressAndBalanceChecker;
+    private WalletBalanceChecker addressAndBalanceChecker;
 
     public FundWalletFragment() {
         // Required empty public constructor
@@ -84,19 +84,19 @@ public class FundWalletFragment extends Fragment {
                         hideLoadingGIF();
                         transactionInProgress = false;
 
-                        if(returnStatus == "noError"){
+                        if(returnStatus.equals("noError")){
                             balanceTextView.setText(balance + " i");
                             addressTextView.setText(depositAddress);
                             createAddressQRCode(depositAddress);
                             makeToastFundWalletFragment("Balance and address updated");
                         }
-                        else if (returnStatus == "hostError"){
+                        else if (returnStatus.equals("hostError")){
                             makeToastFundWalletFragment("Unable to reach host (node)");
                         }
-                        else if (returnStatus == "addressError"){
+                        else if (returnStatus.equals("addressError")){
                             makeToastFundWalletFragment("Error getting address");
                         }
-                        else if (returnStatus == "balanceError"){
+                        else if (returnStatus.equals("balanceError")){
                             makeToastFundWalletFragment("Error getting balance. May not be able to resolve host/node");
                         }
                         else{
@@ -191,7 +191,7 @@ public class FundWalletFragment extends Fragment {
 
     private void getBalance(){
         transactionInProgress = true;
-        addressAndBalanceChecker = new WalletAddressAndBalanceChecker(getActivity(),getActivity().getString(R.string.preference_file_key),seed, mHandler,FUND_WALLET,true);
+        addressAndBalanceChecker = new WalletBalanceChecker(getActivity(),getActivity().getString(R.string.preference_file_key),seed, mHandler,FUND_WALLET,true);
         addressAndBalanceChecker.execute();
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 822a22f..e0dc137 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -324,6 +324,9 @@ public class MainActivity extends AppCompatActivity
 
     private void startSettingsFragment() {
         Fragment fragment = new SettingsFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("seed", seed);
+        fragment.setArguments(bundle);
         fragment.setRetainInstance(true);
 
         // Insert the fragment by replacing any existing fragment
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 98a21ae..b294d3f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -5,27 +5,40 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.text.InputType;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.flashwifi.wifip2p.iotaAPI.Requests.WalletTestnetTokenGen;
 import com.pddstudio.preferences.encrypted.EncryptedPreferences;
 
-/**
- * Created by Toby on 1/16/2018.
- */
-
 public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    String password = "";
+    private String password = "";
+    private String seed = "";
+
+    private static final int TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE = 0;
+    private static final int TOKEN_TESTNET_STATUS_UPDATE = 1;
+
+    private Handler mHandler;
+    private Preference testnetFundAddPref;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        Bundle bundle = this.getArguments();
+        if (bundle != null) {
+            seed = bundle.getString("seed");
+        }
+
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
@@ -33,37 +46,60 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         getPreferenceScreen().getSharedPreferences()
                 .registerOnSharedPreferenceChangeListener(this);
 
+        //Handle post-asynctask activities of updating UI
+        mHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message inputMessage) {
+                String result = (String) inputMessage.obj;
+                switch (inputMessage.what) {
+                    case TOKEN_TESTNET_STATUS_UPDATE:
+                        if(result.equals("Sending")){
+                            testnetFundAddPref.setSummary("Sending...");
+                        }
+                        break;
+                    case TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE:
+                        if(result.equals("Sent")){
+                            makeToastSettingsFragment("2000i generated and added to testnet wallet. Check balance.");
+                        }
+                        else{
+                            makeToastSettingsFragment(result);
+                        }
+                        testnetFundAddPref.setSummary("");
+                        break;
+                }
+            }
+        };
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         switch(key){
             case "pref_key_security":
-                Toast.makeText(getActivity(), "Security Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Security Changed");
                 break;
             case "pref_key_network_timeout":
-                Toast.makeText(getActivity(), "Network Timeout Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Network Timeout Changed");
                 break;
             case "pref_key_units":
-                Toast.makeText(getActivity(), "Units Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Units Changed");
                 break;
             case "pref_key_switch_testnet":
-                Toast.makeText(getActivity(), "Testnet on/off Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Testnet on/off Changed");
                 break;
             case "edit_text_sell_price":
-                Toast.makeText(getActivity(), "Hotspot Sell Price Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Hotspot Sell Price Changed");
                 break;
             case "edit_text_sell_min_minutes":
-                Toast.makeText(getActivity(), "Hotspot Min sell duration changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Hotspot Min sell duration changed");
                 break;
             case "edit_text_sell_max_minutes":
-                Toast.makeText(getActivity(), "Hotspot Max sell duration changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Hotspot Max sell duration changed");
                 break;
             case "edit_text_buy_price":
-                Toast.makeText(getActivity(), "Buy Price Changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Buy Price Changed");
                 break;
             case "edit_text_client_minutes":
-                Toast.makeText(getActivity(), "Client duration duration changed", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Client duration duration changed");
                 break;
         }
     }
@@ -74,17 +110,29 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 
         switch (key) {
             case "pref_key_reset_data_usage":
-                Toast.makeText(getActivity(), "Reset Data Usage", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment( "Reset Data Usage");
                 break;
             case "pref_key_testnet_fund_add":
-                Toast.makeText(getActivity(), "Testnet fund add", Toast.LENGTH_SHORT).show();
+                SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getActivity());
+                Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+
+                if(testnet){
+                    testnetFundAddPref = preference;
+                    testnetFundAddPref.setSummary("Generating...");
+                    makeToastSettingsFragment("Testnet wallet token generation request sent.");
+                    WalletTestnetTokenGen tokenGen = new WalletTestnetTokenGen(mHandler, getActivity(), getString(R.string.preference_file_key), seed);
+                    tokenGen.execute();
+                }
+                else{
+                    makeToastSettingsFragment("Please enable testnet first.");
+                }
                 break;
             case "pref_key_reset_password":
-                Toast.makeText(getActivity(), "Reset Password", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment( "Reset Password");
                 askPassword();
                 break;
             case "pref_key_reset_wallet":
-                Toast.makeText(getActivity(), "Reset Wallet", Toast.LENGTH_SHORT).show();
+                makeToastSettingsFragment("Reset Wallet.");
                 break;
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -120,7 +168,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 
         if(password.equals("")){
             //Blank Password
-            Toast.makeText(getActivity(), "Current password cannot be blank.", Toast.LENGTH_SHORT).show();
+            makeToastSettingsFragment("Current password cannot be blank.");
             return;
         }
 
@@ -148,11 +196,11 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
                         EncryptedPreferences encryptedPreferencesUpdated = new EncryptedPreferences.Builder(context).withEncryptionPassword(newPassword).build();
                         encryptedPreferencesUpdated.edit().putString(getString(R.string.encrypted_seed), seed).apply();
                         password = "";
-                        Toast.makeText(getActivity(), "Password changed.", Toast.LENGTH_SHORT).show();
+                        makeToastSettingsFragment("Password changed.");
                     }
                     else{
                         password = "";
-                        Toast.makeText(getActivity(), "New password cannot be blank.", Toast.LENGTH_SHORT).show();
+                        makeToastSettingsFragment("New password cannot be blank.");
                     }
                 }
             });
@@ -167,7 +215,13 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         }
         else{
             //Wrong Password
-            Toast.makeText(getActivity(), "Wrong Password. Please try again.", Toast.LENGTH_SHORT).show();
+            makeToastSettingsFragment("Wrong Password. Please try again.");
+        }
+    }
+
+    private void makeToastSettingsFragment(String s) {
+        if(getActivity() != null){
+            Toast.makeText(getActivity(), s, Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java b/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
index bd4a511..9fe3da6 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
@@ -20,7 +20,7 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.flashwifi.wifip2p.iotaAPI.Requests.WalletAddressAndBalanceChecker;
+import com.flashwifi.wifip2p.iotaAPI.Requests.WalletBalanceChecker;
 import com.flashwifi.wifip2p.iotaAPI.Requests.WalletTransferRequest;
 
 import jota.error.ArgumentException;
@@ -47,7 +47,7 @@ public class WithdrawWalletFragment extends Fragment {
     private EditText editTextAmount;
     private EditText editTextMessage;
     private EditText editTextTag;
-    private WalletAddressAndBalanceChecker addressAndBalanceChecker;
+    private WalletBalanceChecker addressAndBalanceChecker;
 
     private GifImageView loadingGifImageView;
     private SwipeRefreshLayout mSwipeRefreshLayout;
@@ -94,22 +94,22 @@ public class WithdrawWalletFragment extends Fragment {
                         hideLoadingGIF();
                         transactionInProgress = false;
 
-                        if(returnStatus == "noError"){
+                        if(returnStatus.equals("noError")){
                             balanceTextView.setText(appWalletBalance + " i");
                             makeToastFundWalletFragment("Balance updated");
                         }
-                        else if (returnStatus == "noErrorNoUpdateMessage"){
+                        else if (returnStatus.equals("noErrorNoUpdateMessage")){
                             balanceTextView.setText(appWalletBalance + " i");
                             clearAllTransferValues();
                             makeFieldsEditable();
                         }
-                        else if (returnStatus == "hostError"){
+                        else if (returnStatus.equals("hostError")){
                             makeToastFundWalletFragment("Unable to reach host (node)");
                         }
-                        else if (returnStatus == "addressError"){
+                        else if (returnStatus.equals("addressError")){
                             makeToastFundWalletFragment("Error getting address");
                         }
-                        else if (returnStatus == "balanceError"){
+                        else if (returnStatus.equals("balanceError")){
                             makeToastFundWalletFragment("Error getting balance");
                         }
                         else{
@@ -198,7 +198,7 @@ public class WithdrawWalletFragment extends Fragment {
 
     private void getBalance(Boolean updateMessage) {
         transactionInProgress = true;
-        addressAndBalanceChecker = new WalletAddressAndBalanceChecker(getActivity(),getActivity().getString(R.string.preference_file_key),appWalletSeed, mHandler,WITHDRAW_WALLET,updateMessage);
+        addressAndBalanceChecker = new WalletBalanceChecker(getActivity(),getActivity().getString(R.string.preference_file_key),appWalletSeed, mHandler,WITHDRAW_WALLET,updateMessage);
         addressAndBalanceChecker.execute();
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/Model/TokenGenJSONResponse.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/Model/TokenGenJSONResponse.java
new file mode 100644
index 0000000..069e11f
--- /dev/null
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/Model/TokenGenJSONResponse.java
@@ -0,0 +1,48 @@
+package com.flashwifi.wifip2p.iotaAPI.Requests.Model;
+
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.util.Key;
+
+public class TokenGenJSONResponse extends GenericJson {
+
+    @Key("seed")
+    private String seed;
+    @Key("address")
+    private String address;
+    @Key("amount")
+    private Integer amount;
+
+    private String success;
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getSeed() {
+        return seed;
+    }
+
+    public void setSeed(String seed) {
+        this.seed = seed;
+    }
+
+    public String getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(String success) {
+        this.success = success;
+    }
+}
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
new file mode 100644
index 0000000..023c012
--- /dev/null
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -0,0 +1,116 @@
+package com.flashwifi.wifip2p.iotaAPI.Requests;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jota.IotaAPI;
+import jota.dto.response.GetNewAddressResponse;
+import jota.error.ArgumentException;
+import jota.model.Transaction;
+
+public class WalletAddressChecker {
+
+    private static IotaAPI api;
+    private Context context;
+    private String prefFile;
+
+    public WalletAddressChecker(Context inContext, String inPrefFile){
+
+        context = inContext;
+        prefFile = inPrefFile;
+
+        SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+        Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+
+        if(testnet){
+            //Testnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("https")
+                    .host("testnet140.tangle.works")
+                    .port("443")
+                    .build();
+        }
+        else{
+            //Mainnet node:
+            api = new IotaAPI.Builder()
+                    .protocol("http")
+                    .host("node.iotawallet.info")
+                    .port("14265")
+                    .build();
+        }
+    }
+
+    public List<String> getAddress(String seed) {
+
+        Boolean foundAddress = false;
+        List<String> addressList = new ArrayList<>();
+        int keyIndex = getKeyIndex();
+
+        while(foundAddress == false){
+
+            GetNewAddressResponse addressResponse = null;
+            try {
+                addressResponse = api.getNewAddress(seed, 2, keyIndex, false, 1, false);
+            } catch (ArgumentException e) {
+                e.printStackTrace();
+            }
+
+            if(addressResponse != null) {
+                addressList.add(addressResponse.getAddresses().get(0));
+
+                String[] addressesCheckArray = new String[1];
+                addressesCheckArray[0] = addressResponse.getAddresses().get(0);
+
+                List<Transaction> transactionsForAddress = null;
+                try {
+                    transactionsForAddress = api.findTransactionObjectsByAddresses(addressesCheckArray);
+                } catch (ArgumentException | IllegalStateException | IllegalAccessError e) {
+                    e.printStackTrace();
+                    if(e.getMessage().contains("Unable to resolve host")){
+                        List<String> errorStringList = new ArrayList<>();
+                        errorStringList.add("Unable to resolve host");
+                        return errorStringList;
+                    }
+                }
+
+                if(transactionsForAddress.isEmpty() || (transactionsForAddress.size() == 0 || transactionsForAddress.equals(null))){
+                    //Transactions not found, use this address
+                    foundAddress = true;
+                }
+                else{
+                    //Found transactions, increment for new address
+                    keyIndex = keyIndex + 1;
+                }
+            }
+        }
+
+        if(keyIndex == 0){
+            //Put the initial address to search. No transactions for the seed yet.
+            putKeyIndex(keyIndex);
+        }
+        else{
+            //Put the second last address to search
+            putKeyIndex(keyIndex-1);
+        }
+        return addressList;
+    }
+
+    private int getKeyIndex() {
+        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
+        int keyIndex = sharedPref.getInt("keyIndex",0);
+        return keyIndex;
+    }
+
+    private void putKeyIndex(int inKeyIndex) {
+        SharedPreferences sharedPref = context.getSharedPreferences(
+                prefFile, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putInt("keyIndex", inKeyIndex);
+        editor.apply();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
similarity index 59%
rename from app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java
rename to app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index 398b481..f0dece5 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressAndBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -13,16 +13,13 @@ import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import jota.IotaAPI;
 import jota.dto.response.GetBalancesResponse;
-import jota.dto.response.GetNewAddressResponse;
 import jota.error.ArgumentException;
-import jota.model.Transaction;
 
-public class WalletAddressAndBalanceChecker extends AsyncTask<Void, Void, Void> {
+public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
     private static final int BALANCE_RETRIEVE_TASK_COMPLETE = 1;
 
@@ -39,7 +36,7 @@ public class WalletAddressAndBalanceChecker extends AsyncTask<Void, Void, Void>
 
     //GetNodeInfoResponse response = api.getNodeInfo();
 
-    public WalletAddressAndBalanceChecker(Context inActivity, String inPrefFile, String inSeed, Handler inMHandler, int inType, Boolean inUpdateMessage) {
+    public WalletBalanceChecker(Context inActivity, String inPrefFile, String inSeed, Handler inMHandler, int inType, Boolean inUpdateMessage) {
         context = inActivity;
         prefFile = inPrefFile;
         seed = inSeed;
@@ -71,9 +68,11 @@ public class WalletAddressAndBalanceChecker extends AsyncTask<Void, Void, Void>
     @Override
     protected Void doInBackground(Void... voids) {
         if(context != null){
-            List<String> addressList = getAddress(seed);
 
-            if(addressList != null && addressList.get(0) == "Unable to resolve host"){
+            WalletAddressChecker addressChecker = new WalletAddressChecker(context,prefFile);
+            List<String> addressList = addressChecker.getAddress(seed);
+
+            if(addressList != null && addressList.get(0).equals("Unable to resolve host")){
                 AddressBalanceTransfer addressBalanceTransfer = new AddressBalanceTransfer(null,null,"hostError");
                 Message completeMessage = mHandler.obtainMessage(BALANCE_RETRIEVE_TASK_COMPLETE, addressBalanceTransfer);
                 completeMessage.sendToTarget();
@@ -131,73 +130,4 @@ public class WalletAddressAndBalanceChecker extends AsyncTask<Void, Void, Void>
 
     }
 
-    public List<String> getAddress(String seed) {
-
-        Boolean foundAddress = false;
-        List<String> addressList = new ArrayList<>();
-        int keyIndex = getKeyIndex();
-
-        while(foundAddress == false){
-
-            GetNewAddressResponse addressResponse = null;
-            try {
-                addressResponse = api.getNewAddress(seed, 2, keyIndex, false, 1, false);
-            } catch (ArgumentException e) {
-                e.printStackTrace();
-            }
-
-            if(addressResponse != null) {
-                addressList.add(addressResponse.getAddresses().get(0));
-
-                String[] addressesCheckArray = new String[1];
-                addressesCheckArray[0] = addressResponse.getAddresses().get(0);
-
-                List<Transaction> transactionsForAddress = null;
-                try {
-                    transactionsForAddress = api.findTransactionObjectsByAddresses(addressesCheckArray);
-                } catch (ArgumentException | IllegalStateException | IllegalAccessError e) {
-                    e.printStackTrace();
-                    if(e.getMessage().contains("Unable to resolve host")){
-                        List<String> errorStringList = new ArrayList<>();
-                        errorStringList.add("Unable to resolve host");
-                        return errorStringList;
-                    }
-                }
-
-                if(transactionsForAddress.isEmpty() || (transactionsForAddress.size() == 0 || transactionsForAddress.equals(null))){
-                    //Transactions not found, use this address
-                    foundAddress = true;
-                }
-                else{
-                    //Found transactions, increment for new address
-                    keyIndex = keyIndex + 1;
-                }
-            }
-        }
-
-        if(keyIndex == 0){
-            //Put the initial address to search. No transactions for the seed yet.
-            putKeyIndex(keyIndex);
-        }
-        else{
-            //Put the second last address to search
-            putKeyIndex(keyIndex-1);
-        }
-        return addressList;
-    }
-
-    private int getKeyIndex() {
-        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
-        int keyIndex = sharedPref.getInt("keyIndex",0);
-        return keyIndex;
-    }
-
-    private void putKeyIndex(int inKeyIndex) {
-        SharedPreferences sharedPref = context.getSharedPreferences(
-                prefFile, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putInt("keyIndex", inKeyIndex);
-        editor.apply();
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
new file mode 100644
index 0000000..8d88ede
--- /dev/null
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
@@ -0,0 +1,147 @@
+package com.flashwifi.wifip2p.iotaAPI.Requests;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.preference.Preference;
+
+import com.flashwifi.wifip2p.AddressBalanceTransfer;
+import com.flashwifi.wifip2p.iotaAPI.Requests.Model.TokenGenJSONResponse;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonObjectParser;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
+
+    private static final int TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE = 0;
+    private static final int TOKEN_TESTNET_STATUS_UPDATE = 1;
+    private static final int TRANSFER_TASK_COMPLETE = 2;
+    private static String seed;
+    private Handler settingsFragmentHandler;
+    private Handler testnetTokenGenHandler;
+    private String prefFile;
+    static HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
+    static JsonFactory JSON_FACTORY = new JacksonFactory();
+    private static Context context;
+
+    public WalletTestnetTokenGen(Handler inMHandler, Context inContext, String inPrefFile, String inSeed){
+        settingsFragmentHandler = inMHandler;
+        context = inContext;
+        prefFile = inPrefFile;
+        seed = inSeed;
+
+        //Handle post-asynctask activities of updating UI
+        testnetTokenGenHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message inputMessage) {
+                switch (inputMessage.what) {
+                    case TRANSFER_TASK_COMPLETE:
+                        AddressBalanceTransfer addressBalanceTransfer = (AddressBalanceTransfer) inputMessage.obj;
+                        String message = addressBalanceTransfer.getMessage();
+                        //Send completion of send funds to settings fragment
+                        Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE,message);
+                        completeMessage.sendToTarget();
+                }
+            }
+        };
+    }
+
+    public TokenGenJSONResponse genToken() {
+
+        HttpRequestFactory requestFactory
+                = HTTP_TRANSPORT.createRequestFactory(
+                (HttpRequest request) -> {
+                    request.setParser(new JsonObjectParser(JSON_FACTORY));
+                });
+        HttpRequest request = null;
+        try {
+            request = requestFactory.buildGetRequest(new GenericUrl("https://hackseeds.tangle.works"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        //TODO: Set timeout
+        /*
+        ExponentialBackOff backoff = new ExponentialBackOff.Builder()
+                .setInitialIntervalMillis(500)
+                .setMaxElapsedTimeMillis(900000)
+                .setMaxIntervalMillis(6000)
+                .setMultiplier(1.5)
+                .setRandomizationFactor(0.5)
+                .build();
+        request.setUnsuccessfulResponseHandler(
+                new HttpBackOffUnsuccessfulResponseHandler(backoff));
+        */
+
+        Type type = new TypeToken<TokenGenJSONResponse>() {}.getType();
+        TokenGenJSONResponse token = new TokenGenJSONResponse();
+        try{
+            token = (TokenGenJSONResponse) request
+                    .execute()
+                    .parseAs(type);
+            token.setSuccess("Success");
+        }
+        catch (Exception e){
+            if(e.toString().contains("Connection closed by peer")){
+                //Could not reach token gen page
+                token.setSuccess("Connection Error");
+                e.printStackTrace();
+            }
+            else{
+                //Unknown error
+                token.setSuccess("Unknown Error");
+                e.printStackTrace();
+            }
+        }
+        return token;
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        TokenGenJSONResponse token = genToken();
+        if(token.getSuccess().equals("Success")){
+            WalletAddressChecker addressChecker = new WalletAddressChecker(context,prefFile);
+            List<String> destAddressses = addressChecker.getAddress(seed);
+            transferToWallet(destAddressses, token);
+        }
+        else{
+            Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE,token.getSuccess());
+            completeMessage.sendToTarget();
+        }
+        return null;
+    }
+
+    private void transferToWallet(List<String> destAddressses, TokenGenJSONResponse token) {
+
+        if(destAddressses != null && destAddressses.get(0).equals("Unable to resolve host")){
+            //Host Error
+            Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE, "hostError");
+            completeMessage.sendToTarget();
+        }
+        else if(destAddressses != null){
+            //No Address Retrieval Error
+            Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_STATUS_UPDATE, "Sending");
+            completeMessage.sendToTarget();
+            String destAddress = destAddressses.get(destAddressses.size()-1);
+            WalletTransferRequest transferRequest = new WalletTransferRequest(destAddress,token.getSeed(),token.getAmount().toString(),"","",context,testnetTokenGenHandler);
+            transferRequest.execute();
+        }
+        else{
+            //Address Retrieval Error
+            Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE,"addressError");
+            completeMessage.sendToTarget();
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index 37d364b..7a54223 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -23,6 +23,7 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
 
     private static IotaAPI api;
     private static Context context;
+    Boolean testnet;
     private String appWalletSeed;
     private String sendAddress;
     private String sendAmount;
@@ -42,9 +43,10 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         mHandler = inMHandler;
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
-        Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+        testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
 
         if(testnet){
+
             //Testnet node:
             api = new IotaAPI.Builder()
                     .protocol("https")
@@ -64,8 +66,6 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... voids) {
-        sendRequest();
-
         String result = null;
 
         if(context != null){
@@ -88,25 +88,26 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         SendTransferResponse sendTransferResponse = null;
 
         try {
-                //Mainnet
-                //sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 18, transfers, null, null, false);
-
+            if(testnet) {
                 //Testnet
                 sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 9, transfers, null, null, false);
-
+            }
+            else{
+                //Mainnet
+                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 18, transfers, null, null, false);
+            }
         } catch (ArgumentException | IllegalAccessError | IllegalStateException e) {
             if (e instanceof ArgumentException) {
                 if (e.getMessage().contains("Sending to a used address.") || e.getMessage().contains("Private key reuse detect!") || e.getMessage().contains("Send to inputs!")) {
                     transferResult = "Sending to a used address/Private key reuse detect. Error Occurred.";
                 }
-                else if(e.getMessage().contains("Failed to connect to")){
-                    transferResult = "Failed to connect to";
+                else if(e.getMessage().contains("Failed to connect to node")){
+                    transferResult = "Failed to connect to node";
                 }
                 else{
                     transferResult = "Network Error: Attaching new address failed or Transaction failed";
                 }
             }
-
             if (e instanceof IllegalAccessError) {
                 transferResult = "Local POW needs to be enabled";
             }
@@ -121,14 +122,12 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
                     break;
                 }
             }
-
             if(success){
                 transferResult = "Sent";
             }
             else{
                 transferResult = "Transfer not successful, check transfer status via Tangle explorer";
             }
-
         }
         else{
             transferResult = "Transfer error: Send Response not received";

From a86e3f1fbf77c6d2b7330b2a3e172fa334747bc8 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Sun, 21 Jan 2018 16:00:02 +0100
Subject: [PATCH 18/29] update permissions

---
 app/src/main/java/com/flashwifi/wifip2p/MainActivity.java   | 6 +++---
 app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 822a22f..c9b5723 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -218,10 +218,9 @@ public class MainActivity extends AppCompatActivity
         // check whether all necessary settings were set by the user
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         String[] intVariables = new String[]{
-                "edit_text_min_minutes",
+                "edit_text_sell_min_minutes",
                 "edit_text_sell_price",
-                "edit_text_min_minutes",
-                "edit_text_max_minutes",
+                "edit_text_sell_max_minutes",
                 "edit_text_buy_price",
                 "edit_text_client_minutes"
         };
@@ -229,6 +228,7 @@ public class MainActivity extends AppCompatActivity
         for (String variable: intVariables) {
             val = prefs.getString(variable, null);
             if (val == null) {
+                Log.d("Variable not set: ", "settingsAreReady: " + variable);
                 return false;
             }
         }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index 85f3964..5bcf6f7 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -303,7 +303,7 @@ public class SearchFragment extends Fragment {
                 Toast.makeText(view.getContext(), "Connected to peer", Toast.LENGTH_SHORT).show();
                 // start the protocol
                 startNegotiationProtocol(address);
-                busy = false;
+                busy = true;
             }
             @Override
             public void onFailure(int reason) {

From 73742ee41c6c1caa5ece5ebd013ca482f99a9221 Mon Sep 17 00:00:00 2001
From: Toby <tobywoerthle@users.noreply.github.com>
Date: Sun, 21 Jan 2018 23:04:29 -0500
Subject: [PATCH 19/29] Updated README to point to Github Pages site

https://tobywoerthle.github.io/flashWiFiSite/
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c1aef8f..3b94018 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 ## What is this?
 
+[WiFiota](https://tobywoerthle.github.io/flashWiFiSite/)
 
 ## ToDos
 

From db2228fec0c686d5c189188ff92a651902f669a9 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Sun, 21 Jan 2018 23:50:38 -0500
Subject: [PATCH 20/29] Balance Debug

---
 .idea/modules.xml                             |  2 +-
 .../flashwifi/wifip2p/SettingsFragment.java   | 11 +++-
 .../Requests/WalletAddressChecker.java        |  1 +
 .../Requests/WalletBalanceChecker.java        | 60 +++++++++++++++----
 .../Requests/WalletTestnetTokenGen.java       | 10 +++-
 .../Requests/WalletTransferRequest.java       |  6 +-
 6 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index f1ca5bd..cfa4b9a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/WifiP2P.iml" filepath="$PROJECT_DIR$/WifiP2P.iml" />
+      <module fileurl="file://C:\Users\Toby\Documents\Android Studio Projects\flashwifi\WifiP2P.iml" filepath="C:\Users\Toby\Documents\Android Studio Projects\flashwifi\WifiP2P.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/flashwifi.iml" filepath="$PROJECT_DIR$/flashwifi.iml" />
     </modules>
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index b294d3f..43eec8a 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -60,17 +60,26 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
                     case TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE:
                         if(result.equals("Sent")){
                             makeToastSettingsFragment("2000i generated and added to testnet wallet. Check balance.");
+                            testnetFundAddPref.setSummary("2000i added");
                         }
                         else{
                             makeToastSettingsFragment(result);
+                            testnetFundAddPref.setSummary(result);
                         }
-                        testnetFundAddPref.setSummary("");
                         break;
                 }
             }
         };
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if(testnetFundAddPref != null){
+            testnetFundAddPref.setSummary("");
+        }
+    }
+
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         switch(key){
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
index 023c012..85779a2 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -60,6 +60,7 @@ public class WalletAddressChecker {
             }
 
             if(addressResponse != null) {
+                System.out.println("WalletAddressChecker - Address: "+addressResponse.getAddresses().get(0));
                 addressList.add(addressResponse.getAddresses().get(0));
 
                 String[] addressesCheckArray = new String[1];
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index f0dece5..5fc0bd1 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -1,9 +1,5 @@
 package com.flashwifi.wifip2p.iotaAPI.Requests;
 
-/**
- * Created by Toby on 1/6/2018.
- */
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
@@ -16,8 +12,10 @@ import com.flashwifi.wifip2p.AddressBalanceTransfer;
 import java.util.List;
 
 import jota.IotaAPI;
+import jota.dto.response.GetBalancesAndFormatResponse;
 import jota.dto.response.GetBalancesResponse;
 import jota.error.ArgumentException;
+import jota.utils.StopWatch;
 
 public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
@@ -34,8 +32,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
     private int type;
     private Boolean updateMessage;
 
-    //GetNodeInfoResponse response = api.getNodeInfo();
-
     public WalletBalanceChecker(Context inActivity, String inPrefFile, String inSeed, Handler inMHandler, int inType, Boolean inUpdateMessage) {
         context = inActivity;
         prefFile = inPrefFile;
@@ -112,22 +108,64 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
     }
 
     public String getBalance(List<String> inAddresses){
-        String[] balanceArray;
+        String updatedBalanceString;
         try {
+            StopWatch stopWatch = new StopWatch();
+            GetBalancesAndFormatResponse balanceResponse = api.getBalanceAndFormat(inAddresses, 0, 0, stopWatch, 2);
+            long total = balanceResponse.getTotalBalance();
+            System.out.println("GetBalance Total: "+total);
+
             GetBalancesResponse balanceResultResponse = api.getBalances(100, inAddresses);
-            balanceArray = balanceResultResponse.getBalances();
+            String[] balanceArray = balanceResultResponse.getBalances();
+
+            System.out.println("balanceArrayLength: "+balanceArray.length);
+
+            for (String s : balanceArray) {
+                System.out.println("balanceArrayEntry: "+s);
+            }
+
+            if(balanceArray.length < 2){
+                System.out.println("updatedBalanceString: "+balanceArray[0]);
+                updatedBalanceString = balanceArray[0];
+                putSharedPrefBalance(updatedBalanceString);
+            }
+            else{
+                long storedBalance = Long.parseLong(getSharedPreKeyBalance());
+                System.out.println("getSharedPreKeyBalance: "+getSharedPreKeyBalance());
+                long updatedBalance = storedBalance + Long.parseLong(balanceArray[0]);
+                updatedBalanceString = Long.toString(updatedBalance);
+                System.out.println("updatedBalance: "+updatedBalanceString);
+                putSharedPrefBalance(updatedBalanceString);
+            }
         } catch (ArgumentException | IllegalStateException e) {
             e.printStackTrace();
             return null;
         }
+        return updatedBalanceString;
+    }
 
-        if(balanceArray.length>1){
-            return balanceArray[balanceArray.length-2];
+    private String getSharedPreKeyBalance() {
+        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
+        int keyIndex = sharedPref.getInt("keyIndex",0);
+
+        System.out.println("KeyIndex: "+keyIndex);
+
+        String defaultValue = "0";
+        if(keyIndex > 2){
+            String storedBalance = sharedPref.getString("balance",defaultValue);
+            return storedBalance;
         }
         else{
-            return balanceArray[balanceArray.length-1];
+            return defaultValue;
         }
+    }
 
+    private void putSharedPrefBalance(String inBalance) {
+        SharedPreferences sharedPref = context.getSharedPreferences(
+                prefFile, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putString("balance", inBalance);
+        editor.apply();
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
index 8d88ede..d45f918 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
@@ -5,7 +5,6 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.preference.Preference;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
 import com.flashwifi.wifip2p.iotaAPI.Requests.Model.TokenGenJSONResponse;
@@ -99,6 +98,11 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
                 token.setSuccess("Connection Error");
                 e.printStackTrace();
             }
+            else if(e.toString().contains("Unable to resolve host")){
+                //Could not reach token gen page
+                token.setSuccess("Unable to resolve host. Please try again.");
+                e.printStackTrace();
+            }
             else{
                 //Unknown error
                 token.setSuccess("Unknown Error");
@@ -135,6 +139,10 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
             Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_STATUS_UPDATE, "Sending");
             completeMessage.sendToTarget();
             String destAddress = destAddressses.get(destAddressses.size()-1);
+
+            System.out.println("DestAddress: "+destAddress);
+            System.out.println("TokenAmt: "+token.getAmount().toString());
+
             WalletTransferRequest transferRequest = new WalletTransferRequest(destAddress,token.getSeed(),token.getAmount().toString(),"","",context,testnetTokenGenHandler);
             transferRequest.execute();
         }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index 7a54223..94910bc 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -90,11 +90,12 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         try {
             if(testnet) {
                 //Testnet
-                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 9, transfers, null, null, false);
+                System.out.println("WalletTransferRequest: Testnet");
+                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 13, transfers, null, null, false);
             }
             else{
                 //Mainnet
-                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 18, transfers, null, null, false);
+                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 14, transfers, null, null, false);
             }
         } catch (ArgumentException | IllegalAccessError | IllegalStateException e) {
             if (e instanceof ArgumentException) {
@@ -132,6 +133,7 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         else{
             transferResult = "Transfer error: Send Response not received";
         }
+        System.out.println("WalletTransferRequest - result: "+transferResult);
         return transferResult;
     }
 }

From 42276ec3fec9299d8853ca4eeffb47e43c44adca Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Mon, 22 Jan 2018 13:26:24 +0100
Subject: [PATCH 21/29] fix #47

---
 .../com/flashwifi/wifip2p/MainActivity.java   |  5 +++
 .../flashwifi/wifip2p/RoamingActivity.java    |  7 ++++
 .../com/flashwifi/wifip2p/SearchFragment.java |  3 +-
 .../flashwifi/wifip2p/billing/Accountant.java | 39 ++++++++++++-------
 .../wifip2p/billing/BillingServer.java        | 11 ++++++
 .../broadcast/WiFiDirectBroadcastService.java |  9 +++++
 .../wifip2p/datastore/PeerStore.java          |  1 +
 7 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index fc86c4a..b654f1e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -36,6 +36,7 @@ public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener
 {
 
+    private static final String TAG = "MainAct";
     private String password;
     private String seed;
 
@@ -52,6 +53,7 @@ public class MainActivity extends AppCompatActivity
     private void subscribeToBroadcasts() {
         IntentFilter filter = new IntentFilter();
         filter.addAction("com.flashwifi.wifip2p.start_roaming");
+        filter.addAction("com.flashwifi.wifip2p.stop_roaming");
 
         updateUIReceiver = new BroadcastReceiver() {
             @Override
@@ -66,6 +68,9 @@ public class MainActivity extends AppCompatActivity
                     startRoamingView(intent.getStringExtra("peer_mac_address"),
                             intent.getStringExtra("ssid"),
                             intent.getStringExtra("key"));
+                } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
+                    Log.d(TAG, "onReceive: Reset billing state");
+                    mService.resetBillingState();
                 }
             }
         };
diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index b6da95d..527e1e4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -100,6 +100,7 @@ public class RoamingActivity extends AppCompatActivity {
                 CheckBox flashEstablished = (CheckBox)findViewById(R.id.flashEstablished);
                 if (message.equals("AP SUCCESS")) {
                     apConnected.setChecked(true);
+                    mService.resetBillingState();
                     // when the AP is setup we can start the server
                     startBillingProtocol();
                 } else if (message.equals("AP FAILED")) {
@@ -124,6 +125,7 @@ public class RoamingActivity extends AppCompatActivity {
                     Toast.makeText(getApplicationContext(), "Can't connect", Toast.LENGTH_LONG).show();
                     exitRoaming();
                 }
+                // ToDo: add a critical error that uses exitRoaming()
             }
 
         }
@@ -208,6 +210,8 @@ public class RoamingActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_roaming);
 
+        Accountant.getInstance().reset();
+
         // Get the Intent that started this activity and extract the string
         Intent intent = getIntent();
         name = intent.getStringExtra("name");
@@ -330,6 +334,7 @@ public class RoamingActivity extends AppCompatActivity {
     }
 
     private void exitRoaming() {
+        Accountant.getInstance().setCloseAfterwards(true);
         endRoamingFlag = true;
         cancelNotification();
         if (mService.isInRoleHotspot()){
@@ -350,6 +355,8 @@ public class RoamingActivity extends AppCompatActivity {
         stopRoamingBroadcast();
 
         Toast.makeText(getApplicationContext(), "Press BACK now", Toast.LENGTH_LONG).show();
+        initiatedEnd = false;
+        //finish();
     }
 
     @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index 5bcf6f7..83fde43 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -206,7 +206,8 @@ public class SearchFragment extends Fragment {
                     ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
                     toggle.setChecked(false);
                 } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
-                    peerListAdapter.clear();
+                    PeerStore.getInstance().clear();
+                    busy = false;
                     ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startSearchButton);
                     toggle.setChecked(false);
                 } else {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
index e796d91..dd0adf4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
@@ -31,21 +31,19 @@ public class Accountant {
     }
 
     public void start(int bookedMegabytes, int timeoutMinutes, int bookedMinutes, int totalIotaDeposit, int iotaPerMegaByte){
-        if (closed) {
-            bills = new ArrayList<Bill>();
-            this.bookedMegabytes = bookedMegabytes;
-            this.timeoutMinutes = timeoutMinutes;
-            this.totalIotaDeposit = totalIotaDeposit;
-            this.iotaPerMegaByte = iotaPerMegaByte;
-            totalBytes = 0;
-            totalIotaPrice = 0;
-            totalDurance = 0;
-            flashChannelHelper = new FlashChannelHelper();
-            closeAfterwards = false;
-            startTime = System.currentTimeMillis() / 1000L;
-            this.bookedMinutes = bookedMinutes;
-            closed = false;
-        }
+        bills = new ArrayList<Bill>();
+        this.bookedMegabytes = bookedMegabytes;
+        this.timeoutMinutes = timeoutMinutes;
+        this.totalIotaDeposit = totalIotaDeposit;
+        this.iotaPerMegaByte = iotaPerMegaByte;
+        totalBytes = 0;
+        totalIotaPrice = 0;
+        totalDurance = 0;
+        flashChannelHelper = new FlashChannelHelper();
+        closeAfterwards = false;
+        startTime = System.currentTimeMillis() / 1000L;
+        this.bookedMinutes = bookedMinutes;
+        closed = false;
     }
 
     public long getLastTime() {
@@ -56,6 +54,17 @@ public class Accountant {
         }
     }
 
+    public void reset() {
+        this.bookedMegabytes = 0;
+        this.timeoutMinutes = 0;
+        this.totalIotaDeposit = 0;
+        this.iotaPerMegaByte = 0;
+        totalBytes = 0;
+        totalIotaPrice = 0;
+        totalDurance = 0;
+        bookedMinutes = 0;
+    }
+
     public boolean isCloseAfterwards() {
         return closeAfterwards;
     }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index a0afdfb..fa4b8fb 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -200,6 +200,17 @@ public class BillingServer {
                 e.printStackTrace();
             } catch (InterruptedException e) {
                 e.printStackTrace();
+            } finally {
+                try {
+                    socketWrapper.close();
+                } catch (IOException e) {
+
+                }
+                try {
+                    serverSocket.close();
+                } catch (IOException e) {
+
+                }
             }
         }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index ca77d3f..171fb51 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -101,6 +101,11 @@ public class WiFiDirectBroadcastService extends Service {
         }
     }
 
+    public void resetBillingState() {
+        billingClientIsRunning = false;
+        billingServerIsRunning = false;
+    }
+
     public void startBillingServer(){
         if (!billingServerIsRunning) {
             billingServerIsRunning = true;
@@ -127,6 +132,8 @@ public class WiFiDirectBroadcastService extends Service {
             //AsyncTask.execute(thread);
             threads.add(thread);
             thread.start();
+        } else {
+            Log.d(TAG, "startBillingServer: blocked");
         }
     }
 
@@ -153,6 +160,8 @@ public class WiFiDirectBroadcastService extends Service {
             threads.add(thread);
             thread.start();
             //AsyncTask.execute(thread);
+        } else {
+            Log.d(TAG, "startBillingClient: blocked");
         }
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
index 85cb6c2..9b4bd46 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
@@ -119,4 +119,5 @@ public class PeerStore {
     public void setIPAddress(String macAddress, InetAddress IPAddress) {
         getOrCreatePeer(macAddress.toLowerCase()).setIPAddress(IPAddress.getHostAddress());
     }
+
 }

From bd623711f7b32a8f5a5847c3c22a49cb6fc87c2b Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Tue, 23 Jan 2018 00:25:58 +0100
Subject: [PATCH 22/29] fix #20

---
 .../com/flashwifi/wifip2p/MainActivity.java   |   5 +
 .../flashwifi/wifip2p/RoamingActivity.java    |  11 +-
 .../flashwifi/wifip2p/billing/Accountant.java |   9 +
 .../wifip2p/billing/BillingClient.java        |  34 ++-
 .../wifip2p/billing/BillingServer.java        |  52 ++++-
 .../broadcast/WiFiDirectBroadcastService.java | 198 +++++++++++++++++-
 .../wifip2p/datastore/PeerInformation.java    |  43 ++++
 .../wifip2p/datastore/PeerStore.java          |  42 ++++
 .../wifip2p/negotiation/Negotiator.java       |   4 +-
 .../protocol/NegotiationFinalization.java     |  26 +++
 app/src/main/res/layout/activity_roaming.xml  |  13 ++
 11 files changed, 420 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index b654f1e..926c866 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -30,6 +30,7 @@ import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.Toast;
 
+import com.flashwifi.wifip2p.billing.Accountant;
 import com.flashwifi.wifip2p.broadcast.WiFiDirectBroadcastService;
 
 public class MainActivity extends AppCompatActivity
@@ -71,6 +72,8 @@ public class MainActivity extends AppCompatActivity
                 } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
                     Log.d(TAG, "onReceive: Reset billing state");
                     mService.resetBillingState();
+                    mService.setInRoleConsumer(false);
+                    mService.setInRoleHotspot(false);
                 }
             }
         };
@@ -137,6 +140,8 @@ public class MainActivity extends AppCompatActivity
         password = intent.getStringExtra("password");
         seed = intent.getStringExtra("seed");
 
+        Accountant.getInstance().setSeed(seed);
+
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index 527e1e4..78e2bc2 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -32,6 +32,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 
 import com.flashwifi.wifip2p.billing.Accountant;
@@ -98,6 +99,7 @@ public class RoamingActivity extends AppCompatActivity {
                 Log.d(TAG, "updateUi: message=" + message);
                 CheckBox apConnected = (CheckBox)findViewById(R.id.accessPointActive);
                 CheckBox flashEstablished = (CheckBox)findViewById(R.id.flashEstablished);
+                CheckBox channelFunded = (CheckBox)findViewById(R.id.channelFunded);
                 if (message.equals("AP SUCCESS")) {
                     apConnected.setChecked(true);
                     mService.resetBillingState();
@@ -111,6 +113,11 @@ public class RoamingActivity extends AppCompatActivity {
                     apConnected.setChecked(false);
                 } else if (message.equals("Channel established")) {
                     flashEstablished.setChecked(true);
+                } else if (message.equals("Start Channel funding")) {
+                    // start the task
+                    mService.fundChannel(address);
+                } else if (message.equals("Channel funded")) {
+                    channelFunded.setChecked(true);
                 } else if (message.equals("Billing")) {
                     updateBillingCard();
                 } else if (message.equals("Channel closed")) {
@@ -188,9 +195,9 @@ public class RoamingActivity extends AppCompatActivity {
     private void startBillingProtocol() {
         // setup the flash channel etc...
         if (mService.isInRoleHotspot()) {
-            mService.startBillingServer();
+            mService.startBillingServer(address);
         } else {
-            mService.startBillingClient();
+            mService.startBillingClient(address);
         }
     }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
index dd0adf4..e518379 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/Accountant.java
@@ -22,6 +22,7 @@ public class Accountant {
     private FlashChannelHelper flashChannelHelper;
 
     private boolean closed = true;
+    private String seed;
 
     public static Accountant getInstance() {
         return ourInstance;
@@ -180,4 +181,12 @@ public class Accountant {
     public double getIotaPerByte() {
         return ((double)getIotaPerMegaByte()) / (1024.0d * 1024.0d);
     }
+
+    public void setSeed(String seed) {
+        this.seed = seed;
+    }
+
+    public String getSeed() {
+        return seed;
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
index fad4a75..221531d 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
@@ -5,6 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
+import com.flashwifi.wifip2p.datastore.PeerInformation;
+import com.flashwifi.wifip2p.datastore.PeerStore;
 import com.flashwifi.wifip2p.negotiation.SocketWrapper;
 import com.flashwifi.wifip2p.protocol.BillMessage;
 import com.flashwifi.wifip2p.protocol.BillMessageAnswer;
@@ -12,6 +14,9 @@ import com.flashwifi.wifip2p.protocol.BillingCloseChannel;
 import com.flashwifi.wifip2p.protocol.BillingCloseChannelAnswer;
 import com.flashwifi.wifip2p.protocol.BillingOpenChannel;
 import com.flashwifi.wifip2p.protocol.BillingOpenChannelAnswer;
+import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
+import com.flashwifi.wifip2p.protocol.NegotiationOffer;
+import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -31,6 +36,7 @@ import java.net.UnknownHostException;
 public class BillingClient {
     private static final String TAG = "BillingClient";
     private final Gson gson;
+    private final String mac;
     private State state = State.NOT_PAIRED;
     private Socket socket;
     private SocketWrapper socketWrapper;
@@ -51,8 +57,9 @@ public class BillingClient {
         context.sendBroadcast(local);
     }
 
-    public BillingClient(Context context){
+    public BillingClient(String mac, Context context){
         this.context = context;
+        this.mac = mac;
         gson = new GsonBuilder().create();
     }
 
@@ -78,20 +85,39 @@ public class BillingClient {
                     String hotspotStateLine = socketWrapper.getLineThrowing();
                     if (hotspotStateLine.contains("INITIAL") || hotspotStateLine.contains("NOT_PAIRED")) {
                         // ask the hotspot to open the flash channel
-                        // ToDo: get real digests
+
+                        // get the negotiated data
+                        NegotiationOffer offer = PeerStore.getInstance().getLatestNegotiationOffer(mac);
+                        NegotiationOfferAnswer answer = PeerStore.getInstance().getLatestNegotiationOfferAnswer(mac);
+                        NegotiationFinalization finalization = PeerStore.getInstance().getLatestFinalization(mac);
+                        // get the necessary values
+                        // ToDo: replace magic number with setting
+                        int totalMegabytes = 100;
+                        int treeDepth = 8;
                         String[] digests = new String[]{"1234", "2345", "3456"};
-                        // ToDo: replace magic numbers
-                        billingOpenChannel = new BillingOpenChannel(100, 100, "clientAddress", 8, digests, 20 * 60 * 1000, 60);
+                        int timeoutMinutesClient = 20 * 60 * 1000;
+
+                        int iotaPerMegabyte = offer.getIotaPerMegabyte();
+                        String clientRefundAddress = finalization.getClientRefundAddress();
+                        int totalMinutes = answer.getDuranceInMinutes();
+
+                        billingOpenChannel = new BillingOpenChannel(totalMegabytes, iotaPerMegabyte, clientRefundAddress, treeDepth, digests, timeoutMinutesClient, totalMinutes);
+                        PeerStore.getInstance().setLatestBillingOpenChannel(mac, billingOpenChannel);
                         String billingOpenChannelString = gson.toJson(billingOpenChannel);
                         socketWrapper.sendLine(billingOpenChannelString);
                         // receive the hotspot details for the flash channel
                         String billingOpenChannelAnswerString = socketWrapper.getLineThrowing();
                         billingOpenChannelAnswer = gson.fromJson(billingOpenChannelAnswerString, BillingOpenChannelAnswer.class);
+                        PeerStore.getInstance().setLatestBillingOpenChannelAnswer(mac, billingOpenChannelAnswer);
                         // now create the flash channel on our side
                         Accountant.getInstance().start(billingOpenChannel.getTotalMegabytes(), billingOpenChannel.getTimeoutMinutesClient(), billingOpenChannel.getTotalMinutes(), billingOpenChannelAnswer.getClientDepositIota(),
                                 billingOpenChannel.getIotaPerMegabyte());
                         sendUpdateUIBroadcastWithMessage("Channel established");
                         state = State.ROAMING;
+
+                        // start the task to fund the channel
+                        sendUpdateUIBroadcastWithMessage("Start Channel funding");
+
                     } else {
                         // what to do if the hotspot already created stuff and was in roaming mode
                         // ToDo: ^^^^^
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index fa4b8fb..e63b01f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -10,6 +10,7 @@ import android.os.RemoteException;
 import android.text.format.Formatter;
 import android.util.Log;
 
+import com.flashwifi.wifip2p.datastore.PeerStore;
 import com.flashwifi.wifip2p.negotiation.SocketWrapper;
 import com.flashwifi.wifip2p.protocol.BillMessage;
 import com.flashwifi.wifip2p.protocol.BillMessageAnswer;
@@ -17,6 +18,9 @@ import com.flashwifi.wifip2p.protocol.BillingCloseChannel;
 import com.flashwifi.wifip2p.protocol.BillingCloseChannelAnswer;
 import com.flashwifi.wifip2p.protocol.BillingOpenChannel;
 import com.flashwifi.wifip2p.protocol.BillingOpenChannelAnswer;
+import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
+import com.flashwifi.wifip2p.protocol.NegotiationOffer;
+import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -41,6 +45,10 @@ import static android.content.Context.WIFI_SERVICE;
 public class BillingServer {
     private static final String TAG = "BillingServer";
     private final Gson gson;
+    private final String mac;
+    private final String hotspotRefundAddress;
+    private final String channelRootAddress;
+    private final String[] digests;
     private State state = State.NOT_PAIRED;
     private ServerSocket serverSocket;
     private Socket socket;
@@ -58,9 +66,31 @@ public class BillingServer {
         context.sendBroadcast(local);
     }
 
-    public BillingServer(int bookedMegabytes, int timeoutMinutes, int maxMinutes, int iotaDepositClient, int iotaPerMegabyte, Context context){
+    public BillingServer(String mac, Context context){
         this.context = context;
-        Accountant.getInstance().start(bookedMegabytes, timeoutMinutes, maxMinutes, iotaDepositClient, iotaPerMegabyte);
+        this.mac = mac;
+
+        // get the negotiated data
+        NegotiationOffer offer = PeerStore.getInstance().getLatestNegotiationOffer(mac);
+        NegotiationOfferAnswer answer = PeerStore.getInstance().getLatestNegotiationOfferAnswer(mac);
+        NegotiationFinalization finalization = PeerStore.getInstance().getLatestFinalization(mac);
+        // get the necessary values
+        // ToDo: replace magic number with setting
+        int totalMegabytes = 100;
+        int treeDepth = 8;
+        this.digests = new String[]{"1234", "2345", "3456"};
+        int timeoutMinutesServer = 20 * 60 * 1000;
+
+        this.hotspotRefundAddress = finalization.getHotspotRefundAddress();
+        this.channelRootAddress = finalization.getDepositAddressFlashChannel();
+
+
+        int iotaPerMegabyte = offer.getIotaPerMegabyte();
+        int iotaDepositClient = totalMegabytes * iotaPerMegabyte;
+        String clientRefundAddress = finalization.getClientRefundAddress();
+        int totalMinutes = answer.getDuranceInMinutes();
+
+        Accountant.getInstance().start(totalMegabytes, timeoutMinutesServer, totalMinutes, iotaDepositClient, iotaPerMegabyte);
         gson = new GsonBuilder().create();
         networkStatsManager = (NetworkStatsManager) context.getSystemService(Context.NETWORK_STATS_SERVICE);
     }
@@ -101,11 +131,20 @@ public class BillingServer {
                     // receive the BillingOpenChannel message
                     String billingOpenChannelString = socketWrapper.getLineThrowing();
                     BillingOpenChannel billingOpenChannel = gson.fromJson(billingOpenChannelString, BillingOpenChannel.class);
-
+                    PeerStore.getInstance().setLatestBillingOpenChannel(mac, billingOpenChannel);
                     // answer with billingOpenChannelAnswerString
+
+
                     // ToDo: create the flash channel
-                    String[] myDigests = new String[]{"1234", "2345", "3456"};
-                    BillingOpenChannelAnswer billingOpenChannelAnswer = new BillingOpenChannelAnswer(1000, 1000, "", "", myDigests);
+
+                    
+                    BillingOpenChannelAnswer billingOpenChannelAnswer = new BillingOpenChannelAnswer(
+                            Accountant.getInstance().getTotalIotaDeposit(),
+                            Accountant.getInstance().getTotalIotaDeposit(),
+                            hotspotRefundAddress,
+                            channelRootAddress,
+                            digests);
+                    PeerStore.getInstance().setLatestBillingOpenChannelAnswer(mac, billingOpenChannelAnswer);
                     String billingOpenChannelAnswerString = gson.toJson(billingOpenChannelAnswer);
                     socketWrapper.sendLine(billingOpenChannelAnswerString);
 
@@ -113,6 +152,9 @@ public class BillingServer {
 
                     // OK
                     state = State.ROAMING;
+
+                    // start funding
+                    sendUpdateUIBroadcastWithMessage("Start Channel funding");
                 }
 
                 if (state == State.ROAMING) {
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index 171fb51..9c5dd63 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -5,6 +5,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pConfig;
@@ -14,18 +15,28 @@ import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.AsyncTask;
 import android.os.Binder;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import com.flashwifi.wifip2p.AddressBalanceTransfer;
 import com.flashwifi.wifip2p.accesspoint.AccessPointTask;
 import com.flashwifi.wifip2p.accesspoint.ConnectTask;
 import com.flashwifi.wifip2p.accesspoint.StopAccessPointTask;
+import com.flashwifi.wifip2p.billing.Accountant;
 import com.flashwifi.wifip2p.billing.BillingClient;
 import com.flashwifi.wifip2p.billing.BillingServer;
 import com.flashwifi.wifip2p.datastore.PeerStore;
+import com.flashwifi.wifip2p.iotaAPI.Requests.WalletTransferRequest;
 import com.flashwifi.wifip2p.negotiation.Negotiator;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannel;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannelAnswer;
 import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
+import com.flashwifi.wifip2p.protocol.NegotiationOffer;
+import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -35,6 +46,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import jota.IotaAPI;
+import jota.dto.response.GetBalancesResponse;
+import jota.dto.response.SendTransferResponse;
+import jota.error.ArgumentException;
+import jota.model.Transfer;
+
 public class WiFiDirectBroadcastService extends Service {
     public final static String TAG = "WiFiService";
 
@@ -106,7 +123,7 @@ public class WiFiDirectBroadcastService extends Service {
         billingServerIsRunning = false;
     }
 
-    public void startBillingServer(){
+    public void startBillingServer(String mac){
         if (!billingServerIsRunning) {
             billingServerIsRunning = true;
 
@@ -115,7 +132,7 @@ public class WiFiDirectBroadcastService extends Service {
                 public void run() {
                     Log.d(TAG, "run: instantiate billing server");
                     // ToDo: remove magic numbers
-                    BillingServer billingServer = new BillingServer(10, 20, 30, 10000, 1000, getApplicationContext());
+                    BillingServer billingServer = new BillingServer(mac, getApplicationContext());
 
                     try {
                         billingServer.start();
@@ -138,7 +155,7 @@ public class WiFiDirectBroadcastService extends Service {
     }
 
 
-    public void startBillingClient() {
+    public void startBillingClient(String mac) {
         if (!billingClientIsRunning) {
             billingClientIsRunning = true;
 
@@ -147,8 +164,7 @@ public class WiFiDirectBroadcastService extends Service {
             Runnable task = new Runnable() {
                 @Override
                 public void run() {
-                    // ToDo: remove magic numbers
-                    BillingClient billingClient = new BillingClient(getApplicationContext());
+                    BillingClient billingClient = new BillingClient(mac, getApplicationContext());
                     // ToDo: get the AP gateway ip address
                     // https://stackoverflow.com/questions/9035784/how-to-know-ip-address-of-the-router-from-code-in-android
                     billingClient.start("192.168.43.1");
@@ -485,6 +501,171 @@ public class WiFiDirectBroadcastService extends Service {
 
     }
 
+    public void fundChannel(String address) {
+        // get the necessary data
+        NegotiationOffer offer = PeerStore.getInstance().getLatestNegotiationOffer(address);
+        NegotiationOfferAnswer offerAnser = PeerStore.getInstance().getLatestNegotiationOfferAnswer(address);
+        NegotiationFinalization finalization = PeerStore.getInstance().getLatestFinalization(address);
+        BillingOpenChannel openChannel = PeerStore.getInstance().getPeer(address).getBillingOpenChannel();
+        BillingOpenChannelAnswer openChannelAnswer = PeerStore.getInstance().getPeer(address).getBillingOpenChannelAnswer();
+
+        String multisigAddress = finalization.getDepositAddressFlashChannel();
+
+        int timeoutClientSeconds = openChannel.getTimeoutMinutesClient();
+        int timeoutHotspotSeconds = openChannelAnswer.getTimeoutMinutesHotspot() * 60;
+        int timeout = (isInRoleHotspot()) ? timeoutHotspotSeconds : timeoutClientSeconds;
+
+        int clientDeposit = finalization.getDepositClientFlashChannelInIota();
+        int hotspotDeposit = finalization.getDepositServerFlashChannelInIota();
+        int deposit = (isInRoleHotspot()) ? hotspotDeposit : clientDeposit;
+
+        int depositTogether = clientDeposit + hotspotDeposit;
+
+        String seed = Accountant.getInstance().getSeed();
+
+        Log.d(TAG, "fundChannel: Let's fund " + multisigAddress);
+
+
+        Runnable task = () -> {
+            Log.d(TAG, "run: fund multisig address");
+
+            boolean fundDone = false;
+            boolean fundIsThere = false;
+
+            int fundErrorCount = 0;
+            int maxFundErrors = 10;
+
+            SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+
+            IotaAPI api;
+
+            if(testnet){
+                //Testnet node:
+                api = new IotaAPI.Builder()
+                        .protocol("https")
+                        .host("testnet140.tangle.works")
+                        .port("443")
+                        .build();
+            }
+            else{
+                //Mainnet node:
+                api = new IotaAPI.Builder()
+                        .protocol("http")
+                        .host("node.iotawallet.info")
+                        .port("14265")
+                        .build();
+            }
+
+            long start = System.currentTimeMillis() / 1000L;
+
+            while (((System.currentTimeMillis()/1000L) - start < timeout || !fundDone || !fundIsThere) && fundErrorCount < maxFundErrors) {
+                SendTransferResponse sendTransferResponse = null;
+                if (!fundDone) {
+                    Log.d(TAG, "fundChannel: DEPOSIT::" + Integer.toString(deposit));
+                    try {
+                        List<Transfer> transfers = new ArrayList<>();
+                        transfers.add(new Transfer(multisigAddress, deposit, "", ""));
+
+                        if(testnet) {
+                            Log.d(TAG, "fundChannel: fund on testnet");
+                            sendTransferResponse = api.sendTransfer(seed, 2, 4, 9, transfers, null, null, false);
+                        }
+                        else{
+                            Log.d(TAG, "fundChannel: fund on mainnet");
+                            sendTransferResponse = api.sendTransfer(seed, 2, 4, 18, transfers, null, null, false);
+                        }
+                    } catch (ArgumentException | IllegalAccessError | IllegalStateException e) {
+                        String transferResult = "";
+                        if (e instanceof ArgumentException) {
+                            if (e.getMessage().contains("Sending to a used address.") || e.getMessage().contains("Private key reuse detect!") || e.getMessage().contains("Send to inputs!")) {
+                                transferResult = "Sending to a used address/Private key reuse detect. Error Occurred.";
+                            }
+                            else if(e.getMessage().contains("Failed to connect to node")){
+                                transferResult = "Failed to connect to node";
+                            }
+                            else{
+                                transferResult = "Network Error: Attaching new address failed or Transaction failed";
+                            }
+                        }
+                        if (e instanceof IllegalAccessError) {
+                            transferResult = "Local POW needs to be enabled";
+                        }
+                        fundErrorCount++;
+                        Log.d(TAG, "fundChannel: " + transferResult);
+                    }
+
+                    if(sendTransferResponse != null){
+                        Boolean[] transferSuccess = sendTransferResponse.getSuccessfully();
+
+                        Boolean success = true;
+                        for (Boolean status : transferSuccess) {
+                            if(status.equals(false)){
+                                success = false;
+                                fundErrorCount++;
+                                break;
+                            }
+                        }
+                        if(success){
+                            Log.d(TAG, "fundChannel: successfully transferred my part");
+                            fundDone = true;
+                        }
+                    }
+
+                    try {
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+
+                } else if (fundDone && !fundIsThere) {
+                    // now check the balance until we get it
+                    // check the funding
+                    Log.d(TAG, "fundChannel: checking the balance of the root...");
+                    List<String> addresses = new ArrayList<String>();
+                    addresses.add(multisigAddress);
+                    GetBalancesResponse response = null;
+                    try {
+                        response = api.getBalances(100, addresses);
+                    } catch (ArgumentException e) {
+                        e.printStackTrace();
+                    }
+                    if (response != null) {
+                        if (response.getBalances().length > 0) {
+                            long balance = Integer.parseInt(response.getBalances()[0]);
+                            Log.d(TAG, "fundChannel: Found balance " + response.getBalances()[0]);
+                            if (balance > depositTogether) {
+                                Log.d(TAG, "fundChannel: balance is enough on both sides");
+                                fundIsThere = true;
+                            }
+                        }
+                    }
+                    try {
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+
+                }
+                
+            }
+            if (fundErrorCount < maxFundErrors) {
+                Log.d(TAG, "fundChannel: channel funded");
+                sendUpdateRoamingBroadcastWithMessage("Channel funded");
+            } else {
+                Log.d(TAG, "fundChannel: too many fund errors");
+            }
+
+
+        };
+
+        Log.d(TAG, "startFunding");
+        Thread thread = new Thread(task);
+        threads.add(thread);
+        thread.start();
+
+    }
+
 
     /**
      * Class used for the client Binder.  Because we know this service always
@@ -578,6 +759,13 @@ public class WiFiDirectBroadcastService extends Service {
         this.sendBroadcast(local);
     }
 
+    private void sendUpdateRoamingBroadcastWithMessage(String message){
+        Intent local = new Intent();
+        local.putExtra("message", message);
+        local.setAction("com.flashwifi.wifip2p.update_roaming");
+        this.sendBroadcast(local);
+    }
+
     public void connect(String address, WifiP2pManager.ActionListener actionListener) {
         WifiP2pDevice device;
         WifiP2pConfig config = new WifiP2pConfig();
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
index fe941bb..3d3f3f4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerInformation.java
@@ -4,6 +4,10 @@ import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pInfo;
 import android.support.annotation.NonNull;
 
+import com.flashwifi.wifip2p.protocol.BillingCloseChannel;
+import com.flashwifi.wifip2p.protocol.BillingCloseChannelAnswer;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannel;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannelAnswer;
 import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
 import com.flashwifi.wifip2p.protocol.NegotiationOffer;
 import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
@@ -27,6 +31,11 @@ public class PeerInformation  {
     private NegotiationOfferAnswer latestOfferAnswer;
     private NegotiationFinalization latestFinalization;
 
+    private BillingOpenChannel billingOpenChannel;
+    private BillingOpenChannelAnswer billingOpenChannelAnswer;
+    private BillingCloseChannel billingCloseChannel;
+    private BillingCloseChannelAnswer billingCloseChannelAnswer;
+
     public PeerInformation() {
         selected = false;
         age = 0;
@@ -56,6 +65,8 @@ public class PeerInformation  {
         return latestNegotiationOffer;
     }
 
+
+
     public void setLatestOfferAnswer(NegotiationOfferAnswer latestOfferAnswer) {
         this.latestOfferAnswer = latestOfferAnswer;
     }
@@ -95,4 +106,36 @@ public class PeerInformation  {
     public String getErrorMessage() {
         return errorMessage;
     }
+
+    public BillingOpenChannel getBillingOpenChannel() {
+        return billingOpenChannel;
+    }
+
+    public void setBillingOpenChannel(BillingOpenChannel billingOpenChannel) {
+        this.billingOpenChannel = billingOpenChannel;
+    }
+
+    public BillingOpenChannelAnswer getBillingOpenChannelAnswer() {
+        return billingOpenChannelAnswer;
+    }
+
+    public void setBillingOpenChannelAnswer(BillingOpenChannelAnswer billingOpenChannelAnswer) {
+        this.billingOpenChannelAnswer = billingOpenChannelAnswer;
+    }
+
+    public BillingCloseChannel getBillingCloseChannel() {
+        return billingCloseChannel;
+    }
+
+    public void setBillingCloseChannel(BillingCloseChannel billingCloseChannel) {
+        this.billingCloseChannel = billingCloseChannel;
+    }
+
+    public BillingCloseChannelAnswer getBillingCloseChannelAnswer() {
+        return billingCloseChannelAnswer;
+    }
+
+    public void setBillingCloseChannelAnswer(BillingCloseChannelAnswer billingCloseChannelAnswer) {
+        this.billingCloseChannelAnswer = billingCloseChannelAnswer;
+    }
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
index 9b4bd46..77db7b4 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/datastore/PeerStore.java
@@ -1,5 +1,9 @@
 package com.flashwifi.wifip2p.datastore;
 
+import com.flashwifi.wifip2p.protocol.BillingCloseChannel;
+import com.flashwifi.wifip2p.protocol.BillingCloseChannelAnswer;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannel;
+import com.flashwifi.wifip2p.protocol.BillingOpenChannelAnswer;
 import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
 import com.flashwifi.wifip2p.protocol.NegotiationOffer;
 import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
@@ -116,8 +120,46 @@ public class PeerStore {
         return null;
     }
 
+    public NegotiationOffer getLatestNegotiationOffer(String macAddress) {
+        if (peers.containsKey(macAddress.toLowerCase())) {
+            return peers.get(macAddress.toLowerCase()).getLatestNegotiationOffer();
+        }
+        return null;
+    }
+
+    public NegotiationOfferAnswer getLatestNegotiationOfferAnswer(String macAddress) {
+        if (peers.containsKey(macAddress.toLowerCase())) {
+            return peers.get(macAddress.toLowerCase()).getLatestOfferAnswer();
+        }
+        return null;
+    }
+
     public void setIPAddress(String macAddress, InetAddress IPAddress) {
         getOrCreatePeer(macAddress.toLowerCase()).setIPAddress(IPAddress.getHostAddress());
     }
 
+    public void setLatestBillingOpenChannel(String macAddress, BillingOpenChannel o) {
+        getOrCreatePeer(macAddress.toLowerCase()).setBillingOpenChannel(o);
+    }
+
+    public void setLatestBillingOpenChannelAnswer(String macAddress, BillingOpenChannelAnswer o) {
+        getOrCreatePeer(macAddress.toLowerCase()).setBillingOpenChannelAnswer(o);
+    }
+
+    public void setLatestBillingCloseChannel(String macAddress, BillingCloseChannel o) {
+        getOrCreatePeer(macAddress.toLowerCase()).setBillingCloseChannel(o);
+    }
+
+    public void setLatestBillingCloseChannelAnswer(String macAddress, BillingCloseChannelAnswer o) {
+        getOrCreatePeer(macAddress.toLowerCase()).setBillingCloseChannelAnswer(o);
+    }
+
+    public PeerInformation getPeer(String address) {
+        address = address.toLowerCase();
+        if (peers.containsKey(address)) {
+            return peers.get(address);
+        }
+        return null;
+    }
+
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
index c506c4b..ad9c096 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
@@ -363,9 +363,11 @@ public class Negotiator {
         double bandwidth = 0.1; // megabyte per second;
         int max_data_volume_megabytes = (int) (answer.getDuranceInMinutes() * bandwidth);
         int max_iota_transferred = max_data_volume_megabytes * offer.getIotaPerMegabyte();
+        max_iota_transferred = 10;
+        String rootAddress = "JZWUMRUEYFJOCDDRZCNIIMDZSX9LWMITNMDIAIUJKUV9LVDLSICDABFYTTBZFGEBJOADDN9WZ9IJJJD9DXRJRR9TOW";
         // send the most important message to the user
         NegotiationFinalization finalization = new NegotiationFinalization(hotspotName, password,
-                "Address", max_iota_transferred, max_iota_transferred, "");
+                rootAddress, max_iota_transferred, max_iota_transferred, "<flashObj>");
         PeerStore.getInstance().setLatestFinalization(otherMac, finalization);
         String finalizationString = gson.toJson(finalization);
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/protocol/NegotiationFinalization.java b/app/src/main/java/com/flashwifi/wifip2p/protocol/NegotiationFinalization.java
index 8ac498e..ee8c973 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/protocol/NegotiationFinalization.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/protocol/NegotiationFinalization.java
@@ -6,6 +6,8 @@ public class NegotiationFinalization {
     private String hotspotName;
     private String hotspotPassword;
     private String depositAddressFlashChannel;
+    private String clientRefundAddress;
+    private String hotspotRefundAddress;
     private int depositServerFlashChannelInIota;
     private int depositClientFlashChannelInIota;
     private String flashObject;
@@ -27,4 +29,28 @@ public class NegotiationFinalization {
     public String getHotspotPassword() {
         return hotspotPassword;
     }
+
+    public String getDepositAddressFlashChannel() {
+        return depositAddressFlashChannel;
+    }
+
+    public int getDepositServerFlashChannelInIota() {
+        return depositServerFlashChannelInIota;
+    }
+
+    public int getDepositClientFlashChannelInIota() {
+        return depositClientFlashChannelInIota;
+    }
+
+    public String getFlashObject() {
+        return flashObject;
+    }
+
+    public String getClientRefundAddress() {
+        return clientRefundAddress;
+    }
+
+    public String getHotspotRefundAddress() {
+        return hotspotRefundAddress;
+    }
 }
diff --git a/app/src/main/res/layout/activity_roaming.xml b/app/src/main/res/layout/activity_roaming.xml
index 4ca539a..b522c5d 100644
--- a/app/src/main/res/layout/activity_roaming.xml
+++ b/app/src/main/res/layout/activity_roaming.xml
@@ -60,6 +60,19 @@
                 android:clickable="false"
                 android:text="Flash channel" />
 
+
+
+            <CheckBox
+                android:id="@+id/channelFunded"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="10dp"
+                android:checked="false"
+                android:clickable="false"
+                android:text="Channel funded" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

From 57058a652969a78403a63e1febee85ef2deeb580 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Mon, 22 Jan 2018 21:55:16 -0500
Subject: [PATCH 23/29] Tesetnet Private Setting

---
 .../flashwifi/wifip2p/SettingsFragment.java   | 43 +++++++++++++++++++
 .../Requests/WalletAddressChecker.java        | 35 +++++++++++----
 .../Requests/WalletBalanceChecker.java        | 36 ++++++++++++----
 .../Requests/WalletTestnetTokenGen.java       | 33 +++++++++++---
 .../Requests/WalletTransferRequest.java       | 30 +++++++++----
 app/src/main/res/values/connections.xml       | 18 ++++++++
 app/src/main/res/xml/preferences.xml          |  6 +++
 7 files changed, 169 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/values/connections.xml

diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 43eec8a..014ae03 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -9,6 +9,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
@@ -29,6 +30,8 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 
     private Handler mHandler;
     private Preference testnetFundAddPref;
+    private Preference prefTestNetPrivate;
+    private PreferenceCategory prefCatIotaSettings;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -42,6 +45,17 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
+        prefTestNetPrivate = findPreference("pref_key_switch_testnet_private");
+        prefCatIotaSettings = (PreferenceCategory) findPreference("pref_key_IOTA_settings");
+
+        SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+
+        if(!testnet){
+            //Hide the testnet private switch
+            hideTestNetPref();
+        }
+
         //Set change listener
         getPreferenceScreen().getSharedPreferences()
                 .registerOnSharedPreferenceChangeListener(this);
@@ -94,6 +108,14 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
                 break;
             case "pref_key_switch_testnet":
                 makeToastSettingsFragment("Testnet on/off Changed");
+                SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getActivity());
+                Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+                if(testnet){
+                    showTestNetPref();
+                }
+                else{
+                    hideTestNetPref();
+                }
                 break;
             case "edit_text_sell_price":
                 makeToastSettingsFragment("Hotspot Sell Price Changed");
@@ -234,4 +256,25 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         }
     }
 
+    private void hidePreference(String prefKey, String catKey){
+        Preference pref = findPreference(prefKey);
+        PreferenceCategory catPref = (PreferenceCategory) findPreference(catKey);
+        catPref.removePreference(pref);
+    }
+
+    private void showPreference(String prefKey, String catKey){
+        Preference pref = findPreference(prefKey);
+        PreferenceCategory catPref = (PreferenceCategory) findPreference(catKey);
+        catPref.addPreference(pref);
+    }
+
+    private void hideTestNetPref() {
+        prefCatIotaSettings.removePreference(prefTestNetPrivate);
+    }
+
+    private void showTestNetPref() {
+        prefCatIotaSettings.addPreference(prefTestNetPrivate);
+    }
+
+
 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
index 85779a2..887af1e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import com.flashwifi.wifip2p.R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,21 +27,33 @@ public class WalletAddressChecker {
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
         Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+        Boolean testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
 
         if(testnet){
             //Testnet node:
-            api = new IotaAPI.Builder()
-                    .protocol("https")
-                    .host("testnet140.tangle.works")
-                    .port("443")
-                    .build();
+            if(testnetPrivate){
+                //Private test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPrivateTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPrivateTestnetNode))
+                        .port(context.getResources().getString(R.string.portPrivateTestnetNode))
+                        .build();
+            }
+            else{
+                //Public test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPublicTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPublicTestnetNode))
+                        .port(context.getResources().getString(R.string.portPublicTestnetNode))
+                        .build();
+            }
         }
         else{
             //Mainnet node:
             api = new IotaAPI.Builder()
-                    .protocol("http")
-                    .host("node.iotawallet.info")
-                    .port("14265")
+                    .protocol(context.getResources().getString(R.string.protocolDefaultMainnetNode))
+                    .host(context.getResources().getString(R.string.hostDefaultMainnetNode))
+                    .port(context.getResources().getString(R.string.portDefaultMainnetNode))
                     .build();
         }
     }
@@ -84,6 +98,11 @@ public class WalletAddressChecker {
                 }
                 else{
                     //Found transactions, increment for new address
+
+                    System.out.println("WalletAddressChecker value: "+transactionsForAddress.get(0).getValue());
+                    System.out.println("WalletAddressChecker time: "+transactionsForAddress.get(0).getAttachmentTimestamp());
+                    System.out.println("WalletAddressChecker address: "+transactionsForAddress.get(0).getAddress());
+
                     keyIndex = keyIndex + 1;
                 }
             }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index 5fc0bd1..8c38fa2 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -8,6 +8,7 @@ import android.os.Message;
 import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
+import com.flashwifi.wifip2p.R;
 
 import java.util.List;
 
@@ -42,21 +43,33 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
         Boolean testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+        Boolean testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
 
         if(testnet){
             //Testnet node:
-            api = new IotaAPI.Builder()
-                    .protocol("https")
-                    .host("testnet140.tangle.works")
-                    .port("443")
-                    .build();
+            if(testnetPrivate){
+                //Private test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPrivateTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPrivateTestnetNode))
+                        .port(context.getResources().getString(R.string.portPrivateTestnetNode))
+                        .build();
+            }
+            else{
+                //Public test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPublicTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPublicTestnetNode))
+                        .port(context.getResources().getString(R.string.portPublicTestnetNode))
+                        .build();
+            }
         }
         else{
             //Mainnet node:
             api = new IotaAPI.Builder()
-                    .protocol("http")
-                    .host("node.iotawallet.info")
-                    .port("14265")
+                    .protocol(context.getResources().getString(R.string.protocolDefaultMainnetNode))
+                    .host(context.getResources().getString(R.string.hostDefaultMainnetNode))
+                    .port(context.getResources().getString(R.string.portDefaultMainnetNode))
                     .build();
         }
     }
@@ -108,6 +121,11 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
     }
 
     public String getBalance(List<String> inAddresses){
+
+        for (String inAddress : inAddresses) {
+            System.out.println("addressGetBalance: "+inAddress);
+        }
+
         String updatedBalanceString;
         try {
             StopWatch stopWatch = new StopWatch();
@@ -132,7 +150,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
             else{
                 long storedBalance = Long.parseLong(getSharedPreKeyBalance());
                 System.out.println("getSharedPreKeyBalance: "+getSharedPreKeyBalance());
-                long updatedBalance = storedBalance + Long.parseLong(balanceArray[0]);
+                long updatedBalance = storedBalance + Long.parseLong(balanceArray[balanceArray.length-2]);
                 updatedBalanceString = Long.toString(updatedBalance);
                 System.out.println("updatedBalance: "+updatedBalanceString);
                 putSharedPrefBalance(updatedBalanceString);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
index d45f918..2658659 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
@@ -1,14 +1,18 @@
 package com.flashwifi.wifip2p.iotaAPI.Requests;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
+import com.flashwifi.wifip2p.R;
 import com.flashwifi.wifip2p.iotaAPI.Requests.Model.TokenGenJSONResponse;
 import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpTransport;
@@ -16,6 +20,7 @@ import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.util.ExponentialBackOff;
 import com.google.gson.reflect.TypeToken;
 
 import java.io.IOException;
@@ -66,7 +71,21 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
                 });
         HttpRequest request = null;
         try {
-            request = requestFactory.buildGetRequest(new GenericUrl("https://hackseeds.tangle.works"));
+
+            SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+            Boolean testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
+
+            if(testnetPrivate){
+                request = requestFactory.buildGetRequest(new GenericUrl(context.getResources().getString(R.string.generatorPrivateTestnetNode)));
+                //Set timeout to 5 min
+                request.setConnectTimeout(300000);
+                request.setReadTimeout(600000);
+            }else{
+                request = requestFactory.buildGetRequest(new GenericUrl(context.getResources().getString(R.string.generatorPublicTestnetNode)));
+                //Set timeout to 5 min
+                request.setConnectTimeout(300000);
+                request.setReadTimeout(600000);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -74,15 +93,15 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
         //TODO: Set timeout
         /*
         ExponentialBackOff backoff = new ExponentialBackOff.Builder()
-                .setInitialIntervalMillis(500)
+                .setInitialIntervalMillis(300000)
                 .setMaxElapsedTimeMillis(900000)
-                .setMaxIntervalMillis(6000)
+                .setMaxIntervalMillis(600000)
                 .setMultiplier(1.5)
-                .setRandomizationFactor(0.5)
+                .setRandomizationFactor(0.999)
                 .build();
         request.setUnsuccessfulResponseHandler(
                 new HttpBackOffUnsuccessfulResponseHandler(backoff));
-        */
+                */
 
         Type type = new TypeToken<TokenGenJSONResponse>() {}.getType();
         TokenGenJSONResponse token = new TokenGenJSONResponse();
@@ -105,7 +124,7 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
             }
             else{
                 //Unknown error
-                token.setSuccess("Unknown Error");
+                token.setSuccess("Unknown Error. Please try again.");
                 e.printStackTrace();
             }
         }
@@ -129,6 +148,8 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
 
     private void transferToWallet(List<String> destAddressses, TokenGenJSONResponse token) {
 
+        System.out.println("2000 seed: "+token.getSeed());
+
         if(destAddressses != null && destAddressses.get(0).equals("Unable to resolve host")){
             //Host Error
             Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE, "hostError");
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index 94910bc..acd999e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -8,6 +8,7 @@ import android.os.Message;
 import android.preference.PreferenceManager;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
+import com.flashwifi.wifip2p.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,22 +45,33 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
         testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
+        Boolean testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
 
         if(testnet){
-
             //Testnet node:
-            api = new IotaAPI.Builder()
-                    .protocol("https")
-                    .host("testnet140.tangle.works")
-                    .port("443")
-                    .build();
+            if(testnetPrivate){
+                //Private test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPrivateTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPrivateTestnetNode))
+                        .port(context.getResources().getString(R.string.portPrivateTestnetNode))
+                        .build();
+            }
+            else{
+                //Public test node
+                api = new IotaAPI.Builder()
+                        .protocol(context.getResources().getString(R.string.protocolPublicTestnetNode))
+                        .host(context.getResources().getString(R.string.hostPublicTestnetNode))
+                        .port(context.getResources().getString(R.string.portPublicTestnetNode))
+                        .build();
+            }
         }
         else{
             //Mainnet node:
             api = new IotaAPI.Builder()
-                    .protocol("http")
-                    .host("node.iotawallet.info")
-                    .port("14265")
+                    .protocol(context.getResources().getString(R.string.protocolDefaultMainnetNode))
+                    .host(context.getResources().getString(R.string.hostDefaultMainnetNode))
+                    .port(context.getResources().getString(R.string.portDefaultMainnetNode))
                     .build();
         }
     }
diff --git a/app/src/main/res/values/connections.xml b/app/src/main/res/values/connections.xml
new file mode 100644
index 0000000..3e67f17
--- /dev/null
+++ b/app/src/main/res/values/connections.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="protocolPrivateTestnetNode">http</string>
+    <string name="hostPrivateTestnetNode">87.118.96.200</string>
+    <string name="portPrivateTestnetNode">14700</string>
+    <string name="generatorPrivateTestnetNode">http://87.118.96.200:3000/</string>
+
+    <string name="protocolPublicTestnetNode">https</string>
+    <string name="hostPublicTestnetNode">testnet140.tangle.works</string>
+    <string name="portPublicTestnetNode">443</string>
+    <string name="generatorPublicTestnetNode">https://hackseeds.tangle.works</string>
+
+    <string name="protocolDefaultMainnetNode">http</string>
+    <string name="hostDefaultMainnetNode">node.iotawallet.info</string>
+    <string name="portDefaultMainnetNode">14265</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 48a44ad..e655517 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -25,6 +25,7 @@
     <PreferenceCategory
         android:title="IOTA"
         android:elevation="10dp"
+        android:animateLayoutChanges="true"
         android:key="pref_key_IOTA_settings">
 
 
@@ -46,6 +47,11 @@
             android:key="pref_key_switch_testnet"
             android:title="Testnet" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="pref_key_switch_testnet_private"
+            android:title="Private testnet (recommended)" />
+
         <Preference
             android:divider="@null"
             android:dividerHeight="0dp"

From 51b88c4b441bd683bb2c93423e9b5cbc9c5d0452 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Mon, 22 Jan 2018 21:58:19 -0500
Subject: [PATCH 24/29] Revert modules.xml change

---
 .idea/modules.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index cfa4b9a..f1ca5bd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://C:\Users\Toby\Documents\Android Studio Projects\flashwifi\WifiP2P.iml" filepath="C:\Users\Toby\Documents\Android Studio Projects\flashwifi\WifiP2P.iml" />
+      <module fileurl="file://$PROJECT_DIR$/WifiP2P.iml" filepath="$PROJECT_DIR$/WifiP2P.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/flashwifi.iml" filepath="$PROJECT_DIR$/flashwifi.iml" />
     </modules>

From 37c55e1c0998673efb2286d611fe1007fbb5cd12 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Tue, 23 Jan 2018 02:54:29 -0500
Subject: [PATCH 25/29] Balance Checker Fix

-Balance checker should be accurate now
-Need to test more and remove println statements
-Added checking of pending transactions to not include them in the key index update

To retrieve balance from stored preference @danielpollithy @gosticks:

prefFile = getActivity().getString(R.string.preference_file_key
SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
String defaultValue = "0";
String storedBalance = sharedPref.getString("balance",defaultValue);

-Added About, License, Agreement settings sections
-Updated and added security settings and usage
---
 .../flashwifi/wifip2p/SettingsFragment.java   |  5 ++
 .../Requests/WalletAddressChecker.java        | 67 +++++++++++++--
 .../Requests/WalletBalanceChecker.java        | 83 +++++++++++++------
 .../Requests/WalletTestnetTokenGen.java       |  4 +-
 .../Requests/WalletTransferRequest.java       | 16 +++-
 app/src/main/res/values/preferencesArrays.xml |  5 +-
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/preferences.xml          | 42 ++++++++--
 8 files changed, 174 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 014ae03..1528867 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -45,6 +45,11 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
+        // Set version text
+        Preference version = findPreference("pref_key_reset_version");
+        String curTitle = version.getTitle().toString();
+        version.setTitle("Version: "+curTitle);
+
         prefTestNetPrivate = findPreference("pref_key_switch_testnet_private");
         prefCatIotaSettings = (PreferenceCategory) findPreference("pref_key_IOTA_settings");
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
index 887af1e..6c4e7ee 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jota.IotaAPI;
+import jota.dto.response.GetInclusionStateResponse;
 import jota.dto.response.GetNewAddressResponse;
 import jota.error.ArgumentException;
 import jota.model.Transaction;
@@ -20,6 +21,9 @@ public class WalletAddressChecker {
     private Context context;
     private String prefFile;
 
+    boolean containsPendingTransaction = false;
+    boolean keyIndexChanged = false;
+
     public WalletAddressChecker(Context inContext, String inPrefFile){
 
         context = inContext;
@@ -63,12 +67,17 @@ public class WalletAddressChecker {
         Boolean foundAddress = false;
         List<String> addressList = new ArrayList<>();
         int keyIndex = getKeyIndex();
+        ArrayList<String> hashStringList = new ArrayList<>();
 
         while(foundAddress == false){
 
             GetNewAddressResponse addressResponse = null;
             try {
-                addressResponse = api.getNewAddress(seed, 2, keyIndex, false, 1, false);
+                SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+                String security = prefManager.getString("pref_key_security","2");
+                int securityInt = Integer.parseInt(security);
+                System.out.println("securityInt: "+securityInt);
+                addressResponse = api.getNewAddress(seed, securityInt, keyIndex, true, 1, false);
             } catch (ArgumentException e) {
                 e.printStackTrace();
             }
@@ -99,6 +108,9 @@ public class WalletAddressChecker {
                 else{
                     //Found transactions, increment for new address
 
+                    String curHash = transactionsForAddress.get(0).getHash();
+                    hashStringList.add(curHash);
+
                     System.out.println("WalletAddressChecker value: "+transactionsForAddress.get(0).getValue());
                     System.out.println("WalletAddressChecker time: "+transactionsForAddress.get(0).getAttachmentTimestamp());
                     System.out.println("WalletAddressChecker address: "+transactionsForAddress.get(0).getAddress());
@@ -107,15 +119,48 @@ public class WalletAddressChecker {
                 }
             }
         }
+        String[] hashStringArray = new String[hashStringList.size()];
+        int hashIndex = 0;
+        //Convert hash String List to String Array
+        for (String curHash : hashStringList) {
+            hashStringArray[hashIndex] = curHash;
+            hashIndex = hashIndex + 1;
+        }
 
-        if(keyIndex == 0){
-            //Put the initial address to search. No transactions for the seed yet.
-            putKeyIndex(keyIndex);
+        //Check whether pending transactions exist
+        containsPendingTransaction = false;
+        keyIndexChanged = false;
+        try {
+            GetInclusionStateResponse inclusionResponse = api.getLatestInclusion(hashStringArray);
+            boolean[] states = inclusionResponse.getStates();
+
+            for (boolean state : states) {
+                if(!state){
+                    containsPendingTransaction = true;
+                }
+            }
+        } catch (ArgumentException e) {
+            e.printStackTrace();
         }
-        else{
-            //Put the second last address to search
-            putKeyIndex(keyIndex-1);
+
+        System.out.println("containsPendingTransaction: "+containsPendingTransaction);
+
+        if(!containsPendingTransaction){
+            //all confirmed transactions, ok to change keyIndex
+
+            if(keyIndex != getKeyIndex()){
+                keyIndexChanged = true;
+                if(keyIndex == 0){
+                    //Put the initial address to search. No transactions for the seed yet.
+                    putKeyIndex(keyIndex);
+                }
+                else{
+                    //Put the second last address to search
+                    putKeyIndex(keyIndex-1);
+                }
+            }
         }
+
         return addressList;
     }
 
@@ -133,4 +178,12 @@ public class WalletAddressChecker {
         editor.apply();
     }
 
+    public boolean getContainsPendingTransaction() {
+        return containsPendingTransaction;
+    }
+
+    public boolean getkeyIndexChanged() {
+        return keyIndexChanged;
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index 8c38fa2..e7519a5 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -80,6 +80,10 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
             WalletAddressChecker addressChecker = new WalletAddressChecker(context,prefFile);
             List<String> addressList = addressChecker.getAddress(seed);
+            boolean containsPendingTransactions = addressChecker.getContainsPendingTransaction();
+            boolean keyIndexChanged = addressChecker.getkeyIndexChanged();
+
+            System.out.println("seed: "+seed);
 
             if(addressList != null && addressList.get(0).equals("Unable to resolve host")){
                 AddressBalanceTransfer addressBalanceTransfer = new AddressBalanceTransfer(null,null,"hostError");
@@ -89,7 +93,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
             else if(addressList != null){
 
                 String depositAddress = addressList.get(addressList.size()-1);
-                String balance = getBalance(addressList);
+                String balance = getBalance(addressList, containsPendingTransactions, keyIndexChanged);
 
                 if(balance != null){
                     if(type == WITHDRAW_WALLET && updateMessage == false){
@@ -120,7 +124,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
         return null;
     }
 
-    public String getBalance(List<String> inAddresses){
+    public String getBalance(List<String> inAddresses, boolean containsPendingTransactions, boolean keyIndexChanged){
 
         for (String inAddress : inAddresses) {
             System.out.println("addressGetBalance: "+inAddress);
@@ -129,30 +133,41 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
         String updatedBalanceString;
         try {
             StopWatch stopWatch = new StopWatch();
-            GetBalancesAndFormatResponse balanceResponse = api.getBalanceAndFormat(inAddresses, 0, 0, stopWatch, 2);
+
+            SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+            String security = prefManager.getString("pref_key_security","2");
+            int securityInt = Integer.parseInt(security);
+
+            GetBalancesAndFormatResponse balanceResponse = api.getBalanceAndFormat(inAddresses, 0, 0, stopWatch, securityInt);
             long total = balanceResponse.getTotalBalance();
-            System.out.println("GetBalance Total: "+total);
+            System.out.println("getTotalBalance: "+total);
 
-            GetBalancesResponse balanceResultResponse = api.getBalances(100, inAddresses);
-            String[] balanceArray = balanceResultResponse.getBalances();
+            long storedBaseBalance = Long.parseLong(getBaseSharedPrefKeyBalance());
+            System.out.println("getBaseSharedPreKeyBalance: "+storedBaseBalance);
 
-            System.out.println("balanceArrayLength: "+balanceArray.length);
+            long updatedBaseBalance = storedBaseBalance + total;
+            updatedBalanceString = Long.toString(updatedBaseBalance);
 
-            for (String s : balanceArray) {
-                System.out.println("balanceArrayEntry: "+s);
+            //Pending Transaction, no new confirmed transactions
+            if(containsPendingTransactions && !keyIndexChanged){
+                //No action required
             }
-
-            if(balanceArray.length < 2){
-                System.out.println("updatedBalanceString: "+balanceArray[0]);
-                updatedBalanceString = balanceArray[0];
+            //Pending Transaction, new confirmed transactions
+            else if(containsPendingTransactions && keyIndexChanged){
                 putSharedPrefBalance(updatedBalanceString);
             }
-            else{
-                long storedBalance = Long.parseLong(getSharedPreKeyBalance());
-                System.out.println("getSharedPreKeyBalance: "+getSharedPreKeyBalance());
-                long updatedBalance = storedBalance + Long.parseLong(balanceArray[balanceArray.length-2]);
-                updatedBalanceString = Long.toString(updatedBalance);
-                System.out.println("updatedBalance: "+updatedBalanceString);
+            //No Pending Transactions, no new confirmed transactions
+            else if(!containsPendingTransactions && !keyIndexChanged){
+                //No action required
+            }
+            //No Pending Transactions, new confirmed transactions
+            else if(!containsPendingTransactions && keyIndexChanged){
+                putBaseSharedPrefBalance(updatedBalanceString);
+
+                System.out.println("Store new base balance");
+                System.out.println("updated balance: "+updatedBaseBalance);
+
+                updatedBalanceString = Long.toString(updatedBaseBalance);
                 putSharedPrefBalance(updatedBalanceString);
             }
         } catch (ArgumentException | IllegalStateException e) {
@@ -162,20 +177,15 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
         return updatedBalanceString;
     }
 
-    private String getSharedPreKeyBalance() {
+    private String getSharedPrefKeyBalance() {
         SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
         int keyIndex = sharedPref.getInt("keyIndex",0);
 
         System.out.println("KeyIndex: "+keyIndex);
 
         String defaultValue = "0";
-        if(keyIndex > 2){
-            String storedBalance = sharedPref.getString("balance",defaultValue);
-            return storedBalance;
-        }
-        else{
-            return defaultValue;
-        }
+        String storedBalance = sharedPref.getString("balance",defaultValue);
+        return storedBalance;
     }
 
     private void putSharedPrefBalance(String inBalance) {
@@ -186,4 +196,23 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
         editor.apply();
     }
 
+    private String getBaseSharedPrefKeyBalance() {
+        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
+        int keyIndex = sharedPref.getInt("keyIndex",0);
+
+        System.out.println("KeyIndex: "+keyIndex);
+
+        String defaultValue = "0";
+        String storedBalance = sharedPref.getString("baseBalance",defaultValue);
+        return storedBalance;
+    }
+
+    private void putBaseSharedPrefBalance(String inBalance) {
+        SharedPreferences sharedPref = context.getSharedPreferences(
+                prefFile, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putString("baseBalance", inBalance);
+        editor.apply();
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
index 2658659..f905aa8 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
@@ -77,12 +77,12 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
 
             if(testnetPrivate){
                 request = requestFactory.buildGetRequest(new GenericUrl(context.getResources().getString(R.string.generatorPrivateTestnetNode)));
-                //Set timeout to 5 min
+                //Set timeout to 10 min
                 request.setConnectTimeout(300000);
                 request.setReadTimeout(600000);
             }else{
                 request = requestFactory.buildGetRequest(new GenericUrl(context.getResources().getString(R.string.generatorPublicTestnetNode)));
-                //Set timeout to 5 min
+                //Set timeout to 10 min
                 request.setConnectTimeout(300000);
                 request.setReadTimeout(600000);
             }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index acd999e..e5d00dd 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -25,6 +25,7 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
     private static IotaAPI api;
     private static Context context;
     Boolean testnet;
+    Boolean testnetPrivate;
     private String appWalletSeed;
     private String sendAddress;
     private String sendAmount;
@@ -45,7 +46,7 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
         testnet = prefManager.getBoolean("pref_key_switch_testnet",false);
-        Boolean testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
+        testnetPrivate = prefManager.getBoolean("pref_key_switch_testnet_private",false);
 
         if(testnet){
             //Testnet node:
@@ -99,15 +100,24 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
 
         SendTransferResponse sendTransferResponse = null;
 
+        SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
+        String security = prefManager.getString("pref_key_security","2");
+        int securityInt = Integer.parseInt(security);
+
         try {
             if(testnet) {
                 //Testnet
                 System.out.println("WalletTransferRequest: Testnet");
-                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 13, transfers, null, null, false);
+                if(testnetPrivate){
+                    sendTransferResponse = api.sendTransfer(appWalletSeed, securityInt, 4, 3, transfers, null, null, false);
+                }
+                else{
+                    sendTransferResponse = api.sendTransfer(appWalletSeed, securityInt, 4, 9, transfers, null, null, false);
+                }
             }
             else{
                 //Mainnet
-                sendTransferResponse = api.sendTransfer(appWalletSeed, 2, 4, 14, transfers, null, null, false);
+                sendTransferResponse = api.sendTransfer(appWalletSeed, securityInt, 4, 14, transfers, null, null, false);
             }
         } catch (ArgumentException | IllegalAccessError | IllegalStateException e) {
             if (e instanceof ArgumentException) {
diff --git a/app/src/main/res/values/preferencesArrays.xml b/app/src/main/res/values/preferencesArrays.xml
index 66e78a1..ab21d9b 100644
--- a/app/src/main/res/values/preferencesArrays.xml
+++ b/app/src/main/res/values/preferencesArrays.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="securityPref" >
-        <item>One</item>
-        <item>Two</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
     </string-array>
 
     <string-array name="networkTimeoutPref" >
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 151b23a..8d5d53f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">WifiP2P</string>
+    <string name="app_version">1.0</string>
     <string name="title_activity_scrolling">ScrollingActivity</string>
     <string name="action_settings">Settings</string>
     <string name="wifi_direct">Wifi Direct Chat</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e655517..7c861bd 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -6,14 +6,6 @@
         android:key="pref_key_wifi_settings"
         android:elevation="10dp">
 
-        <ListPreference
-            android:key="pref_key_security"
-            android:divider="@null"
-            android:dividerHeight="0dp"
-            android:entries="@array/securityPref"
-            android:entryValues="@array/securityPref"
-            android:title="Security" />
-
         <Preference
             android:divider="@null"
             android:dividerHeight="0dp"
@@ -29,6 +21,15 @@
         android:key="pref_key_IOTA_settings">
 
 
+        <ListPreference
+            android:key="pref_key_security"
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:defaultValue="2"
+            android:entries="@array/securityPref"
+            android:entryValues="@array/securityPref"
+            android:title="Security pk/address" />
+
         <ListPreference
             android:key="pref_key_network_timeout"
             android:entries="@array/networkTimeoutPref"
@@ -129,4 +130,29 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="About"
+        android:key="pref_key_about"
+        android:elevation="10dp">
+
+        <Preference
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:key="pref_key_reset_version"
+            android:title="@string/app_version"/>
+
+        <Preference
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:key="pref_key_license"
+            android:title="License"/>
+
+        <Preference
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:key="pref_key_agreement"
+            android:title="Agreement"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
\ No newline at end of file

From 6e6676fd1b54dd16eaf46ea70b0349dbcd2e5850 Mon Sep 17 00:00:00 2001
From: Daniel Pollithy <daniel.pollithy@gmail.com>
Date: Wed, 24 Jan 2018 01:24:18 +0100
Subject: [PATCH 26/29] - removed switch and introduced foreground service - so
 close to switching the modes

---
 .../java/com/flashwifi/wifip2p/Constants.java |  20 +++
 .../flashwifi/wifip2p/HotspotFragment.java    |  89 ++++--------
 .../com/flashwifi/wifip2p/MainActivity.java   |  43 +++++-
 .../flashwifi/wifip2p/RoamingActivity.java    |  52 ++-----
 .../com/flashwifi/wifip2p/SearchFragment.java | 131 +++++++-----------
 .../wifip2p/billing/BillingClient.java        |   1 +
 .../wifip2p/billing/BillingServer.java        |  12 +-
 .../broadcast/WiFiDirectBroadcastService.java |  85 +++++++++++-
 .../wifip2p/negotiation/Negotiator.java       |   4 +-
 app/src/main/res/layout/activity_roaming.xml  |   6 +-
 app/src/main/res/layout/app_bar_main.xml      |   4 +-
 app/src/main/res/layout/fragment_hotspot.xml  |   3 +-
 app/src/main/res/values/strings.xml           |   3 +
 app/src/main/res/xml/preferences.xml          |   2 +-
 14 files changed, 250 insertions(+), 205 deletions(-)
 create mode 100644 app/src/main/java/com/flashwifi/wifip2p/Constants.java

diff --git a/app/src/main/java/com/flashwifi/wifip2p/Constants.java b/app/src/main/java/com/flashwifi/wifip2p/Constants.java
new file mode 100644
index 0000000..07b2e53
--- /dev/null
+++ b/app/src/main/java/com/flashwifi/wifip2p/Constants.java
@@ -0,0 +1,20 @@
+package com.flashwifi.wifip2p;
+
+/**
+ * Created by daniel on 23.01.18.
+ */
+
+public class Constants {
+    public interface ACTION {
+        public static String MAIN_ACTION = "com.flashwifi.wifip2p.service.main";
+        public static String PREV_ACTION = "com.flashwifi.wifip2p.service.prev";
+        public static String PLAY_ACTION = "com.flashwifi.wifip2p.service.play";
+        public static String NEXT_ACTION = "com.flashwifi.wifip2p.service.next";
+        public static String STARTFOREGROUND_ACTION = "com.flashwifi.wifip2p.start_foreground_service";
+        public static String STOPFOREGROUND_ACTION = "com.flashwifi.wifip2p.sop_foreground_service";
+    }
+
+    public interface NOTIFICATION_ID {
+        public static int FOREGROUND_SERVICE = 101;
+    }
+}
diff --git a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
index 0e5ad17..2fe6000 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java
@@ -34,8 +34,6 @@ public class HotspotFragment extends Fragment {
 
     private int numberConnectedPeers = 0;
 
-    WiFiDirectBroadcastService mService;
-    boolean mBound = false;
     BroadcastReceiver updateUIReceiver;
 
     public HotspotFragment() {
@@ -73,7 +71,7 @@ public class HotspotFragment extends Fragment {
 
     private void updateUi(Intent intent) {
         Log.d(TAG, "updateUi: Got some network data into the hotspot fragment");
-        String numberAvailableDevices = Integer.toString(mService.getArrayList().size());
+        String numberAvailableDevices = Integer.toString(getmService().getArrayList().size());
         TextView text = (TextView) getActivity().findViewById(R.id.numberPeers);
         text.setVisibility(View.VISIBLE);
         text.setText(String.format("%s peers", numberAvailableDevices));
@@ -81,9 +79,9 @@ public class HotspotFragment extends Fragment {
 
         //if (intent.hasExtra("what") && intent.getExtras().getString("what", "").equals("connectivity_changed")) {
 
-            NetworkInfo network_info = mService.getNetwork_info();
-            WifiP2pInfo p2p_info = mService.getP2p_info();
-            WifiP2pGroup wifiP2pGroup = mService.getP2p_group();
+            NetworkInfo network_info = getmService().getNetwork_info();
+            WifiP2pInfo p2p_info = getmService().getP2p_info();
+            WifiP2pGroup wifiP2pGroup = getmService().getP2p_group();
 
             if (intent.hasExtra("currentDeviceConnected")) {
                 //String macAddress = intent.getExtras().getString("currentDeviceConnected");
@@ -92,11 +90,11 @@ public class HotspotFragment extends Fragment {
 
                     if (p2p_info.isGroupOwner) {
                         Snackbar.make(activity_view, "You are the group owner", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                        mService.startNegotiationServer(false, null);
+                        getmService().startNegotiationServer(false, null);
                     } else {
                         InetAddress groupOwnerAddress = p2p_info.groupOwnerAddress;
                         Snackbar.make(activity_view, "You are only a member of the group", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                        mService.startNegotiationClient(groupOwnerAddress, false, null);
+                        getmService().startNegotiationClient(groupOwnerAddress, false, null);
                     }
 
                 }
@@ -111,9 +109,7 @@ public class HotspotFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        getActivity().unbindService(mConnection);
         getActivity().unregisterReceiver(updateUIReceiver);
-        mBound = false;
     }
 
     @Override
@@ -129,6 +125,11 @@ public class HotspotFragment extends Fragment {
         initFragment();
     }
 
+    public WiFiDirectBroadcastService getmService() {
+        MainActivity act = (MainActivity) getActivity();
+        return act.getmService();
+    }
+
     private void initFragment(){
         IntentFilter filter = new IntentFilter();
         filter.addAction("com.flashwifi.wifip2p.update_ui");
@@ -138,6 +139,10 @@ public class HotspotFragment extends Fragment {
         updateUIReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                if (getActivity() == null) {
+                    Log.d(TAG, "onReceive: getActivity is null");
+                    return;
+                }
                 if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
                     String mac = intent.getStringExtra("peer_mac_address");
                     ToggleButton toggle = (ToggleButton) getActivity().findViewById(R.id.startAPButton);
@@ -157,10 +162,6 @@ public class HotspotFragment extends Fragment {
 
         getActivity().registerReceiver(updateUIReceiver, filter);
 
-        // Bind to Service
-        Intent intent = new Intent(getActivity(), WiFiDirectBroadcastService.class);
-        getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-
         initUI();
 
         testInternetConnection();
@@ -185,29 +186,13 @@ public class HotspotFragment extends Fragment {
         // ToDo: Move this to a async task
         //boolean status = (isNetworkConnected() && isInternetAvailable());
     }
-
-    private boolean isNetworkConnected() {
-        ConnectivityManager cm = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        return cm.getActiveNetworkInfo() != null;
-    }
-
-    public boolean isInternetAvailable() {
-        try {
-            InetAddress ipAddr = InetAddress.getByName("google.com");
-            return !ipAddr.getHostAddress().equals("");
-
-        } catch (Exception e) {
-            return false;
-        }
-    }
     
     private void startDiscovery() {
         final View activity_view = getActivity().findViewById(R.id.drawer_layout);
-        if (mBound) {
-            mService.setInRoleConsumer(false);
-            mService.setInRoleHotspot(true);
-            mService.getPeerList(new WifiP2pManager.ActionListener() {
+        if (getmService() != null) {
+            getmService().setInRoleConsumer(false);
+            getmService().setInRoleHotspot(true);
+            getmService().getPeerList(new WifiP2pManager.ActionListener() {
                 @Override
                 public void onSuccess() {
                     // show progress wheel
@@ -228,12 +213,12 @@ public class HotspotFragment extends Fragment {
 
     private void stopDiscovery() {
         final View activity_view = getActivity().findViewById(R.id.drawer_layout);
-        if (mBound) {
-            mService.stopDiscovery(new WifiP2pManager.ActionListener() {
+        if (getmService() != null) {
+            getmService().stopDiscovery(new WifiP2pManager.ActionListener() {
                 @Override
                 public void onSuccess() {
-                    mService.setInRoleConsumer(false);
-                    mService.setInRoleHotspot(false);
+                    getmService().setInRoleConsumer(false);
+                    getmService().setInRoleHotspot(false);
                     Snackbar.make(activity_view, "Stopped Hotspot mode", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                     ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
                     progressBar.setVisibility(View.INVISIBLE);
@@ -241,8 +226,8 @@ public class HotspotFragment extends Fragment {
 
                 @Override
                 public void onFailure(int reasonCode) {
-                    mService.setInRoleConsumer(false);
-                    mService.setInRoleHotspot(false);
+                    getmService().setInRoleConsumer(false);
+                    getmService().setInRoleHotspot(false);
                     Snackbar.make(activity_view, "Aaaargh :( Problem stopping discovery", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                     ProgressBar progressBar = (ProgressBar) getActivity().findViewById(R.id.progressbarAP);
                     progressBar.setVisibility(View.INVISIBLE);
@@ -255,12 +240,11 @@ public class HotspotFragment extends Fragment {
     private void initUI() {
         final View activity_view = getActivity().findViewById(R.id.drawer_layout);
         final ToggleButton button = (ToggleButton) getActivity().findViewById(R.id.startAPButton);
-        //button.setChecked(mService.isInRoleHotspot());
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (mBound) {
-                    if (!mService.isSetup()) {
+                if (getmService() != null) {
+                    if (!getmService().isSetup()) {
                         Snackbar.make(activity_view, "Please enable WiFi P2P", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                         button.setChecked(false);
                         return;
@@ -276,23 +260,4 @@ public class HotspotFragment extends Fragment {
             }
         });
     }
-
-    /** Defines callbacks for service binding, passed to bindService() */
-    private ServiceConnection mConnection = new ServiceConnection() {
-
-        @Override
-        public void onServiceConnected(ComponentName className,
-                                       IBinder service) {
-            // We've bound to LocalService, cast the IBinder and get LocalService instance
-            WiFiDirectBroadcastService.LocalBinder binder = (WiFiDirectBroadcastService.LocalBinder) service;
-            mService = binder.getService();
-            mBound = true;
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName arg0) {
-            mBound = false;
-        }
-    };
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index 926c866..e2f6c10 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -1,5 +1,6 @@
 package com.flashwifi.wifip2p;
 
+import android.app.ActivityManager;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.BroadcastReceiver;
@@ -71,15 +72,27 @@ public class MainActivity extends AppCompatActivity
                             intent.getStringExtra("key"));
                 } else if (intent.getAction().equals("com.flashwifi.wifip2p.stop_roaming")) {
                     Log.d(TAG, "onReceive: Reset billing state");
-                    mService.resetBillingState();
-                    mService.setInRoleConsumer(false);
-                    mService.setInRoleHotspot(false);
+
                 }
             }
         };
         registerReceiver(updateUIReceiver, filter);
     }
 
+    public boolean isTheServiceRunning() {
+        return isMyServiceRunning(WiFiDirectBroadcastService.class);
+    }
+
+    private boolean isMyServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     protected void onPause() {
         super.onPause();
@@ -110,7 +123,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void initUi() {
-        final Switch switch_ = (Switch) findViewById(R.id.wifiSwitch);
+        /*final Switch switch_ = (Switch) findViewById(R.id.wifiSwitch);
         switch_.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
@@ -124,7 +137,7 @@ public class MainActivity extends AppCompatActivity
                     mService.disableService();
                 }
             }
-        });
+        });*/
     }
 
     @Override
@@ -153,10 +166,29 @@ public class MainActivity extends AppCompatActivity
 
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
+        beginForegroundService();
+
         Intent intent2 = new Intent(this, WiFiDirectBroadcastService.class);
         bindService(intent2, mConnection, Context.BIND_AUTO_CREATE);
     }
 
+    public WiFiDirectBroadcastService getmService() {
+        if (mBound) {
+            return mService;
+        }
+        return null;
+    }
+
+    private void beginForegroundService() {
+        if (!isTheServiceRunning()) {
+            Intent startIntent = new Intent(MainActivity.this, WiFiDirectBroadcastService.class);
+            startIntent.setAction(Constants.ACTION.STARTFOREGROUND_ACTION);
+            startService(startIntent);
+        } else {
+            Log.d(TAG, "beginForegroundService: Service is already running");
+        }
+    }
+
     private void initEverything() {
         subscribeToBroadcasts();
         initUi();
@@ -381,6 +413,7 @@ public class MainActivity extends AppCompatActivity
             WiFiDirectBroadcastService.LocalBinder binder = (WiFiDirectBroadcastService.LocalBinder) service;
             mService = binder.getService();
             mBound = true;
+            mService.enableService();
         }
 
         @Override
diff --git a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
index 78e2bc2..954ee06 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/RoamingActivity.java
@@ -232,50 +232,7 @@ public class RoamingActivity extends AppCompatActivity {
     }
 
     private void cancelNotification() {
-        NotificationManager mNotificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
-        mNotificationManager.cancel(1);
-    }
-
-
-    private void showNotification() {
-        // The id of the channel.
-        String CHANNEL_ID = "com.flashwifi.wifip2p.roaming_1";
-
-        String contentText = mService.isInRoleHotspot() ? "You are providing" : "You are consuming";
-
-        // ToDo: make this work on high API version
-        NotificationCompat.Builder mBuilder =
-                new NotificationCompat.Builder(this)
-                        .setSmallIcon(R.drawable.icon_tethering_on)
-                        .setContentTitle("IOTA HOTSPOT")
-                        .setContentText(contentText);
-        // Creates an explicit intent for an Activity in your app
-        Intent resultIntent = new Intent(this, RoamingActivity.class);
-
-        // The stack builder object will contain an artificial back stack for the
-        // started Activity.
-        // This ensures that navigating backward from the Activity leads out of
-        // your app to the Home screen.
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
-        // Adds the back stack for the Intent (but not the Intent itself)
-        stackBuilder.addParentStack(RoamingActivity.class);
-        // Adds the Intent that starts the Activity to the top of the stack
-        stackBuilder.addNextIntent(resultIntent);
-        PendingIntent resultPendingIntent =
-                stackBuilder.getPendingIntent(
-                        0,
-                        PendingIntent.FLAG_UPDATE_CURRENT
-                );
-        mBuilder.setContentIntent(resultPendingIntent);
-        NotificationManager mNotificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-
-        // mNotificationId is a unique integer your app uses to identify the
-        // notification. For example, to cancel the notification, you can pass its ID
-        // number to NotificationManager.cancel().
-        mNotificationManager.notify(1, mBuilder.build());
     }
 
 
@@ -326,7 +283,8 @@ public class RoamingActivity extends AppCompatActivity {
 
         updateBillingCard();
 
-        showNotification();
+        // ToDo: update notification
+        //showNotification();
     }
 
     private void endRoaming() {
@@ -350,6 +308,12 @@ public class RoamingActivity extends AppCompatActivity {
             mService.disconnectAP();
         }
         mService.setRoaming(false);
+        mService.resetBillingState();
+        mService.setInRoleConsumer(false);
+        mService.setInRoleHotspot(false);
+
+        PeerStore.getInstance().clear();
+
         // hide the spinner and the stop button
         ProgressBar stopProgressBar = (ProgressBar) findViewById(R.id.stopProgressBar);
         stopProgressBar.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
index 83fde43..2a45300 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java
@@ -33,6 +33,7 @@ import java.net.InetAddress;
 import java.util.ArrayList;
 
 import com.flashwifi.wifip2p.broadcast.WiFiDirectBroadcastService;
+import com.flashwifi.wifip2p.iotaFlashWrapper.Main;
 
 /**
  * Fragment that appears in the "content_frame", shows a planet
@@ -41,8 +42,6 @@ public class SearchFragment extends Fragment {
 
     public final static String TAG = "SearchActivity";
 
-    WiFiDirectBroadcastService mService;
-    boolean mBound = false;
     BroadcastReceiver updateUIReceiver = null;
 
     ArrayList<String> arrayList;
@@ -64,6 +63,14 @@ public class SearchFragment extends Fragment {
         return rootView;
     }
 
+    public WiFiDirectBroadcastService getmService() {
+        MainActivity act = (MainActivity) getActivity();
+        if (act != null) {
+            return act.getmService();
+        }
+        return null;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -112,7 +119,7 @@ public class SearchFragment extends Fragment {
     }
 
     private void startNegotiationProtocol(String macAddress){
-        WifiP2pInfo p2p_info = mService.getP2p_info();
+        WifiP2pInfo p2p_info = getmService().getP2p_info();
 
         if (p2p_info.isGroupOwner) {
             startNegotiationProtocolServer(macAddress);
@@ -123,13 +130,13 @@ public class SearchFragment extends Fragment {
 
     private void startNegotiationProtocolServer(String macAddress) {
         // starts the server if necessary
-        WifiP2pInfo p2p_info = mService.getP2p_info();
-        NetworkInfo network_info = mService.getNetwork_info();
+        WifiP2pInfo p2p_info = getmService().getP2p_info();
+        NetworkInfo network_info = getmService().getNetwork_info();
 
         if (network_info.getState() == NetworkInfo.State.CONNECTED) {
             if (p2p_info.isGroupOwner) {
                 Log.d(TAG, "You are the group owner");
-                mService.startNegotiationServer(true, macAddress);
+                getmService().startNegotiationServer(true, macAddress);
                 Log.d(TAG, "SocketServer started");
             }
         }
@@ -137,8 +144,8 @@ public class SearchFragment extends Fragment {
 
     private void startNegotiationProtocolClient(String macAddress){
         // starts the server if necessary
-        WifiP2pInfo p2p_info = mService.getP2p_info();
-        NetworkInfo network_info = mService.getNetwork_info();
+        WifiP2pInfo p2p_info = getmService().getP2p_info();
+        NetworkInfo network_info = getmService().getNetwork_info();
 
         if (network_info.getState() == NetworkInfo.State.CONNECTED) {
             if (!p2p_info.isGroupOwner) {
@@ -146,7 +153,7 @@ public class SearchFragment extends Fragment {
                 // groupOwnerAddress = p2p_info.groupOwnerAddress;
                 InetAddress groupOwnerAddress = p2p_info.groupOwnerAddress;
                 Log.d(TAG, "Group owner address: " + p2p_info.groupOwnerAddress.getHostAddress());
-                mService.startNegotiationClient(groupOwnerAddress, true, macAddress);
+                getmService().startNegotiationClient(groupOwnerAddress, true, macAddress);
                 Log.d(TAG, "Client Socket started");
             }
         }
@@ -155,10 +162,6 @@ public class SearchFragment extends Fragment {
     @Override
     public void onPause() {
         super.onPause();
-        if (mBound) {
-            getActivity().unbindService(mConnection);
-            mBound = false;
-        }
         if (updateUIReceiver != null) {
             getActivity().unregisterReceiver(updateUIReceiver);
             updateUIReceiver = null;
@@ -168,10 +171,6 @@ public class SearchFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        if (mBound) {
-            getActivity().unbindService(mConnection);
-            mBound = false;
-        }
         if (updateUIReceiver != null) {
             getActivity().unregisterReceiver(updateUIReceiver);
             updateUIReceiver = null;
@@ -200,6 +199,10 @@ public class SearchFragment extends Fragment {
         updateUIReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                if (getActivity() == null) {
+                    Log.d(TAG, "onReceive: getActivity is null");
+                    return;
+                }
                 Log.d("", "onReceive: FRAGMENT HAT WAS");
                 if (intent.getAction().equals("com.flashwifi.wifip2p.start_roaming")) {
                     String mac = intent.getStringExtra("peer_mac_address");
@@ -217,10 +220,6 @@ public class SearchFragment extends Fragment {
         };
         getActivity().registerReceiver(updateUIReceiver, filter);
 
-        // Bind to Service
-        Intent intent = new Intent(getActivity(), WiFiDirectBroadcastService.class);
-        getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-
         view = getActivity().findViewById(R.id.fragment_view);
 
         initUI();
@@ -235,26 +234,20 @@ public class SearchFragment extends Fragment {
         toggle.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
-                if (mBound) {
-                    if (!mService.isSetup()) {
-                        Snackbar.make(view, "Please enable WiFi P2P", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                        toggle.setChecked(false);
-                        return;
-                    }
+                if (!getmService().isSetup()) {
+                    Snackbar.make(view, "Please enable WiFi P2P", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                    toggle.setChecked(false);
+                    return;
                 }
                 updateList();
                 if (toggle.isChecked()) {
-                    if (mBound) {
-                        mService.setInRoleHotspot(false);
-                        mService.setInRoleConsumer(true);
-                        startSearching();
-                    }
+                    getmService().setInRoleHotspot(false);
+                    getmService().setInRoleConsumer(true);
+                    startSearching();
                 } else {
-                    if (mBound) {
-                        mService.setInRoleHotspot(false);
-                        mService.setInRoleConsumer(false);
-                        stopSearching();
-                    }
+                    getmService().setInRoleHotspot(false);
+                    getmService().setInRoleConsumer(false);
+                    stopSearching();
                 }
             }
         });
@@ -298,7 +291,7 @@ public class SearchFragment extends Fragment {
 
 
     public void startChat(final String address, String name) {
-        mService.connect(address, new WifiP2pManager.ActionListener() {
+        getmService().connect(address, new WifiP2pManager.ActionListener() {
             @Override
             public void onSuccess() {
                 Toast.makeText(view.getContext(), "Connected to peer", Toast.LENGTH_SHORT).show();
@@ -315,53 +308,31 @@ public class SearchFragment extends Fragment {
     }
 
     private void stopSearching() {
-        if (mBound) {
-            mService.stopDiscovery(new WifiP2pManager.ActionListener() {
-                @Override
-                public void onSuccess() {
-                    Snackbar.make(view, "Stopped search", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                }
+        getmService().stopDiscovery(new WifiP2pManager.ActionListener() {
+            @Override
+            public void onSuccess() {
+                Snackbar.make(view, "Stopped search", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            }
 
-                @Override
-                public void onFailure(int reasonCode) {
-                    Snackbar.make(view, "Aaaargh :( problem stopping search!", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                }
-            });
-        }
+            @Override
+            public void onFailure(int reasonCode) {
+                Snackbar.make(view, "Aaaargh :( problem stopping search!", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            }
+        });
     }
 
     public void startSearching() {
+        getmService().getPeerList(new WifiP2pManager.ActionListener() {
+            @Override
+            public void onSuccess() {
+                Snackbar.make(view, "Successfully searched for peers", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            }
 
-        if (mBound) {
-            mService.getPeerList(new WifiP2pManager.ActionListener() {
-                @Override
-                public void onSuccess() {
-                    Snackbar.make(view, "Successfully searched for peers", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                }
+            @Override
+            public void onFailure(int reasonCode) {
+                Snackbar.make(view, "Aaaargh :( Peering problem!", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+            }
+        });
 
-                @Override
-                public void onFailure(int reasonCode) {
-                    Snackbar.make(view, "Aaaargh :( Peering problem!", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                }
-            });
-        }
     }
-
-    /** Defines callbacks for service binding, passed to bindService() */
-    private ServiceConnection mConnection = new ServiceConnection() {
-
-        @Override
-        public void onServiceConnected(ComponentName className,
-                                       IBinder service) {
-            // We've bound to LocalService, cast the IBinder and get LocalService instance
-            WiFiDirectBroadcastService.LocalBinder binder = (WiFiDirectBroadcastService.LocalBinder) service;
-            mService = binder.getService();
-            mBound = true;
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName arg0) {
-            mBound = false;
-        }
-    };
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
index 221531d..8431659 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingClient.java
@@ -197,6 +197,7 @@ public class BillingClient {
 
                 if (error_count >= maxErrorCount) {
                     // stop trying to connect
+                    Log.d(TAG, "start: error count too high");
                     state = State.ERROR;
                     sendUpdateUIBroadcastWithMessage("Exit");
                 }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
index e63b01f..1e85d1d 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/billing/BillingServer.java
@@ -244,13 +244,17 @@ public class BillingServer {
                 e.printStackTrace();
             } finally {
                 try {
-                    socketWrapper.close();
-                } catch (IOException e) {
+                    if (socketWrapper != null) {
+                        socketWrapper.close();
+                    }
+                } catch (Exception e) {
 
                 }
                 try {
-                    serverSocket.close();
-                } catch (IOException e) {
+                    if (serverSocket != null) {
+                        serverSocket.close();
+                    }
+                } catch (Exception e) {
 
                 }
             }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
index 9c5dd63..a75792e 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java
@@ -1,11 +1,16 @@
 package com.flashwifi.wifip2p.broadcast;
 import android.app.Activity;
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.DhcpInfo;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pConfig;
@@ -20,9 +25,14 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.text.format.Formatter;
 import android.util.Log;
 
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
+import com.flashwifi.wifip2p.Constants;
+import com.flashwifi.wifip2p.MainActivity;
+import com.flashwifi.wifip2p.R;
 import com.flashwifi.wifip2p.accesspoint.AccessPointTask;
 import com.flashwifi.wifip2p.accesspoint.ConnectTask;
 import com.flashwifi.wifip2p.accesspoint.StopAccessPointTask;
@@ -38,10 +48,14 @@ import com.flashwifi.wifip2p.protocol.NegotiationFinalization;
 import com.flashwifi.wifip2p.protocol.NegotiationOffer;
 import com.flashwifi.wifip2p.protocol.NegotiationOfferAnswer;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -96,6 +110,57 @@ public class WiFiDirectBroadcastService extends Service {
     ConnectTask connectTask;
     private boolean negotiatorRunning = false;
 
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent.getAction().equals(Constants.ACTION.STARTFOREGROUND_ACTION)) {
+            Log.i(TAG, "Received Start Foreground Intent ");
+            Intent notificationIntent = new Intent(this, MainActivity.class);
+            notificationIntent.setAction(Constants.ACTION.MAIN_ACTION);
+            notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                    | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0,
+                    notificationIntent, 0);
+/*
+            Intent previousIntent = new Intent(this, WiFiDirectBroadcastService.class);
+            previousIntent.setAction(Constants.ACTION.PREV_ACTION);
+            PendingIntent ppreviousIntent = PendingIntent.getService(this, 0,
+                    previousIntent, 0);
+
+            Intent playIntent = new Intent(this, WiFiDirectBroadcastService.class);
+            playIntent.setAction(Constants.ACTION.PLAY_ACTION);
+            PendingIntent pplayIntent = PendingIntent.getService(this, 0,
+                    playIntent, 0);*/
+
+            Intent stopIntent = new Intent(this, WiFiDirectBroadcastService.class);
+            stopIntent.setAction(Constants.ACTION.STOPFOREGROUND_ACTION);
+            PendingIntent pstopIntent = PendingIntent.getService(this, 0,
+                    stopIntent, 0);
+
+            Bitmap icon = BitmapFactory.decodeResource(getResources(),
+                    R.drawable.icon_tethering_on);
+
+            Notification notification = new NotificationCompat.Builder(this)
+                    .setContentTitle(getString(R.string.app_name))
+                    .setTicker(getString(R.string.app_name))
+                    .setContentText(getString(R.string.notification_doing_nothing))
+                    .setSmallIcon(R.drawable.icon_tethering_on)
+                    .setLargeIcon(
+                            Bitmap.createScaledBitmap(icon, 128, 128, false))
+                    .setContentIntent(pendingIntent)
+                    .setOngoing(true)
+                    .addAction(R.drawable.icon_tethering_off, "Stop",
+                            pstopIntent).build();
+            startForeground(Constants.NOTIFICATION_ID.FOREGROUND_SERVICE,
+                    notification);
+        } else if (intent.getAction().equals(
+                Constants.ACTION.STOPFOREGROUND_ACTION)) {
+            Log.i(TAG, "Received Stop Foreground Intent");
+            stopForeground(true);
+            stopSelf();
+        }
+        return START_STICKY;
+    }
+
     public boolean isSetup() {
         return setup;
     }
@@ -165,9 +230,23 @@ public class WiFiDirectBroadcastService extends Service {
                 @Override
                 public void run() {
                     BillingClient billingClient = new BillingClient(mac, getApplicationContext());
-                    // ToDo: get the AP gateway ip address
+                    // Gget the AP gateway ip address
                     // https://stackoverflow.com/questions/9035784/how-to-know-ip-address-of-the-router-from-code-in-android
-                    billingClient.start("192.168.43.1");
+                    final WifiManager manager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
+                    final DhcpInfo dhcp = manager.getDhcpInfo();
+                    byte[] myIPAddress = BigInteger.valueOf(dhcp.gateway).toByteArray();
+                    ArrayUtils.reverse(myIPAddress);
+                    InetAddress myInetIP = null;
+                    String routerIP = null;
+                    try {
+                        myInetIP = InetAddress.getByAddress(myIPAddress);
+                        routerIP = myInetIP.getHostAddress();
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                        routerIP = "192.168.43.1";
+                    }
+                    Log.d(TAG, "DHCP gateway: " + routerIP);
+                    billingClient.start(routerIP);
                     // ToDo: handle billingServer EXIT CODES
                     // -> close the roaming etc.
                 }
@@ -379,7 +458,7 @@ public class WiFiDirectBroadcastService extends Service {
             stopAllTasks();
             thread.start();
         } else {
-            Log.d(TAG, "startNegotiationClient: BLOCKED due to roaming state");
+            Log.d(TAG, "startNegotiationClient: BLOCKED due to roaming state or negotiator running");
         }
 
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
index ad9c096..537234b 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/negotiation/Negotiator.java
@@ -301,11 +301,11 @@ public class Negotiator {
         if (iotaPerMegabyte < 0) {
             return error(R.string.err_sell_price_bad_setting, false);
         }
-        int minMinutes = Integer.valueOf(prefs.getString("edit_text_min_minutes", "-1"));
+        int minMinutes = Integer.valueOf(prefs.getString("edit_text_sell_min_minutes", "-1"));
         if (minMinutes < 0) {
             return error(R.string.err_min_minutes_bad_setting, false);
         }
-        int maxMinutes = Integer.valueOf(prefs.getString("edit_text_max_minutes", "-1"));
+        int maxMinutes = Integer.valueOf(prefs.getString("edit_text_sell_max_minutes", "-1"));
         if (maxMinutes < 0) {
             return error(R.string.err_max_minutes_bad_setting, false);
         }
diff --git a/app/src/main/res/layout/activity_roaming.xml b/app/src/main/res/layout/activity_roaming.xml
index b522c5d..39b9c52 100644
--- a/app/src/main/res/layout/activity_roaming.xml
+++ b/app/src/main/res/layout/activity_roaming.xml
@@ -102,10 +102,14 @@
 
             <TextView
                 android:id="@+id/stopText"
+                android:gravity="center"
+                android:layout_margin="5dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/channelClosed"
-                android:visibility="invisible"/>
+                android:visibility="gone"/>
+
+
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f3dfb83..45e9934 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -19,7 +19,7 @@
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay">
-            <Switch
+            <!--<Switch
                 android:layout_width="wrap_content"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_gravity="end"
@@ -27,7 +27,7 @@
                 android:checked="false"
                 android:hint="@string/wifi_p2p_discovery"
                 android:width="120dp"
-                android:id="@+id/wifiSwitch"/>
+                android:id="@+id/wifiSwitch"/>-->
         </android.support.v7.widget.Toolbar>
 
 
diff --git a/app/src/main/res/layout/fragment_hotspot.xml b/app/src/main/res/layout/fragment_hotspot.xml
index 9d3d59a..c90c2bf 100644
--- a/app/src/main/res/layout/fragment_hotspot.xml
+++ b/app/src/main/res/layout/fragment_hotspot.xml
@@ -19,7 +19,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/startAP" />
+            android:textOn="@string/stopAP"
+            android:textOff="@string/startAPText" />
 
         <ProgressBar
             android:id="@+id/progressbarAP"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d5d53f..44b3d55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,5 +68,8 @@
     <string name="channelClosed">The payment channel was closed.</string>
     <string name="initRetransfer">Initializing retransfer</string>
     <string name="welcome">Welcome to the Wifi Iota Hotspot App</string>
+    <string name="notification_doing_nothing">Currently doing nothing</string>
+    <string name="stopAP">Stop Hotspot</string>
+    <string name="startAPText">Start Hotspot</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7c861bd..195783d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -98,7 +98,7 @@
         android:key="pref_key_payment_settings">
 
         <EditTextPreference
-            android:defaultValue="10"
+            android:defaultValue="15"
             android:key="edit_text_buy_price"
             android:inputType="number"
             android:selectAllOnFocus="true"

From 653f137a99b97afce093fec72e415abfb8aa2a6f Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Wed, 24 Jan 2018 00:16:15 -0500
Subject: [PATCH 27/29] Wallet Balance Check Fix + Private Testnet is now
 default node

-Fixed key index change check and storage, which fixes balance value
-Cleaned up println statements
-Made (private) testnet default to true
---
 .../Requests/WalletAddressChecker.java        | 19 +------------
 .../Requests/WalletBalanceChecker.java        | 28 -------------------
 .../Requests/WalletTestnetTokenGen.java       |  5 ----
 .../Requests/WalletTransferRequest.java       |  2 --
 app/src/main/res/xml/preferences.xml          |  2 +-
 5 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
index 6c4e7ee..bf7da79 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -76,14 +76,12 @@ public class WalletAddressChecker {
                 SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
                 String security = prefManager.getString("pref_key_security","2");
                 int securityInt = Integer.parseInt(security);
-                System.out.println("securityInt: "+securityInt);
                 addressResponse = api.getNewAddress(seed, securityInt, keyIndex, true, 1, false);
             } catch (ArgumentException e) {
                 e.printStackTrace();
             }
 
             if(addressResponse != null) {
-                System.out.println("WalletAddressChecker - Address: "+addressResponse.getAddresses().get(0));
                 addressList.add(addressResponse.getAddresses().get(0));
 
                 String[] addressesCheckArray = new String[1];
@@ -110,11 +108,6 @@ public class WalletAddressChecker {
 
                     String curHash = transactionsForAddress.get(0).getHash();
                     hashStringList.add(curHash);
-
-                    System.out.println("WalletAddressChecker value: "+transactionsForAddress.get(0).getValue());
-                    System.out.println("WalletAddressChecker time: "+transactionsForAddress.get(0).getAttachmentTimestamp());
-                    System.out.println("WalletAddressChecker address: "+transactionsForAddress.get(0).getAddress());
-
                     keyIndex = keyIndex + 1;
                 }
             }
@@ -143,21 +136,11 @@ public class WalletAddressChecker {
             e.printStackTrace();
         }
 
-        System.out.println("containsPendingTransaction: "+containsPendingTransaction);
-
         if(!containsPendingTransaction){
             //all confirmed transactions, ok to change keyIndex
-
             if(keyIndex != getKeyIndex()){
                 keyIndexChanged = true;
-                if(keyIndex == 0){
-                    //Put the initial address to search. No transactions for the seed yet.
-                    putKeyIndex(keyIndex);
-                }
-                else{
-                    //Put the second last address to search
-                    putKeyIndex(keyIndex-1);
-                }
+                putKeyIndex(keyIndex);
             }
         }
 
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index e7519a5..4831671 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -83,8 +83,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
             boolean containsPendingTransactions = addressChecker.getContainsPendingTransaction();
             boolean keyIndexChanged = addressChecker.getkeyIndexChanged();
 
-            System.out.println("seed: "+seed);
-
             if(addressList != null && addressList.get(0).equals("Unable to resolve host")){
                 AddressBalanceTransfer addressBalanceTransfer = new AddressBalanceTransfer(null,null,"hostError");
                 Message completeMessage = mHandler.obtainMessage(BALANCE_RETRIEVE_TASK_COMPLETE, addressBalanceTransfer);
@@ -126,10 +124,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
     public String getBalance(List<String> inAddresses, boolean containsPendingTransactions, boolean keyIndexChanged){
 
-        for (String inAddress : inAddresses) {
-            System.out.println("addressGetBalance: "+inAddress);
-        }
-
         String updatedBalanceString;
         try {
             StopWatch stopWatch = new StopWatch();
@@ -140,11 +134,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
             GetBalancesAndFormatResponse balanceResponse = api.getBalanceAndFormat(inAddresses, 0, 0, stopWatch, securityInt);
             long total = balanceResponse.getTotalBalance();
-            System.out.println("getTotalBalance: "+total);
-
             long storedBaseBalance = Long.parseLong(getBaseSharedPrefKeyBalance());
-            System.out.println("getBaseSharedPreKeyBalance: "+storedBaseBalance);
-
             long updatedBaseBalance = storedBaseBalance + total;
             updatedBalanceString = Long.toString(updatedBaseBalance);
 
@@ -163,10 +153,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
             //No Pending Transactions, new confirmed transactions
             else if(!containsPendingTransactions && keyIndexChanged){
                 putBaseSharedPrefBalance(updatedBalanceString);
-
-                System.out.println("Store new base balance");
-                System.out.println("updated balance: "+updatedBaseBalance);
-
                 updatedBalanceString = Long.toString(updatedBaseBalance);
                 putSharedPrefBalance(updatedBalanceString);
             }
@@ -177,17 +163,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
         return updatedBalanceString;
     }
 
-    private String getSharedPrefKeyBalance() {
-        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
-        int keyIndex = sharedPref.getInt("keyIndex",0);
-
-        System.out.println("KeyIndex: "+keyIndex);
-
-        String defaultValue = "0";
-        String storedBalance = sharedPref.getString("balance",defaultValue);
-        return storedBalance;
-    }
-
     private void putSharedPrefBalance(String inBalance) {
         SharedPreferences sharedPref = context.getSharedPreferences(
                 prefFile, Context.MODE_PRIVATE);
@@ -199,9 +174,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
     private String getBaseSharedPrefKeyBalance() {
         SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
         int keyIndex = sharedPref.getInt("keyIndex",0);
-
-        System.out.println("KeyIndex: "+keyIndex);
-
         String defaultValue = "0";
         String storedBalance = sharedPref.getString("baseBalance",defaultValue);
         return storedBalance;
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
index f905aa8..727268f 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java
@@ -148,8 +148,6 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
 
     private void transferToWallet(List<String> destAddressses, TokenGenJSONResponse token) {
 
-        System.out.println("2000 seed: "+token.getSeed());
-
         if(destAddressses != null && destAddressses.get(0).equals("Unable to resolve host")){
             //Host Error
             Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE, "hostError");
@@ -161,9 +159,6 @@ public class WalletTestnetTokenGen extends AsyncTask<Void, Void, Void> {
             completeMessage.sendToTarget();
             String destAddress = destAddressses.get(destAddressses.size()-1);
 
-            System.out.println("DestAddress: "+destAddress);
-            System.out.println("TokenAmt: "+token.getAmount().toString());
-
             WalletTransferRequest transferRequest = new WalletTransferRequest(destAddress,token.getSeed(),token.getAmount().toString(),"","",context,testnetTokenGenHandler);
             transferRequest.execute();
         }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
index e5d00dd..0720dd5 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java
@@ -107,7 +107,6 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         try {
             if(testnet) {
                 //Testnet
-                System.out.println("WalletTransferRequest: Testnet");
                 if(testnetPrivate){
                     sendTransferResponse = api.sendTransfer(appWalletSeed, securityInt, 4, 3, transfers, null, null, false);
                 }
@@ -155,7 +154,6 @@ public class WalletTransferRequest extends AsyncTask<Void, Void, Void> {
         else{
             transferResult = "Transfer error: Send Response not received";
         }
-        System.out.println("WalletTransferRequest - result: "+transferResult);
         return transferResult;
     }
 }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 195783d..a5f5ace 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -44,7 +44,7 @@
 
 
         <SwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="pref_key_switch_testnet"
             android:title="Testnet" />
 

From 457f202f7fcda361c05959afb00aac4c640d7f07 Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Wed, 24 Jan 2018 01:14:35 -0500
Subject: [PATCH 28/29] Added balance + update date caching

-getSharedPreferences now contain balanceDateUpdate and balance
-balance displayed even if offline, displays cached
---
 .../flashwifi/wifip2p/FundWalletFragment.java |  2 +-
 .../wifip2p/WithdrawWalletFragment.java       |  4 +--
 .../Requests/WalletAddressChecker.java        | 24 ++++++++------
 .../Requests/WalletBalanceChecker.java        | 31 +++++++++++++++++--
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java b/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
index e45b83a..54ef4fc 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/FundWalletFragment.java
@@ -85,7 +85,7 @@ public class FundWalletFragment extends Fragment {
                         transactionInProgress = false;
 
                         if(returnStatus.equals("noError")){
-                            balanceTextView.setText(balance + " i");
+                            balanceTextView.setText(balance);
                             addressTextView.setText(depositAddress);
                             createAddressQRCode(depositAddress);
                             makeToastFundWalletFragment("Balance and address updated");
diff --git a/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java b/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
index 9fe3da6..5a18fe3 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/WithdrawWalletFragment.java
@@ -95,11 +95,11 @@ public class WithdrawWalletFragment extends Fragment {
                         transactionInProgress = false;
 
                         if(returnStatus.equals("noError")){
-                            balanceTextView.setText(appWalletBalance + " i");
+                            balanceTextView.setText(appWalletBalance);
                             makeToastFundWalletFragment("Balance updated");
                         }
                         else if (returnStatus.equals("noErrorNoUpdateMessage")){
-                            balanceTextView.setText(appWalletBalance + " i");
+                            balanceTextView.setText(appWalletBalance);
                             clearAllTransferValues();
                             makeFieldsEditable();
                         }
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
index bf7da79..617d633 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java
@@ -79,6 +79,7 @@ public class WalletAddressChecker {
                 addressResponse = api.getNewAddress(seed, securityInt, keyIndex, true, 1, false);
             } catch (ArgumentException e) {
                 e.printStackTrace();
+                return addressList;
             }
 
             if(addressResponse != null) {
@@ -99,7 +100,7 @@ public class WalletAddressChecker {
                     }
                 }
 
-                if(transactionsForAddress.isEmpty() || (transactionsForAddress.size() == 0 || transactionsForAddress.equals(null))){
+                if(transactionsForAddress == null || transactionsForAddress.isEmpty() || (transactionsForAddress.size() == 0)){
                     //Transactions not found, use this address
                     foundAddress = true;
                 }
@@ -123,17 +124,20 @@ public class WalletAddressChecker {
         //Check whether pending transactions exist
         containsPendingTransaction = false;
         keyIndexChanged = false;
+        GetInclusionStateResponse inclusionResponse;
         try {
-            GetInclusionStateResponse inclusionResponse = api.getLatestInclusion(hashStringArray);
-            boolean[] states = inclusionResponse.getStates();
-
-            for (boolean state : states) {
-                if(!state){
-                    containsPendingTransaction = true;
-                }
-            }
-        } catch (ArgumentException e) {
+            inclusionResponse = api.getLatestInclusion(hashStringArray);
+        } catch (ArgumentException | IllegalStateException e) {
             e.printStackTrace();
+            return addressList;
+        }
+
+        boolean[] states = inclusionResponse.getStates();
+
+        for (boolean state : states) {
+            if(!state){
+                containsPendingTransaction = true;
+            }
         }
 
         if(!containsPendingTransaction){
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index 4831671..d587a47 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -10,6 +10,8 @@ import android.preference.PreferenceManager;
 import com.flashwifi.wifip2p.AddressBalanceTransfer;
 import com.flashwifi.wifip2p.R;
 
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.List;
 
 import jota.IotaAPI;
@@ -158,9 +160,33 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
             }
         } catch (ArgumentException | IllegalStateException e) {
             e.printStackTrace();
-            return null;
+            return getSharedPrefKeyBalance()+"i (cached: "+getSharedPrefKeyBalanceDateUpdate()+")";
         }
-        return updatedBalanceString;
+        String currentDateTimeString = DateFormat.getDateTimeInstance().format(new Date());
+        putSharedPrefBalanceDateUpdate(currentDateTimeString);
+        return updatedBalanceString+"i";
+    }
+
+    private void putSharedPrefBalanceDateUpdate(String currentDateTimeString) {
+        SharedPreferences sharedPref = context.getSharedPreferences(
+                prefFile, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putString("balanceDateUpdate", currentDateTimeString);
+        editor.apply();
+    }
+
+    private String getSharedPrefKeyBalanceDateUpdate() {
+        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
+        String defaultValue = "0";
+        String storedBalance = sharedPref.getString("balanceDateUpdate",defaultValue);
+        return storedBalance;
+    }
+
+    private String getSharedPrefKeyBalance() {
+        SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
+        String defaultValue = "0";
+        String storedBalance = sharedPref.getString("balance",defaultValue);
+        return storedBalance;
     }
 
     private void putSharedPrefBalance(String inBalance) {
@@ -173,7 +199,6 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
     private String getBaseSharedPrefKeyBalance() {
         SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE);
-        int keyIndex = sharedPref.getInt("keyIndex",0);
         String defaultValue = "0";
         String storedBalance = sharedPref.getString("baseBalance",defaultValue);
         return storedBalance;

From 3e96e2fba6850cfc7c2fa65ef47c88fb80a0faef Mon Sep 17 00:00:00 2001
From: Toby Woerthle <tobiaswoerthle@gmail.com>
Date: Wed, 24 Jan 2018 02:10:30 -0500
Subject: [PATCH 29/29] Balance check upon App start

-Added balance update and sharedPrefWrite upon app start
---
 .../com/flashwifi/wifip2p/MainActivity.java   | 46 ++++++++++++++++++-
 .../flashwifi/wifip2p/SettingsFragment.java   |  5 +-
 .../Requests/WalletBalanceChecker.java        |  2 +
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
index e2f6c10..83b1c05 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java
@@ -14,6 +14,8 @@ import android.net.wifi.p2p.WifiP2pManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
@@ -25,14 +27,13 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.CompoundButton;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.Switch;
 import android.widget.Toast;
 
 import com.flashwifi.wifip2p.billing.Accountant;
 import com.flashwifi.wifip2p.broadcast.WiFiDirectBroadcastService;
+import com.flashwifi.wifip2p.iotaAPI.Requests.WalletBalanceChecker;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener
@@ -41,6 +42,9 @@ public class MainActivity extends AppCompatActivity
     private static final String TAG = "MainAct";
     private String password;
     private String seed;
+    private static final int PREF_UPDATE = 2;
+    private static final int BALANCE_RETRIEVE_TASK_COMPLETE = 1;
+    private Handler balanceHandler;
 
     private DrawerLayout mDrawerLayout;
     private ListView mDrawerList;
@@ -153,6 +157,9 @@ public class MainActivity extends AppCompatActivity
         password = intent.getStringExtra("password");
         seed = intent.getStringExtra("seed");
 
+        setBalanceHandler();
+        updateBalance();
+
         Accountant.getInstance().setSeed(seed);
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -277,6 +284,11 @@ public class MainActivity extends AppCompatActivity
         return true;
     }
 
+    private void updateBalance() {
+        WalletBalanceChecker balanceChecker = new WalletBalanceChecker(this,this.getString(R.string.preference_file_key),seed, balanceHandler,PREF_UPDATE,true);
+        balanceChecker.execute();
+    }
+
     public void startSearchFragment() {
         if (mBound && mService.isInRoleHotspot()) {
             Toast.makeText(this, "Can't start search because you are hotspot", Toast.LENGTH_SHORT).show();
@@ -421,4 +433,34 @@ public class MainActivity extends AppCompatActivity
             mBound = false;
         }
     };
+
+    private void setBalanceHandler() {
+        //Handle post-asynctask activities
+        balanceHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message inputMessage) {
+                switch (inputMessage.what) {
+                    case BALANCE_RETRIEVE_TASK_COMPLETE:
+                        AddressBalanceTransfer addressBalanceTransfer = (AddressBalanceTransfer) inputMessage.obj;
+                        String returnStatus = addressBalanceTransfer.getMessage();
+                        if (returnStatus.equals("noError")) {
+                            makeToastBalance("Balance updated");
+                        } else if (returnStatus.equals("hostError")) {
+                            makeToastBalance("Unable to reach host (node)");
+                        } else if (returnStatus.equals("addressError")) {
+                            makeToastBalance("Error getting address");
+                        } else if (returnStatus.equals("balanceError")) {
+                            makeToastBalance("Error getting balance. May not be able to resolve host/node");
+                        } else {
+                            makeToastBalance("Unknown error");
+                        }
+                }
+            }
+        };
+    }
+
+    private void makeToastBalance(String message) {
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
index 1528867..89029de 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/SettingsFragment.java
@@ -103,13 +103,14 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         switch(key){
             case "pref_key_security":
-                makeToastSettingsFragment("Security Changed");
+                //makeToastSettingsFragment("Security Changed");
                 break;
             case "pref_key_network_timeout":
-                makeToastSettingsFragment("Network Timeout Changed");
+                //makeToastSettingsFragment("Network Timeout Changed");
                 break;
             case "pref_key_units":
                 makeToastSettingsFragment("Units Changed");
+                //makeToastSettingsFragment("Units Changed");
                 break;
             case "pref_key_switch_testnet":
                 makeToastSettingsFragment("Testnet on/off Changed");
diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
index d587a47..c64d856 100644
--- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
+++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java
@@ -26,6 +26,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
     private static final int FUND_WALLET = 0;
     private static final int WITHDRAW_WALLET = 1;
+    private static final int PREF_UPDATE = 2;
 
     private static IotaAPI api;
     private static Context context;
@@ -78,6 +79,7 @@ public class WalletBalanceChecker extends AsyncTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... voids) {
+
         if(context != null){
 
             WalletAddressChecker addressChecker = new WalletAddressChecker(context,prefFile);