Merge pull request #353 from OpenSRP/upgrade_p2p_version

Upgrade native forms, family and p2p library
opensrp · Dec 7, 2020 · 52c9d69 · 52c9d69
2 parents ec7fafb + d6ef422
commit 52c9d69
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.0.6-SNAPSHOT
+VERSION_NAME=2.0.7-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library

diff --git a/opensrp-chw-core/build.gradle b/opensrp-chw-core/build.gradle
@@ -157,7 +157,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    api('org.smartregister:opensrp-client-family:2.0.0-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-family:2.0.1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
@@ -197,6 +197,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'org.smartregister', module: 'opensrp-client-immunization'
+        exclude group: 'org.smartregister', module: 'opensrp-client-family'
     }
 
     api('org.smartregister:opensrp-client-chw-pnc:2.0.0-SNAPSHOT@aar') {
@@ -207,6 +208,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'org.smartregister', module: 'opensrp-client-immunization'
+        exclude group: 'org.smartregister', module: 'opensrp-client-family'
     }
 
     api('org.smartregister:opensrp-client-chw-malaria:1.2.18-SNAPSHOT@aar') {
@@ -251,7 +253,7 @@ dependencies {
     api 'com.evernote:android-job:1.2.6'
     api 'org.greenrobot:eventbus:3.1.1'
 
-    api("org.smartregister:android-p2p-sync:0.3.8-aplha3-SNAPSHOT") {
+    api("org.smartregister:android-p2p-sync:0.3.8-aplha4-SNAPSHOT") {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'

diff --git a/...hw-core/src/main/java/org/smartregister/chw/core/activity/CoreFamilyRegisterActivity.java b/...hw-core/src/main/java/org/smartregister/chw/core/activity/CoreFamilyRegisterActivity.java
@@ -64,7 +64,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == CoreConstants.RQ_CODE.STORAGE_PERMISIONS && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+        if (requestCode == CoreConstants.RQ_CODE.STORAGE_PERMISIONS && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
             NavigationMenu navigationMenu = NavigationMenu.getInstance(this, null, null);
             if (navigationMenu != null) {
                 navigationMenu.startP2PActivity(this);