Skip to content
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
merged 100 commits into from
Mar 13, 2023
Merged

P2p merge #59

merged 100 commits into from
Mar 13, 2023

Commits on Dec 8, 2022

  1. Handle device search error

    @Rkareko
    Rkareko committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    52374b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. Handle device connecting error

    @Rkareko
    Rkareko committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    33c2a65 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Close wifi direct connection when exiting P2P screen

    @Rkareko
    Rkareko committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    a8f4d47 View commit details
    Browse the repository at this point in the history

  2. Show error when receiving basic device details fails

    @Rkareko
    Rkareko committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    b7cd326 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Fix pairing issue after location permission request

    @ekigamba
    ekigamba committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    d53b27e View commit details
    Browse the repository at this point in the history

  2. Disconnect from wifi-direct appropriately 

    - 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
    @ekigamba
    ekigamba committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    347a0a4 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. Initiate sending of device details when pairing is successful

    @Rkareko
    Rkareko committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    c3d9f8d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Update unit tests

    @Rkareko
    Rkareko committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    ecb9640 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Add bottom sheet screen tests 

    Fix display of cancel connection dialog
    @Rkareko
    Rkareko committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    cc352d6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Handle retrieval of current device details

    @Rkareko
    Rkareko committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    0805dc2 View commit details
    Browse the repository at this point in the history

  2. Fix P2P stuck after pairing 

    - Allow for 3 retries of client-server socket connections after 5 seconds
    @ekigamba
    ekigamba committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    324311e View commit details
    Browse the repository at this point in the history

  3. Restart the P2P view after an exception during sending 

    - Allow restarting the activity after an unrecoverable exception
    @ekigamba
    ekigamba committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    98cbfda View commit details
    Browse the repository at this point in the history

  4. Code cleanup

    @ekigamba
    ekigamba committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    e5512f1 View commit details
    Browse the repository at this point in the history

  5. Remove: Allow importing p2p into fhircore

    @ekigamba
    ekigamba committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    a0ada1d View commit details
    Browse the repository at this point in the history

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

    …trategy-failures' into p2p-merge
    @ekigamba
    ekigamba committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    032ca6a View commit details
    Browse the repository at this point in the history

  7. Refactor logic for retrieving current device info

    @Rkareko
    Rkareko committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    3a2783e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Handle socket connection errors when connection breaks

    @Rkareko
    Rkareko committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    9c5f7e0 View commit details
    Browse the repository at this point in the history

  2. Fix failling test

    @Rkareko
    Rkareko committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d96b5ac View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

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

    …trategy-failures' into p2p-merge
    @ekigamba
    ekigamba committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    0152167 View commit details
    Browse the repository at this point in the history

  2. handle exception thrown when writing data

    @Rkareko
    Rkareko committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    c715ceb View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Return to default P2P screen when bottom sheet dialog is closed

    @Rkareko
    Rkareko committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    ce506b9 View commit details
    Browse the repository at this point in the history

  2. Fix merge issue

    @ekigamba
    ekigamba committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    769fefe View commit details
    Browse the repository at this point in the history

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

    …trategy-failures' into p2p-merge
    @ekigamba
    ekigamba committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    3c65546 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Handle socket exceptions and restart the activity

    @ekigamba
    ekigamba committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    3025d23 View commit details
    Browse the repository at this point in the history

  2. Code cleanup and add logging for records sent

    @ekigamba
    ekigamba committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    d199779 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Close server socket when closeconnections is called

    @Rkareko
    Rkareko committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    9d88338 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

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

    @ekigamba
    ekigamba committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    4e8f3e0 View commit details
    Browse the repository at this point in the history

  2. Fix received record count message

    @ekigamba
    ekigamba committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    01ab5b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Ellipsize long device names 

    show device image background in initials stages of sending / receiving data
    @Rkareko
    Rkareko committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    5b787cb View commit details
    Browse the repository at this point in the history

  2. Update sample app dao method signatures

    @ekigamba
    ekigamba committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    0e02a87 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. Handle of socket exception correctly when p2p is cancelled

    @ekigamba
    ekigamba committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    f77c432 View commit details
    Browse the repository at this point in the history

  2. Handle null group owner address

    @ekigamba
    ekigamba committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    1a07d93 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Handle socket connection exceptions where send or receive is called

    @Rkareko
    Rkareko committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    c362afd View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Update your to handle instances where data is upto date

    @Rkareko
    Rkareko committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    5f0841d View commit details
    Browse the repository at this point in the history

  2. Update bottom sheet header for receiver

    @Rkareko
    Rkareko committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    1c9ff45 View commit details
    Browse the repository at this point in the history

  3. Disconect wifi-p2p when there are errors during transfer

    @Rkareko
    Rkareko committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    f044934 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'p2p-merge' of github.com:opensrp/p2p into 1960-sync-com… 

    …plete-ui-updates
    @Rkareko
    Rkareko committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    71451d9 View commit details
    Browse the repository at this point in the history

  5. Updat your to show error when connection is broken

    @Rkareko
    Rkareko committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    fefcd4b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Merge pull request #60 from opensrp/1960-sync-complete-ui-updates 

    Sync complete UI  / UX updates
    @Rkareko
    Rkareko authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    c38811c View commit details
    Browse the repository at this point in the history

  2. Don't display device list when devices fail to pair

    @Rkareko
    Rkareko committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    4e74296 View commit details
    Browse the repository at this point in the history

  3. Set p2p pairing timeout and callback when p2p pairing is successful 

    Fixes task 11 in #opensrp/fhircore#1960
    @ekigamba
    ekigamba committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    fc0427c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'issue/fhircore/1960/p2p-bug-fixes/kigamba' into p2p-merge

    @ekigamba
    ekigamba committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    ec8c704 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Updated pairing text depending on state

    @Rkareko
    Rkareko committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    b6b4ca8 View commit details
    Browse the repository at this point in the history

  2. Handle instances where received history is null

    @Rkareko
    Rkareko committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7661a9a View commit details
    Browse the repository at this point in the history

  3. Close existing wifi p2p connections before scanning starts

    @Rkareko
    Rkareko committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    40927a0 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Fix socket address in use 

    - Add more error logs for tracking operations
