Merge 041a090 into 5467d34

opensrp · Apr 6, 2022 · ddb8eff · ddb8eff
2 parents 5467d34 + 041a090
commit ddb8eff
Show file tree

Hide file tree

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

diff --git a/opensrp-core/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java b/opensrp-core/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java
@@ -198,7 +198,7 @@ private void remoteLogin(final String userName, final char[] password, final Acc
                             } else if (loginResponse == UNAUTHORIZED) {
                                 getLoginView().showErrorDialog(getApplicationContext().getResources().getString(R.string.unauthorized));
                             } else if (loginResponse == INVALID_GRANT) {
-                                String pwdResetEndpoint = loginResponse.getRawData().optString(AccountHelper.CONFIGURATION_CONSTANTS.ISSUER_ENDPOINT_URL);
+                                String pwdResetEndpoint = loginResponse.getRawData() != null ? loginResponse.getRawData().optString(AccountHelper.CONFIGURATION_CONSTANTS.ISSUER_ENDPOINT_URL) : "";
                                 showPasswordResetView(pwdResetEndpoint);
                             } else {
                                 getLoginView().showErrorDialog(loginResponse.message());

diff --git a/opensrp-core/src/main/java/org/smartregister/view/activity/BaseLoginActivity.java b/opensrp-core/src/main/java/org/smartregister/view/activity/BaseLoginActivity.java
@@ -187,13 +187,13 @@ public void showErrorDialog(String title, String message) {
         }
         if (alertDialog == null) {
             alertDialog = new AlertDialog.Builder(this)
-                    .setPositiveButton("OK", (dialogInterface, i) -> dialogInterface.dismiss()).create();
+                    .setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss())
+                    .create();
         }
 
         alertDialog.setTitle(title);
         alertDialog.setMessage(message);
         alertDialog.show();
-
     }
 
     public void showProgress(final boolean show) {