P2p merge

p2p-lib/build.gradle

@@ -1,3 +1,31 @@
+
+buildscript {
+    apply from: '../deps.gradle'
+
+    versions.kotlin_coveralls = '2.12.0'
+    versions.jacoco_tool = '0.8.7'
+    ext.composeVersion = "1.2.1"
+
+    deps.kotlin_coveralls_plugin = "gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:$versions.kotlin_coveralls"
+
+
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:7.1.3"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.7.10"
+        classpath deps.kotlin_coveralls_plugin
+        classpath deps.spotless
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
@@ -223,7 +251,7 @@ afterEvaluate {
                 from(components["release"])
                 artifactId = "p2p-lib"
                 groupId = "org.smartregister"
-                version = "0.6.0-SNAPSHOT"
+                version = "0.6.1-SNAPSHOT"
                 pom {
                     name.set("Peer to Peer Library")
                 }

p2p-lib/src/androidTest/java/org/smartregister/p2p/search/ui/p2p/BottomSheetScreenTest.kt

@@ -15,6 +15,7 @@
  */
 package org.smartregister.p2p.search.ui.p2p
 
+import android.net.wifi.p2p.WifiP2pDevice
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
@@ -26,6 +27,8 @@ import androidx.compose.ui.test.performClick
 import org.junit.Rule
 import org.junit.Test
 import org.smartregister.p2p.authentication.model.DeviceRole
+import org.smartregister.p2p.data_sharing.DeviceInfo
+import org.smartregister.p2p.data_sharing.WifiDirectDataSharingStrategy
 import org.smartregister.p2p.model.P2PState
 import org.smartregister.p2p.search.ui.p2p.components.CIRCULAR_PROGRESS_INDICATOR_TEST_TAG
 
@@ -37,13 +40,13 @@ class BottomSheetScreenTest {
   fun bottomSheetScreenRendersCorrectlyForSenderDevice() {
     composeRule.setContent {
       BottomSheet(
-        deviceList = emptyList(),
+        deviceList = listOf(populateDeviceInfo()),
         onEvent = {},
         modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
         p2PUiState = P2PUiState(),
         deviceName = "John",
         deviceRole = DeviceRole.SENDER,
-        p2PState = P2PState.RECEIVING_DATA
+        p2PState = P2PState.SEARCHING_FOR_RECIPIENT
       )
     }
 
@@ -100,7 +103,7 @@ class BottomSheetScreenTest {
     }
 
     composeRule.onNodeWithText("OKay").assertExists().assertIsDisplayed()
-    composeRule.onNodeWithText("Send Data").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Receive Data").assertExists().assertIsDisplayed()
     composeRule.onNodeWithText("Device data successfully sent").assertExists().assertIsDisplayed()
     composeRule
       .onNodeWithTag(BOTTOM_SHEET_BUTTON_TEST_TAG)
@@ -134,4 +137,113 @@ class BottomSheetScreenTest {
       .assertExists()
       .assertIsDisplayed()
   }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForReceiveBasicDeviceDetailsFailedStatus() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.RECEIVER,
+        p2PState = P2PState.RECEIVE_BASIC_DEVICE_DETAILS_FAILED
+      )
+    }
+
+    composeRule.onNodeWithText("OKay").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Receiving device details failed").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithText("Sorry could not receive device details")
+      .assertExists()
+      .assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_BUTTON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+  }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForPairDevicesSearchFailedStatus() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.SENDER,
+        p2PState = P2PState.PAIR_DEVICES_SEARCH_FAILED
+      )
+    }
+
+    composeRule.onNodeWithText("OKay").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Searching failed").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithText("Sorry could not find devices to pair with")
+      .assertExists()
+      .assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_BUTTON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+  }
+
+  @Test
+  @OptIn(ExperimentalMaterialApi::class)
+  fun bottomSheetScreenRendersCorrectlyForConnectToDeviceFailedStatus() {
+    composeRule.setContent {
+      BottomSheet(
+        deviceList = emptyList(),
+        onEvent = {},
+        modalBottomSheetState = ModalBottomSheetState(ModalBottomSheetValue.HalfExpanded),
+        p2PUiState = P2PUiState(),
+        deviceName = "John",
+        deviceRole = DeviceRole.SENDER,
+        p2PState = P2PState.CONNECT_TO_DEVICE_FAILED
+      )
+    }
+
+    composeRule.onNodeWithText("OKay").assertExists().assertIsDisplayed()
+    composeRule.onNodeWithText("Pairing failed").assertExists().assertIsDisplayed()
+    composeRule
+      .onNodeWithText("Sorry could not pair with device")
+      .assertExists()
+      .assertIsDisplayed()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_BUTTON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+    composeRule
+      .onNodeWithTag(BOTTOM_SHEET_CANCEL_ICON_TEST_TAG)
+      .assertExists()
+      .assertIsDisplayed()
+      .performClick()
+  }
+
+  private fun populateDeviceInfo(): DeviceInfo {
+    val wifiP2pDevice =
+      WifiP2pDevice().apply {
+        deviceName = "Google Pixel 7 android 12"
+        deviceAddress = "00:00:5e:00:53:af"
+      }
+    return WifiDirectDataSharingStrategy.WifiDirectDevice(wifiP2pDevice)
+  }
+
 }

p2p-lib/src/androidTest/java/org/smartregister/p2p/search/ui/p2p/components/DeviceListTest.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import org.junit.Rule
 import org.junit.Test
+import org.smartregister.p2p.model.P2PState
 import org.smartregister.p2p.model.ProgressIndicator
 import org.smartregister.p2p.model.ProgressIndicatorState
 import org.smartregister.p2p.search.ui.p2p.P2PUiState
@@ -45,7 +46,7 @@ class DeviceListTest {
 
   @Test
   fun testPairDeviceRowIsRendered() {
-    composeTestRule.setContent { PairDeviceRow(device = null, onEvent = {}) }
+    composeTestRule.setContent { PairDeviceRow(device = null, onEvent = {}, p2PState = P2PState.PAIR_DEVICES_FOUND) }
     composeTestRule.onNodeWithTag(PAIR_DEVICE_ROW_ICON_TAG).assertExists().assertIsDisplayed()
     composeTestRule.onNodeWithTag(PAIR_DEVICE_ROW_NAME_TEXT_TAG).assertExists().assertIsDisplayed()
     composeTestRule.onNodeWithTag(PAIR_DEVICE_ROW_BUTTON_TAG).assertExists().assertIsDisplayed()

p2p-lib/src/main/java/org/smartregister/p2p/P2PLibrary.kt

@@ -34,7 +34,7 @@ class P2PLibrary private constructor() {
   private lateinit var options: Options
   private var hashKey: String? = null
   private var deviceUniqueIdentifier: String? = null
-  var dataSharingStrategy: DataSharingStrategy = WifiDirectDataSharingStrategy()
+  var dataSharingStrategy: DataSharingStrategy? = null
 
   companion object {
     private var instance: P2PLibrary? = null
@@ -45,6 +45,9 @@ class P2PLibrary private constructor() {
           "in the onCreate method of " +
           "your Application class ")
       }
+      if (instance!!.dataSharingStrategy == null) {
+        instance!!.dataSharingStrategy = WifiDirectDataSharingStrategy()
+      }
       return instance!!
     }
 
@@ -72,6 +75,10 @@ class P2PLibrary private constructor() {
     return AppDatabase.getInstance(getContext(), options.dbPassphrase)
   }
 
+  fun clean() {
+    dataSharingStrategy = null
+  }
+
   fun getHashKey(): String? {
     if (hashKey == null) {
       val settings = Settings(getContext())

p2p-lib/src/main/java/org/smartregister/p2p/WifiP2pBroadcastReceiver.kt

@@ -20,12 +20,13 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.wifi.p2p.WifiP2pDevice
 import android.net.wifi.p2p.WifiP2pGroup
 import android.net.wifi.p2p.WifiP2pInfo
 import android.net.wifi.p2p.WifiP2pManager
-import android.os.Build
 import androidx.core.app.ActivityCompat
 import org.smartregister.p2p.search.contract.P2PManagerListener
+import timber.log.Timber
 
 class WifiP2pBroadcastReceiver(
   private val manager: WifiP2pManager,
@@ -37,6 +38,7 @@ class WifiP2pBroadcastReceiver(
   override fun onReceive(context: Context, intent: Intent) {
     when (intent.action) {
       WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION -> {
+        Timber.e("Wifi p2p Connection changed action")
         val p2pGroupInfo =
           intent.getParcelableExtra<WifiP2pGroup>(WifiP2pManager.EXTRA_WIFI_P2P_GROUP)
         val wifiP2pInfo = intent.getParcelableExtra<WifiP2pInfo>(WifiP2pManager.EXTRA_WIFI_P2P_INFO)
@@ -47,7 +49,11 @@ class WifiP2pBroadcastReceiver(
       WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION -> handlePeersChanged()
       WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION ->
         handleStateChanged(intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE, -1))
-      WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> handleDeviceChanged()
+      WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
+        val device =
+          intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE) as WifiP2pDevice?
+        handleDeviceChanged(device = device)
+      }
     }
   }
 
@@ -101,32 +107,11 @@ class WifiP2pBroadcastReceiver(
   /**
    * https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager#WIFI_P2P_THIS_DEVICE_CHANGED_ACTION
    */
-  private fun handleDeviceChanged() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) !=
-          PackageManager.PERMISSION_GRANTED
-      ) {
-        // TODO: Consider calling
-        //    ActivityCompat#requestPermissions
-        // here to request the missing permissions, and then overriding
-        //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-        //                                          int[] grantResults)
-        // to handle the case where the user grants the permission. See the documentation
-        // for ActivityCompat#requestPermissions for more details.
-        listener.handleAccessFineLocationNotGranted()
-        return
-      }
-      manager.requestDeviceInfo(channel) {
-        if (it == null) {
-          listener.handleWifiP2pDisabled()
-        } else {
-          listener.handleWifiP2pDevice(it)
-        }
-      }
+  private fun handleDeviceChanged(device: WifiP2pDevice?) {
+    if (device == null) {
+      listener.handleWifiP2pDisabled()
     } else {
-      listener.handleMinimumSDKVersionNotMet(
-        Build.VERSION_CODES.Q,
-      )
+      listener.handleWifiP2pDevice(device)
     }
   }
 }

p2p-lib/src/main/java/org/smartregister/p2p/dao/SenderTransferDao.kt

@@ -24,5 +24,5 @@ interface SenderTransferDao {
 
   fun getTotalRecordCount(highestRecordIdMap: HashMap<String, Long>): Long
 
-  fun getJsonData(dataType: DataType, lastRecordId: Long, batchSize: Int): JsonData?
+  fun getJsonData(dataType: DataType, lastRecordId: Long, batchSize: Int, offset: Int = 0): JsonData?
 }

p2p-lib/src/main/java/org/smartregister/p2p/data_sharing/DataSharingStrategy.kt

@@ -65,6 +65,8 @@ interface DataSharingStrategy {
 
   fun onPairingFailed(ex: Exception)
 
+  fun onPairingSucceeded()
+
   fun onSendingFailed(ex: Exception)
 
   fun onSearchingFailed(ex: Exception)
@@ -96,5 +98,15 @@ interface DataSharingStrategy {
 
   fun onPause()
 
-  fun initChannel(onDeviceFound: OnDeviceFound, onConnected: DataSharingStrategy.PairingListener)
+  fun initChannel(onDeviceFound: OnDeviceFound, onConnected: PairingListener)
+
+  fun onStop()
+
+  fun cleanup() {}
+
+  fun connectionTimeout() : Int = 30
+
+  fun isPairingInitiated() : Boolean
+
+
 }