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.

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

[ANDROAPP-5701] Perform sync in local network #3591

Merged

Conversation

andresmr
Copy link
Collaborator

Description

Sync in a local network without internet was not working, we needed to check connection to the server not internet

jira issue

Solution description

Work schedulers are not restricted to having internet connection, it checks connection to the server

Covered unit test cases

Describe the tests that you ran to verify your changes.

Where did you test this issue?

  • Smartphone Emulator
  • Tablet Emulator
  • Smartphone
  • Tablet

Which Android versions did you test this issue?

  • 4.4
  • 5.X - 6.X
  • 7.X
  • 8.X
  • 9.X - 10.X
  • 11.X - 13.X
  • Other

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code

@andresmr andresmr force-pushed the ANDROAPP-5701-Metadata-sync-does-not-start-in-local-network branch 2 times, most recently from 7d17638 to dc9e34e Compare April 18, 2024 11:07
@andresmr andresmr force-pushed the ANDROAPP-5701-Metadata-sync-does-not-start-in-local-network branch from dc9e34e to 5ba5c60 Compare April 29, 2024 08:38
@andresmr andresmr changed the base branch from release/2.10 to release/3.0 April 29, 2024 11:50
@Balcan Balcan force-pushed the ANDROAPP-5701-Metadata-sync-does-not-start-in-local-network branch from 00f3d30 to 79a6b96 Compare April 30, 2024 09:56
Copy link

@Balcan Balcan merged commit 9f93352 into release/3.0 Apr 30, 2024
4 checks passed
@Balcan Balcan deleted the ANDROAPP-5701-Metadata-sync-does-not-start-in-local-network branch April 30, 2024 12:17
Balcan added a commit that referenced this pull request May 20, 2024
* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>
siddh1004 pushed a commit to simpledotorg/dhis2-android-capture-app that referenced this pull request May 21, 2024
* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>
CarlosMacaneta added a commit to Saudigitus/dhis2-emis-android that referenced this pull request Jun 26, 2024
* version name 3.0

Signed-off-by: Pablo <[email protected]>

* version name 3.0 (dhis2#3605)

Signed-off-by: Pablo <[email protected]>

* map is usable when card is first expanded to take full screen and then collapsed (dhis2#3601)

* fix: [ANDROAPP-6050] remove program name when scheduling event (dhis2#3596)

* [ANDROAPP-5701] Perform sync in local network (dhis2#3591)

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>

* update mobile-ui version (dhis2#3615)

* chore: [ANDROAPP-6139] Ignore flaky test (dhis2#3622)

* chore: [ANDROAPP-6139] ignoreflaky test

* fix: [ANDROAPP-6135] add ignore to shouldSuccessfullySyncSavedEvent

* chore: [ANDROAPP-6135] Update rule engine and expression parser to re… (dhis2#3623)

* chore: [ANDROAPP-6135] Update rule engine and expression parser to release version for 3.0

* chore: update rule-engine version 3.0.0

* fix: [ANDROAPP-6135] fix tests

---------

Co-authored-by: Victor Garcia <[email protected]>

* Update designSystem to release artifact 0.2 (dhis2#3627)

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6134] Update sdk release version to 1.10.0 (dhis2#3629)

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6161] Add server version 41 (dhis2#3630)

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Remove old form option (dhis2#3632)

* [ANDROAPP-6162] Remove COMPOSE_FORM option

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* Create deploy_release.yml

placeholder workflow

* Rename deploy_release.yml to deploy-release.yml

* Update deploy-release.yml

* feat: [ANDROAPP-6165] add continuous-delivery job to github (dhis2#3650)

* fix: [ANDROAPP-6175] TeiDataFragment keeps reloading in landscape (dhis2#3647)

* [ANDROAPP-6175] TeiDataFragment keeps reloading in landscape

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Check if grouped events option is visible

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Ignore flaky test

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* ci: [ANDROAPP-6167] deploy release job

* ci: [ANDROAPP-6167] deploy release job

* ci: [ANDROAPP-6167] deploy release job

* update vCode

* build: 3.0 release (dhis2#3654)

* build: 3.0 release

* build: 3.0 release

* build: rename apk files

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>

* ci: Update version name to 3.0.0.1 and version code to 134

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6195] Add missing text resource keys (dhis2#3667)

* fix: [ANDROAPP-6195] Add missing text resource keys

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] remove duplicates and typos

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] remove duplicates

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] add missing transifex configuration

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6194] Search outside the program (dhis2#3664)

* fix: [ANDROAPP-6194] Send fetched list as parameter to avoid duplicated on search

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6194] Send fetched list as parameter to avoid duplicated on search

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6194] Add mockedWebServer response to mock get tracked entity instances

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6210] Manually instantiate resourceManager on BreakTheGlassBottomDialog (dhis2#3671)

Signed-off-by: andresmr <[email protected]>

* fix: missing translations (dhis2#3674)

* fix: missing translations

Signed-off-by: Pablo <[email protected]>

* fix: duplicated resources

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* chore: Update SDK to 1.10.0.1 (dhis2#3679)

* chore: Update SDK to 1.10.0.1-SNAPSHOT

Signed-off-by: andresmr <[email protected]>

* chore: Update SDK to 1.10.0.1

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* build: Update release notes

Signed-off-by: andresmr <[email protected]>

* fix: refactoring changes

* chore: klint checkstyle

* fix: setting semis verification on testing classes

---------

Signed-off-by: Pablo <[email protected]>
Signed-off-by: andresmr <[email protected]>
Co-authored-by: Pablo <[email protected]>
Co-authored-by: Ferdy Rodriguez <[email protected]>
Co-authored-by: Manu Muñoz <[email protected]>
Co-authored-by: Andrés Miguel Rubio <[email protected]>
Co-authored-by: Xavier Molloy <[email protected]>
Co-authored-by: Victor Garcia <[email protected]>
Co-authored-by: manu <[email protected]>
CarlosMacaneta added a commit to Saudigitus/dhis2-emis-android that referenced this pull request Jun 27, 2024
* version name 3.0

Signed-off-by: Pablo <[email protected]>

* version name 3.0 (dhis2#3605)

Signed-off-by: Pablo <[email protected]>

* map is usable when card is first expanded to take full screen and then collapsed (dhis2#3601)

* fix: [ANDROAPP-6050] remove program name when scheduling event (dhis2#3596)

* [ANDROAPP-5701] Perform sync in local network (dhis2#3591)

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

* Perform sync in local network

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>

* update mobile-ui version (dhis2#3615)

* chore: [ANDROAPP-6139] Ignore flaky test (dhis2#3622)

* chore: [ANDROAPP-6139] ignoreflaky test

* fix: [ANDROAPP-6135] add ignore to shouldSuccessfullySyncSavedEvent

* chore: [ANDROAPP-6135] Update rule engine and expression parser to re… (dhis2#3623)

* chore: [ANDROAPP-6135] Update rule engine and expression parser to release version for 3.0

* chore: update rule-engine version 3.0.0

* fix: [ANDROAPP-6135] fix tests

---------

Co-authored-by: Victor Garcia <[email protected]>

* Update designSystem to release artifact 0.2 (dhis2#3627)

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6134] Update sdk release version to 1.10.0 (dhis2#3629)

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6161] Add server version 41 (dhis2#3630)

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Remove old form option (dhis2#3632)

* [ANDROAPP-6162] Remove COMPOSE_FORM option

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <[email protected]>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* Create deploy_release.yml

placeholder workflow

* Rename deploy_release.yml to deploy-release.yml

* Update deploy-release.yml

* feat: [ANDROAPP-6165] add continuous-delivery job to github (dhis2#3650)

* fix: [ANDROAPP-6175] TeiDataFragment keeps reloading in landscape (dhis2#3647)

* [ANDROAPP-6175] TeiDataFragment keeps reloading in landscape

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Check if grouped events option is visible

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Ignore flaky test

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* ci: [ANDROAPP-6167] deploy release job

* ci: [ANDROAPP-6167] deploy release job

* ci: [ANDROAPP-6167] deploy release job

* update vCode

* build: 3.0 release (dhis2#3654)

* build: 3.0 release

* build: 3.0 release

* build: rename apk files

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
Co-authored-by: Pablo <[email protected]>

* ci: Update version name to 3.0.0.1 and version code to 134

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6195] Add missing text resource keys (dhis2#3667)

* fix: [ANDROAPP-6195] Add missing text resource keys

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] remove duplicates and typos

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] remove duplicates

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6195] add missing transifex configuration

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* fix: [ANDROAPP-6194] Search outside the program (dhis2#3664)

* fix: [ANDROAPP-6194] Send fetched list as parameter to avoid duplicated on search

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6194] Send fetched list as parameter to avoid duplicated on search

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6194] Add mockedWebServer response to mock get tracked entity instances

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* fix: [ANDROAPP-6210] Manually instantiate resourceManager on BreakTheGlassBottomDialog (dhis2#3671)

Signed-off-by: andresmr <[email protected]>

* fix: missing translations (dhis2#3674)

* fix: missing translations

Signed-off-by: Pablo <[email protected]>

* fix: duplicated resources

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>

* chore: Update SDK to 1.10.0.1 (dhis2#3679)

* chore: Update SDK to 1.10.0.1-SNAPSHOT

Signed-off-by: andresmr <[email protected]>

* chore: Update SDK to 1.10.0.1

Signed-off-by: andresmr <[email protected]>

---------

Signed-off-by: andresmr <[email protected]>

* build: Update release notes

Signed-off-by: andresmr <[email protected]>

* fix: refactoring changes

* chore: klint checkstyle

* feat: proposal to standardize TEI's cards

* chore: updating tei list card details

* fix: ignoring test

* chore(app-module): klint format

* chore(emis-module): klint format

---------

Signed-off-by: Pablo <[email protected]>
Signed-off-by: andresmr <[email protected]>
Co-authored-by: Pablo <[email protected]>
Co-authored-by: Ferdy Rodriguez <[email protected]>
Co-authored-by: Manu Muñoz <[email protected]>
Co-authored-by: Andrés Miguel Rubio <[email protected]>
Co-authored-by: Xavier Molloy <[email protected]>
Co-authored-by: Victor Garcia <[email protected]>
Co-authored-by: manu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants