Add peer-to-peer instructions

p2p-sync/src/main/java/org/smartregister/p2p/activity/P2pModeSelectActivity.java

@@ -184,9 +184,12 @@ public boolean removeAdvertisingProgressDialog() {
     }
 
     @Override
-    public void showSyncCompleteFragment(boolean isSuccess, @Nullable String deviceName, @NonNull SyncCompleteTransferFragment.OnCloseClickListener onCloseClickListener, @NonNull String summaryReport) {
+    public void showSyncCompleteFragment(boolean isSuccess, @Nullable String deviceName
+            , @NonNull SyncCompleteTransferFragment.OnCloseClickListener onCloseClickListener
+            , @NonNull String summaryReport, boolean isSender) {
         SyncCompleteTransferFragment syncCompleteTransferFragment = new SyncCompleteTransferFragment();
         syncCompleteTransferFragment.setSuccess(isSuccess);
+        syncCompleteTransferFragment.setSender(isSender);
         syncCompleteTransferFragment.setOnCloseClickListener(onCloseClickListener);
         syncCompleteTransferFragment.setDeviceName(deviceName);
         syncCompleteTransferFragment.setTransferSummaryReport(summaryReport);

p2p-sync/src/main/java/org/smartregister/p2p/contract/P2pModeSelectContract.java

@@ -47,7 +47,7 @@ interface View extends BaseView {
 
         boolean removeAdvertisingProgressDialog();
 
-        void showSyncCompleteFragment(boolean isSuccess, @Nullable String deviceName, @NonNull SyncCompleteTransferFragment.OnCloseClickListener onCloseClickListener, @NonNull String summaryReport);
+        void showSyncCompleteFragment(boolean isSuccess, @Nullable String deviceName, @NonNull SyncCompleteTransferFragment.OnCloseClickListener onCloseClickListener, @NonNull String summaryReport, boolean isSender);
 
         void showDiscoveringProgressDialog(@NonNull DialogCancelCallback dialogCancelCallback);
 

p2p-sync/src/main/java/org/smartregister/p2p/fragment/SyncCompleteTransferFragment.java

@@ -22,6 +22,7 @@ public class SyncCompleteTransferFragment extends Fragment {
     private OnCloseClickListener onCloseClickListener;
     private String transferSummary;
     private boolean isSuccess;
+    private boolean isSender;
 
     @Nullable
     private String deviceName;
@@ -30,6 +31,10 @@ public void setSuccess(boolean success) {
         isSuccess = success;
     }
 
+    public void setSender(boolean sender) {
+        isSender = sender;
+    }
+
     public void setTransferSummaryReport(@NonNull String transferSummaryReport) {
         this.transferSummary = transferSummaryReport;
     }
@@ -46,19 +51,24 @@ public void setDeviceName(@Nullable String deviceName) {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_successful_transfer, container, false);
-        TextView transferSummary = (TextView) view.findViewById(R.id.tv_successfulTransferFragment_transferSummary);
+        TextView transferSummaryTv = (TextView) view.findViewById(R.id.tv_successfulTransferFragment_transferSummary);
+
+        String[] summarySplit = this.transferSummary.split(" ");
+        String recordsSent = "0";
+
+        if (summarySplit.length > 0) {
+            recordsSent = summarySplit[0].trim();
+        }
 
         if (isSuccess) {
-            transferSummary.setText(this.transferSummary);
-        } else {
-            String[] summarySplit = this.transferSummary.split(" ");
-            String recordsSent = "0";
+            transferSummaryTv.setText(this.transferSummary);
 
-            if (summarySplit.length > 0) {
-                recordsSent = summarySplit[0];
+            if (!isSender && (recordsSent.length() > 1 || !"0".equals(recordsSent))) {
+                view.findViewById(R.id.tv_successfulTransferFragment_processingDisclaimer)
+                        .setVisibility(View.VISIBLE);
             }
-
-            transferSummary.setText(String.format(getString(R.string.connection_lost_transfer_summary), deviceName, recordsSent));
+        } else {
+            transferSummaryTv.setText(String.format(getString(R.string.connection_lost_transfer_summary), deviceName, recordsSent));
         }
 
         if (!isSuccess) {

p2p-sync/src/main/java/org/smartregister/p2p/interactor/P2pModeSelectInteractor.java

@@ -19,6 +19,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 
+import org.smartregister.p2p.BuildConfig;
 import org.smartregister.p2p.P2PLibrary;
 import org.smartregister.p2p.R;
 import org.smartregister.p2p.callback.OnResultCallback;
@@ -271,7 +272,9 @@ public void cleanupResources() {
     }
 
     public void showToast(@NonNull String message) {
-        Toast.makeText(context, message, Toast.LENGTH_LONG)
-                .show();
+        if (BuildConfig.DEBUG) {
+            Toast.makeText(context, message, Toast.LENGTH_LONG)
+                    .show();
+        }
     }
 }

p2p-sync/src/main/java/org/smartregister/p2p/presenter/P2PReceiverPresenter.java

@@ -385,8 +385,9 @@ private SendingDevice registerSendingDevice(Map<String, Object> basicDeviceDetai
         return sendingDevice;
     }
 
+    @VisibleForTesting
     @Nullable
-    private Integer clearDeviceHistoryAndUpdateDeviceKey(final SendingDevice sendingDevice, String appLifetimeKey) {
+    protected Integer clearDeviceHistoryAndUpdateDeviceKey(final SendingDevice sendingDevice, String appLifetimeKey) {
         final AppDatabase db = P2PLibrary.getInstance().getDb();
         sendingDevice.setAppLifetimeKey(appLifetimeKey);
 
@@ -701,7 +702,8 @@ public void onSyncFailed(@NonNull Exception e) {
                 public void onCloseClicked() {
                     getView().showP2PModeSelectFragment(true);
                 }
-            }, SyncDataConverterUtil.generateSummaryReport(getView().getContext(), false, syncReceiverHandler.getTransferProgress()));
+            }, SyncDataConverterUtil.generateSummaryReport(getView().getContext(), false, syncReceiverHandler.getTransferProgress())
+            , false);
         }
 
         disconnectAndReset(interactor.getCurrentEndpoint(), false);

p2p-sync/src/main/java/org/smartregister/p2p/presenter/P2PSenderPresenter.java

@@ -212,7 +212,7 @@ public void errorOccurredSync(@NonNull Exception e) {
                 public void onCloseClicked() {
                     getView().showP2PModeSelectFragment(true);
                 }
-            }, SyncDataConverterUtil.generateSummaryReport(getView().getContext(), true, syncSenderHandler.getTransferProgress()));
+            }, SyncDataConverterUtil.generateSummaryReport(getView().getContext(), true, syncSenderHandler.getTransferProgress()), true);
 
             syncSenderHandler = null;
         }
@@ -512,7 +512,7 @@ public synchronized void onPayloadTransferUpdate(@NonNull String endpointId, @No
                     public void onCloseClicked() {
                         view.showP2PModeSelectFragment(true);
                     }
-                }, SyncDataConverterUtil.generateSummaryReport(view.getContext(), true, transferItems));
+                }, SyncDataConverterUtil.generateSummaryReport(view.getContext(), true, transferItems), true);
                 transferItems = null;
                 disconnectAndReset(currentReceiver.getEndpointId(), false);
             }

p2p-sync/src/main/java/org/smartregister/p2p/sync/handler/SyncReceiverHandler.java

@@ -374,7 +374,7 @@ protected void showSyncCompleteFragment(boolean isSuccess) {
             public void onCloseClicked() {
                 receiverPresenter.getView().showP2PModeSelectFragment(true);
             }
-        }, SyncDataConverterUtil.generateSummaryReport(receiverPresenter.getView().getContext(), false, getTransferProgress()));
+        }, SyncDataConverterUtil.generateSummaryReport(receiverPresenter.getView().getContext(), false, getTransferProgress()), false);
     }
 
     private void stopTransferAndReset(boolean startAdvertising) {

p2p-sync/src/main/res/layout/fragment_successful_transfer.xml

@@ -47,6 +47,22 @@
         android:gravity="center"
         android:text="Transfer report"/>
 
+    <TextView
+        android:id="@+id/tv_successfulTransferFragment_processingDisclaimer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_successfulTransferFragment_transferSummary"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:textColor="@android:color/black"
+        android:layout_marginTop="15dp"
+        android:textSize="21sp"
+        android:paddingLeft="40dp"
+        android:paddingRight="40dp"
+        android:gravity="center"
+        android:visibility="gone"
+        android:text="@string/processing_disclaimer"/>
+
     <Button
         android:id="@+id/btn_successfulTransferFragment_closeBtn"
         android:text="@android:string/ok"

p2p-sync/src/main/res/values/strings.xml

@@ -110,4 +110,5 @@
     <string name="start_transfer">Start Transfer</string>
     <string name="devices_connected">Devices Connected</string>
     <string name="please_make_sure_the_devices_remain_within_range_during_data_transfer">Please make sure the devices remain within range during data transfer</string>
+    <string name="processing_disclaimer"></string>
 </resources>

p2p-sync/src/test/java/org/smartregister/p2p/presenter/P2PReceiverPresenterTest.java

@@ -475,7 +475,8 @@ public void onConnectionBrokenShouldShowSyncCompleteFragmentWithFailedStatusAndR
                 .showSyncCompleteFragment(Mockito.eq(false)
                         , Mockito.eq(deviceName)
                         , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class)
-                        , Mockito.anyString());
+                        , Mockito.anyString()
+                        , Mockito.eq(false));
         assertNull(ReflectionHelpers.getField(p2PReceiverPresenter, "currentSender"));
     }
 

p2p-sync/src/test/java/org/smartregister/p2p/presenter/P2PReceiverPresenterTest2.java

@@ -0,0 +1,121 @@
+package org.smartregister.p2p.presenter;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+import org.smartregister.p2p.P2PLibrary;
+import org.smartregister.p2p.authorizer.P2PAuthorizationService;
+import org.smartregister.p2p.contract.P2pModeSelectContract;
+import org.smartregister.p2p.model.AppDatabase;
+import org.smartregister.p2p.model.SendingDevice;
+import org.smartregister.p2p.model.dao.P2pReceivedHistoryDao;
+import org.smartregister.p2p.model.dao.ReceiverTransferDao;
+import org.smartregister.p2p.model.dao.SenderTransferDao;
+import org.smartregister.p2p.model.dao.SendingDeviceDao;
+import org.smartregister.p2p.shadows.ShadowAppDatabase;
+import org.smartregister.p2p.shadows.ShadowTasker;
+import org.smartregister.p2p.util.Constants;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This test has ShadowTasker enabled. This enables AsyncTasks to run in this test
+ *
+ * Created by Ephraim Kigamba - ekigamba@ona.io on 19/03/2019
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowAppDatabase.class, ShadowTasker.class})
+public class P2PReceiverPresenterTest2 {
+
+    @Rule
+    public MockitoRule mockitoRule = MockitoJUnit.rule();
+
+    @Mock
+    private P2pModeSelectContract.View view;
+    @Mock
+    private P2pModeSelectContract.Interactor interactor;
+    @Mock
+    private P2PAuthorizationService p2PAuthorizationService;
+
+    private P2PReceiverPresenter p2PReceiverPresenter;
+
+    @Before
+    public void setUp() throws Exception {
+        P2PLibrary.init(new P2PLibrary.Options(RuntimeEnvironment.application
+                ,"password", "username", p2PAuthorizationService
+                , Mockito.mock(ReceiverTransferDao.class), Mockito.mock(SenderTransferDao.class)));
+
+        Mockito.doReturn(RuntimeEnvironment.application)
+                .when(view)
+                .getContext();
+
+        Mockito.doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                int resId = invocation.getArgument(0);
+                return RuntimeEnvironment.application.getString(resId);
+            }
+        })
+                .when(view)
+                .getString(Mockito.anyInt());
+
+        p2PReceiverPresenter = Mockito.spy(new P2PReceiverPresenter(view, interactor));
+    }
+
+    @Test
+    public void checkIfDeviceKeyHasChangedShouldClearDeviceHistoryAndUpdateDeviceKeyWhenAppLifetimeKeyIsDifferent() {
+        String deviceId = "deviceId";
+        String appLifetimeKey = "app-lifetime-key";
+        String endpointId = "endpoint-id";
+
+        SendingDevice sendingDevice = new SendingDevice();
+        sendingDevice.setAppLifetimeKey("some-other-key");
+        sendingDevice.setDeviceId(deviceId);
+
+        Map<String, Object> deviceDetails = new HashMap<>();
+        deviceDetails.put(Constants.BasicDeviceDetails.KEY_DEVICE_ID, deviceId);
+        deviceDetails.put(Constants.BasicDeviceDetails.KEY_APP_LIFETIME_KEY, appLifetimeKey);
+
+        AppDatabase appDatabase = Mockito.spy(AppDatabase.getInstance(RuntimeEnvironment.application, "password"));
+
+        ShadowAppDatabase.setInstance(appDatabase);
+
+        SendingDeviceDao sendingDeviceDao = Mockito.mock(SendingDeviceDao.class);
+        P2pReceivedHistoryDao p2pReceivedHistoryDao = Mockito.mock(P2pReceivedHistoryDao.class);
+
+        Mockito.doReturn(sendingDeviceDao)
+                .when(appDatabase)
+                .sendingDeviceDao();
+
+        Mockito.doReturn(p2pReceivedHistoryDao)
+                .when(appDatabase)
+                .p2pReceivedHistoryDao();
+
+        Mockito.doReturn(sendingDevice)
+                .when(sendingDeviceDao)
+                .getSendingDevice(Mockito.eq(deviceId));
+
+        ReflectionHelpers.callInstanceMethod(p2PReceiverPresenter, "checkIfDeviceKeyHasChanged"
+                , ReflectionHelpers.ClassParameter.from(Map.class, deviceDetails)
+                , ReflectionHelpers.ClassParameter.from(String.class, endpointId));
+
+        Mockito.verify(p2PReceiverPresenter, Mockito.times(1))
+                .clearDeviceHistoryAndUpdateDeviceKey(Mockito.eq(sendingDevice), Mockito.eq(appLifetimeKey));
+        Mockito.verify(p2PReceiverPresenter, Mockito.times(1))
+                .sendLastReceivedRecords(Mockito.any(List.class));
+    }
+
+}

p2p-sync/src/test/java/org/smartregister/p2p/presenter/P2PSenderPresenterTest.java

@@ -549,7 +549,9 @@ public void onConnectionBrokenShouldResetStateAndShowSyncCompleteFragmentWithFai
         Mockito.verify(view, Mockito.times(1))
                 .showSyncCompleteFragment(ArgumentMatchers.eq(false)
                         , Mockito.eq(deviceName)
-                        , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class), Mockito.anyString());
+                        , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class)
+                        , Mockito.anyString()
+                        , Mockito.eq(true));
         Mockito.verify(p2PSenderPresenter, Mockito.times(1))
                 .errorOccurredSync(Mockito.any(Exception.class));
 
@@ -871,7 +873,8 @@ public void onPayloadTransferUpdateShouldCallShowSyncCompleteFragmentWhenSyncCom
                 .showSyncCompleteFragment(Mockito.eq(true)
                         , Mockito.eq(deviceName)
                         , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class)
-                        , Mockito.anyString());
+                        , Mockito.anyString()
+                        , Mockito.eq(true));
     }
 
     @Test
@@ -963,8 +966,11 @@ public void errorOccurredSyncShouldCallResetStateAndShowSyncCompleteFragmentWith
         p2PSenderPresenter.errorOccurredSync(new Exception("some error"));
 
         Mockito.verify(view, Mockito.times(1))
-                .showSyncCompleteFragment(Mockito.eq(false), Mockito.eq(deviceName)
-                        , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class), Mockito.anyString());
+                .showSyncCompleteFragment(Mockito.eq(false)
+                        , Mockito.eq(deviceName)
+                        , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class)
+                        , Mockito.anyString()
+                        , Mockito.eq(true));
         Mockito.verify(interactor, Mockito.times(1))
                 .disconnectFromEndpoint(Mockito.eq(endpointId));
         Mockito.verify(view, Mockito.times(1))

p2p-sync/src/test/java/org/smartregister/p2p/shadows/ShadowAppDatabase.java

@@ -27,4 +27,8 @@ public static AppDatabase getInstance(@NonNull Context context, @NonNull String
 
         return instance;
     }
+
+    public static void setInstance(@NonNull AppDatabase appDatabase) {
+        instance = appDatabase;
+    }
 }

p2p-sync/src/test/java/org/smartregister/p2p/sync/handler/SyncReceiverHandlerTest.java

@@ -290,7 +290,8 @@ public void processPayloadShouldCallShowSyncCompleteFragmentWhenSyncCompleteConn
                 .showSyncCompleteFragment(Mockito.eq(true)
                         , Mockito.eq(deviceName)
                         , Mockito.any(SyncCompleteTransferFragment.OnCloseClickListener.class)
-                        , Mockito.anyString());
+                        , Mockito.anyString()
+                        , Mockito.eq(false));
     }
 
     @Test