-
Notifications
You must be signed in to change notification settings - Fork 24
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
Optibp master merge #916
base: optibp_main
Are you sure you want to change the base?
Optibp master merge #916
Conversation
Android 11 and 12 support added issue# 906 fix added #906
issue ref#909
issue ref#909
Issue fix 909
# Conflicts: # build.gradle # opensrp-anc/build.gradle # opensrp-anc/src/main/java/org/smartregister/anc/library/task/AttentionFlagsTask.java # reference-app/build.gradle
@@ -82,7 +94,13 @@ public boolean isSyncSettings() { | |||
|
|||
@Override | |||
public SyncFilter getEncryptionParam() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add tests for this method.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added the test
@@ -57,7 +62,14 @@ public String getExtraStringSettingsParameters() { | |||
public String getSyncFilterValue() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update or add tests for this method
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added the test
@@ -25,7 +25,12 @@ public int getSyncMaxRetries() { | |||
|
|||
@Override | |||
public SyncFilter getSyncFilterParam() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update the tests for this method.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added the test
@@ -31,7 +31,8 @@ | |||
android:name=".activity.LoginActivity" | |||
android:screenOrientation="portrait" | |||
android:theme="@style/AncAppTheme.Login" | |||
android:windowSoftInputMode="stateAlwaysHidden|adjustResize"> | |||
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this option is for the keyboard popup it was added to not automatically open the key for the text field which is not focused during the opening of the form
opensrp-anc/build.gradle
Outdated
@@ -189,7 +192,7 @@ dependencies { | |||
exclude group: 'org.yaml', module: 'snakeyaml' | |||
exclude group: 'io.ona.rdt-capture', module: 'lib' | |||
} | |||
implementation('org.smartregister:opensrp-client-core:4.3.26-SNAPSHOT@aar') { | |||
implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use 6.0.0-SNAPSHOT for client-core
reference-app/build.gradle
Outdated
@@ -242,7 +245,7 @@ dependencies { | |||
exclude group: 'io.ona.rdt-capture', module: 'lib' | |||
} | |||
|
|||
implementation('org.smartregister:opensrp-client-core:4.3.26-SNAPSHOT@aar') { | |||
implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use 6.0.0-SNAPSHOT for client-core
No description provided.