New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

P2p merge #59

Merged

Rkareko merged 100 commits into main from p2p-merge

Mar 13, 2023

Contributor

ekigamba commented Jan 17, 2023 •

edited by Rkareko

Loading

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #30

Type
Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Release | Other)

Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide

Rkareko and others added 25 commits

December 8, 2022 06:58


          Handle device search error

52374b3


          Handle device connecting error

33c2a65


          Close wifi direct connection when exiting P2P screen

a8f4d47


          Show error when receiving basic device details fails

b7cd326


          Fix pairing issue after location permission request

d53b27e


          Disconnect from wifi-direct appropriately

347a0a4

- Disconnect from wifi-direct when closing the activity
- Disconnect from wifi-direct before starting searching if the devices is already in a wifi-direct group


          Initiate sending of device details when pairing is successful

c3d9f8d


          Update unit tests

ecb9640


          Add bottom sheet screen tests

cc352d6

Fix display of cancel connection dialog


          Handle retrieval of current device details

0805dc2


          Fix P2P stuck after pairing

324311e

- Allow for 3 retries of client-server socket connections after 5 seconds


          Restart the P2P view after an exception during sending

98cbfda

- Allow restarting the activity after an unrecoverable exception


          Code cleanup

e5512f1


          Remove: Allow importing p2p into fhircore

a0ada1d


          Merge remote-tracking branch 'origin/30-handle-WifiDirectDataSharingS…

032ca6a

…trategy-failures' into p2p-merge


          Refactor logic for retrieving current device info

3a2783e


          Handle socket connection errors when connection breaks

9c5f7e0


          Fix failling test

d96b5ac


          Merge remote-tracking branch 'origin/30-handle-WifiDirectDataSharingS…

…trategy-failures' into p2p-merge


          handle exception thrown when writing data

c715ceb


          Return to default P2P screen when bottom sheet dialog is closed

ce506b9


          Fix merge issue

769fefe


          Merge remote-tracking branch 'origin/30-handle-WifiDirectDataSharingS…

3c65546

…trategy-failures' into p2p-merge


          Handle socket exceptions and restart the activity

3025d23


          Code cleanup and add logging for records sent

d199779

Contributor Author

ekigamba commented Jan 17, 2023