- Close the serverSocket on the group owner devices
- Code reformat
- Remove View references from the ViewModel
    @ekigamba
    ekigamba committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    a467268 View commit details
    Browse the repository at this point in the history

  2. Merge changes from p2p-merge

    @Rkareko
    Rkareko committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    efc7209 View commit details
    Browse the repository at this point in the history

  3. Handle diconnection of wifi direct

    @Rkareko
    Rkareko committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    1c1d6c6 View commit details
    Browse the repository at this point in the history

  4. Fix sender device not sending

    @ekigamba
    ekigamba committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    0c7f424 View commit details
    Browse the repository at this point in the history

  5. Init channels and peer discovery after confirming successfull disconn… 

    …ection
    @Rkareko
    Rkareko committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    f3e1fc2 View commit details
    Browse the repository at this point in the history

  6. Merge branch '1960-close-existing-wifi-p2p-connections' of github.com… 

    …:opensrp/p2p into 1960-close-existing-wifi-p2p-connections
    @Rkareko
    Rkareko committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    dcd39a8 View commit details
    Browse the repository at this point in the history

  7. Bump up version

    @Rkareko
    Rkareko committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    63ec865 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. Merge branch 'p2p-merge' of github.com:opensrp/p2p into 1960-close-ex… 

    …isting-wifi-p2p-connections
    @Rkareko
    Rkareko committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    fc0c38e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from opensrp/1960-close-existing-wifi-p2p-conn… 

    …ections

Close existing wifi p2p connections before scanning starts
    @Rkareko
    Rkareko authored Feb 6, 2023
    Configuration menu
    Copy the full SHA
    451e035 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. Allow cleaning of activity context P2PLibrary#clean

    @ekigamba
    ekigamba committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    355ae30 View commit details
    Browse the repository at this point in the history

  2. Clean up P2PViewModel logging

    @Rkareko
    Rkareko committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    6e1cc2d View commit details
    Browse the repository at this point in the history

  3. Close wifi direct connection and stop searching when bottom sheet is … 

    …closed
    @Rkareko
    Rkareko committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    2c3d406 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. Close socket and streams when disconnect fails

    @Rkareko
    Rkareko committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    55ee5cb View commit details
    Browse the repository at this point in the history

  2. Fix build errors in tests

    @Rkareko
    Rkareko committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    f51ed5e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'p2p-merge' into 1960-disconnect-wifi-on-closing-bottom-… 

    …sheet
    @Rkareko
    Rkareko authored Feb 8, 2023
    Configuration menu
    Copy the full SHA
    e77e266 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #62 from opensrp/1960-disconnect-wifi-on-closing-b… 

    …ottom-sheet

Disconnect wifi-direct p2p connection on closing bottom sheet
    @Rkareko
    Rkareko authored Feb 8, 2023
    Configuration menu
    Copy the full SHA
    265c8fa View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Fix failing tests

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    eb6e4bc View commit details
    Browse the repository at this point in the history

  2. Run spotlessApply

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    be06216 View commit details
    Browse the repository at this point in the history

  3. Update WifiDirectDataSharingStrategy tests

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    aa1adf6 View commit details
    Browse the repository at this point in the history

  4. Update unit tests

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    66fd871 View commit details
    Browse the repository at this point in the history

  5. Merge changes from p2p-merge

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    b9c24a0 View commit details
    Browse the repository at this point in the history

  6. Run spotlessApply

    @Rkareko
    Rkareko committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    5e2901d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Bump up version

    @Rkareko
    Rkareko committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    055291c View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. Merge pull request #64 from opensrp/1960-spotless-apply 

    Fix failing tests for p2p-merge branch
    @Rkareko
    Rkareko authored Feb 13, 2023
    Configuration menu
    Copy the full SHA
    5e1be48 View commit details
    Browse the repository at this point in the history

  2. Null check for current device before dsconnecting 

    Nullify wifiP2pChannel during onPause
    @Rkareko
    Rkareko committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    b5a8096 View commit details
    Browse the repository at this point in the history

  3. Add comments

    @Rkareko
    Rkareko committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    5a50129 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #65 from opensrp/1960-location-permission-bug 

    Nullify wifiP2pChannel during onPause
    @Rkareko
    Rkareko authored Feb 13, 2023
    Configuration menu
    Copy the full SHA
    e548e9d View commit details
    Browse the repository at this point in the history

  5. Bump up version

    @Rkareko
    Rkareko committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    5189640 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

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

    @Rkareko
    Rkareko committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d89bd08 View commit details
    Browse the repository at this point in the history

  2. Run spotlessApply

    @Rkareko
    Rkareko committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    2aff836 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. Code cleanup

    @ekigamba
    ekigamba committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    0a4d8e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Fix crash when sending is disrupted

    @ekigamba
    ekigamba committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    5760e87 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Run spotlessApply

    @Rkareko
    Rkareko committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    bf25844 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Update calculation of batch offset

    @Rkareko
    Rkareko committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    a4762d1 View commit details
    Browse the repository at this point in the history

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

    @Rkareko
    Rkareko committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    763d34c View commit details
    Browse the repository at this point in the history

  3. Bump up version

    @Rkareko
    Rkareko committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    6d088d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Do not show list of devices when handling wifi_p2p_connection_action

    @Rkareko
    Rkareko committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    4159cad View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Bump up version

    @Rkareko
    Rkareko committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    f4805ac View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Update unit tests

    @Rkareko
    Rkareko committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    0eeb9cc View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Update unit tests

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    77b569e View commit details
    Browse the repository at this point in the history

  2. Remove call for jacocoTestReport task

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    3b51acf View commit details
    Browse the repository at this point in the history

  3. Update deprecated methords

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    f3af38e View commit details
    Browse the repository at this point in the history

  4. Add step to upload test artifacts

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    9b0a549 View commit details
    Browse the repository at this point in the history

  5. Revert set up JDK checkout to v2

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    303fe3b View commit details
    Browse the repository at this point in the history

  6. Remove unneeded hyphen

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    f0298ee View commit details
    Browse the repository at this point in the history

  7. Run only compose tests

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    df80bb2 View commit details
    Browse the repository at this point in the history

  8. Explicitly call jacocoTestReport

    @Rkareko
    Rkareko committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    b7d38bc View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Explicitly call connectedDebugAndroidTest task

    @Rkareko
    Rkareko committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    c17fa44 View commit details
    Browse the repository at this point in the history

  2. Disable androidx test orchestrator

    @Rkareko
    Rkareko committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    192bb2e View commit details
    Browse the repository at this point in the history

  3. Enable running of unit tests

    @Rkareko
    Rkareko committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    793a996 View commit details
    Browse the repository at this point in the history

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

    @Rkareko
    Rkareko committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    a0926ad View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Code clean up

    @Rkareko
    Rkareko committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    021b3c0 View commit details
    Browse the repository at this point in the history

  2. Code clean up

    @Rkareko
    Rkareko committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    f93e1c0 View commit details
    Browse the repository at this point in the history

  3. Update unit tests 

    code cleanup
    @Rkareko
    Rkareko committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    2e1c552 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Remove already handled TODOs

    @Rkareko
    Rkareko committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    2c3b4af View commit details
    Browse the repository at this point in the history