@Rkareko Kindly test the socket closing and disconnection after an exception. I tend to get a p2p BUSY error or an EADDRINUSE exception on this commit d199779 (#59)

Rkareko and others added 4 commits

January 20, 2023 12:30


          Close server socket when closeconnections is called

9d88338


          Improve dao to use offsets, limit and >= to avoid skipping records

4e8f3e0


          Fix received record count message

01ab5b0


          Ellipsize long device names

5b787cb

show device image background in initials stages of sending / receiving data

Rkareko added 20 commits

February 23, 2023 11:13


          Run spotlessApply

bf25844


          Update calculation of batch offset

a4762d1


          Merge branch 'p2p-merge' of github.com:opensrp/p2p into p2p-merge

763d34c


          Bump up version

6d088d5


          Do not show list of devices when handling wifi_p2p_connection_action

4159cad


          Bump up version

f4805ac


          Update unit tests

0eeb9cc


          Update unit tests

77b569e


          Remove call for jacocoTestReport task

3b51acf


          Update deprecated methords

f3af38e


          Add step to upload test artifacts

9b0a549


          Revert set up JDK checkout to v2

303fe3b


          Remove unneeded hyphen

f0298ee


          Run only compose tests

df80bb2


          Explicitly call jacocoTestReport

b7d38bc


          Explicitly call connectedDebugAndroidTest task

c17fa44


          Disable androidx test orchestrator

192bb2e


          Enable running of unit tests

793a996


          Remove build script used to run p2p-lib module directly inside FHIR Core

a0926ad


          Code clean up

021b3c0

Rkareko mentioned this pull request

Fix coverage drop introduced by UI / UX enhancements #56

Open

4 tasks


          Code clean up

f93e1c0

ekigamba commented

View reviewed changes

p2p-lib/src/test/java/org/smartregister/p2p/data_sharing/WifiDirectDataSharingStrategyTest.kt

                   actionListenerSlot.captured.onSuccess()
-                  Assert.assertTrue(ReflectionHelpers.getField(wifiDirectDataSharingStrategy, "paired"))
+                  // TODO verify what happens on successPairingListener
+                  /*    Assert.assertTrue(ReflectionHelpers.getField(wifiDirectDataSharingStrategy, "paired"))
                   val actualCurrentDevice =

Contributor Author

ekigamba Mar 9, 2023

Do we need this for later and can we @ignore this with an issue to fix this later on

Contributor

Rkareko Mar 9, 2023

Documented on this issue

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

@@ @@ -52,9 +60,15 @@ constructor( @@
                   var lastUpdatedAt =
                     P2PLibrary.getInstance().getReceiverTransferDao().receiveJson(currentManifest.dataType, data)
-                  totalSentRecordCount += data!!.length()
+                  totalReceivedRecordCount += data!!.length()
+                  Timber.e(

Contributor Author

ekigamba Mar 9, 2023

Let's change these 2 lines to debug or verbose

p2p-lib/src/main/java/org/smartregister/p2p/search/ui/P2PDeviceSearchActivity.kt

+                override fun onStop() {
+                  super.onStop()
+                  dataSharingStrategy.onStop()

Contributor Author

ekigamba Mar 9, 2023

Let's probably move this before super.onStop()

p2p-lib/src/main/java/org/smartregister/p2p/search/ui/P2PReceiverViewModel.kt Outdated

@@ @@ -128,6 +135,7 @@ class P2PReceiverViewModel( @@
                         // Listen for incoming manifest
                         val receivedManifest =
                           dataSharingStrategy.receiveManifest(
+                            // TODO: Fix this is null for some weird issue causing an NPE
                             device = dataSharingStrategy.getCurrentDevice()!!,

Contributor Author

ekigamba Mar 9, 2023

I guess we can remove this

p2p-lib/src/main/java/org/smartregister/p2p/search/ui/P2PReceiverViewModel.kt Outdated

                       }
                     }
                   )
                 }
                 fun processIncomingManifest() {
+                  Timber.e("processIncomingManifest() started")

Contributor Author

ekigamba Mar 9, 2023

let's remove this or change to info

p2p-lib/src/test/java/org/smartregister/p2p/search/ui/P2PViewModelTest.kt

		}

		@Ignore("Fix mocks not working in lazy function")

Contributor Author

ekigamba Mar 9, 2023

I think we can create an issue for this and any other technical debt. It can be a candidate for CHT

Contributor

Rkareko Mar 9, 2023

Documented on #67

p2p-lib/src/test/java/org/smartregister/p2p/search/ui/P2PViewModelTest.kt

		}

		@Ignore("Fix mocks not working in lazy function")

Contributor Author

ekigamba Mar 9, 2023

I think we can create an issue for this and any other technical debt. It can be a candidate for CHT

Contributor

Rkareko Mar 9, 2023

Documented on #67

p2p-lib/src/test/java/org/smartregister/p2p/search/ui/P2PViewModelTest.kt

-                fun `closeP2PScreen() calls view#finish()`() {
+                fun `closeP2PScreen() calls view#finish() when dataSharingStrategy#getCurrentDevice() is null`() {
+                  every { dataSharingStrategy.getCurrentDevice() } returns null
+                  p2PViewModel.closeP2PScreen()

Contributor Author

ekigamba Mar 9, 2023

This does not seem to be complete. I don't seem to see any verification after the call to closeP2PScreen()

Contributor

Rkareko Mar 9, 2023

updated

p2p-lib/src/test/java/org/smartregister/p2p/search/ui/P2PViewModelTest.kt Outdated

+                }
+                @Test
+                fun `closeP2PScreen() calls view#finish() dataSharingStrategy#disconnect() is successful`() {

Contributor Author

ekigamba Mar 9, 2023

The test name is ambiguous or missing a conjunction between view#finish() and dataSharingStrategy#disconnect()

p2p-lib/src/test/java/org/smartregister/p2p/search/ui/P2PViewModelTest.kt Outdated

+                }
+                @Test
+                fun `closeP2PScreen() calls view#finish() dataSharingStrategy#disconnect() fails`() {

Contributor Author

ekigamba Mar 9, 2023

The test name is ambiguous or missing a conjunction between view#finish() and dataSharingStrategy#disconnect()

Rkareko added 2 commits

March 9, 2023 18:07


          Update unit tests

2e1c552

code cleanup


          Remove already handled TODOs

2c3b4af

Contributor

Rkareko commented Mar 10, 2023

@Rkareko Kindly test the socket closing and disconnection after an exception. I tend to get a p2p BUSY error or an EADDRINUSE exception on this commit d199779 (#59)

Rkareko closed this

Rkareko reopened this

Rkareko merged commit 88a348e into main

Rkareko deleted the p2p-merge branch

March 13, 2023 05:14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet