Handled locked account error on api failure

app/res/values-es/strings.xml

@@ -461,4 +461,5 @@
     <string name="personalid_camera_permission_title">Permiso de cámara</string>
     <string name="personalid_camera_permission_msg">Para tomar una foto, CommCare necesita permiso para usar la cámara de tu dispositivo.</string>
     <string name="personalid_capture_photo">Tomar foto</string>
+    <string name="personalid_configuration_locked_account">Su cuenta ha sido bloqueada. Por favor, contacte con el servicio de asistencia.</string>
 </resources>

app/res/values-fr/strings.xml

@@ -440,6 +440,7 @@ License.
     <string name="personalid_name_fragment_subtitle">Veuillez saisir votre nom tel qu\'il apparaît sur votre pièce d\'identité émise par le gouvernement</string>
     <string name="personalid_name_empty_error">Le champ Nom ne peut pas être vide</string>
     <string name="personalid_configuration_process_failed_title">Échec du processus</string>
+    <string name="personalid_configuration_locked_account">Votre compte a été bloqué. Veuillez contacter le support</string>
     <string name="personalid_configuration_process_failed_subtitle">Votre appareil n\'est pas compatible avec PersonalID pour le moment. Veuillez réessayer sur un autre appareil.</string>
     <string name="personalid_configuration_process_failed_security_subtitle">Votre appareil n\'est pas compatible avec PersonalID pour le moment en raison de l\'indisponibilité de la fonctionnalité de sécurité. Veuillez réessayer sur un autre appareil.</string>
     <string name="personalid_configuration_process_failed_play_services">Veuillez vous assurer que le Play Store est disponible sur votre appareil et qu\'il est à jour.</string>

app/res/values-hi/strings.xml

@@ -461,4 +461,5 @@ License.
     <string name="personalid_camera_permission_title">कैमरे के लिए अनुमति</string>
     <string name="personalid_camera_permission_msg">तस्वीर लेने के लिए, CommCare को आपके डिवाइस के कैमरे का उपयोग करने की अनुमति चाहिए।</string>
     <string name="personalid_capture_photo">तस्वीर लें</string>
+    <string name="personalid_configuration_locked_account">आपका खाता लॉक कर दिया गया है। कृपया सहायता से संपर्क करें</string>
 </resources>

app/res/values-pt/strings.xml

@@ -446,6 +446,7 @@
     <string name="personalid_name_fragment_subtitle">Por favor, insira o seu nome tal como aparece na sua identificação emitida pelo governo</string>
     <string name="personalid_name_empty_error">O campo nome não pode estar vazio</string>
     <string name="personalid_configuration_process_failed_title">Falha no processo</string>
+    <string name="personalid_configuration_locked_account">A sua conta foi bloqueada. Entre em contacto com o suporte</string>
     <string name="personalid_configuration_process_failed_subtitle">De momento, o seu dispositivo não está qualificado para se inscrever no PersonalID. Tente novamente noutro dispositivo.</string>
     <string name="personalid_configuration_process_failed_security_subtitle">De momento, o seu dispositivo não está qualificado para se inscrever no PersonalID devido à indisponibilidade da funcionalidade de segurança %s. Tente novamente noutro dispositivo.</string>
     <string name="personalid_configuration_process_failed_play_services">Certifique-se de que a Play Store está disponível no seu dispositivo e está atualizada.</string>

app/res/values-sw/strings.xml

@@ -446,6 +446,7 @@
     <string name="personalid_name_fragment_subtitle">Tafadhali ingiza jina lako jinsi linavyoonekana kwenye kitambulisho chako kilichotolewa na serikali</string>
     <string name="personalid_name_empty_error">Sehemu ya jina haiwezi kuwa tupu</string>
     <string name="personalid_configuration_process_failed_title">Mchakato Umeshindwa</string>
+    <string name="personalid_configuration_locked_account">Akaunti yako imefungwa. Tafadhali wasiliana na usaidizi</string>
     <string name="personalid_configuration_process_failed_subtitle">Kifaa chako hakijatimiza masharti ya kujisajili kwa Kitambulisho cha Kibinafsi kwa wakati huu. Tafadhali jaribu tena kwenye kifaa tofauti.</string>
     <string name="personalid_configuration_process_failed_security_subtitle">Kifaa chako hakijatimiza masharti ya kujisajili kwa Kitambulisho cha Kibinafsi kwa wakati huu kwa sababu ya kutopatikana kwa kipengele cha usalama cha %s. Tafadhali jaribu tena kwenye kifaa tofauti.</string>
     <string name="personalid_configuration_process_failed_play_services">Tafadhali hakikisha kuwa Play Store inapatikana kwenye kifaa chako na imesasishwa.</string>

app/res/values-ti/strings.xml

@@ -432,6 +432,7 @@
     <string name="personalid_name_fragment_subtitle">በጃኹም ኣብቲ ብመንግስቲ ዝተዋህበኩም መለለዪ መንነትኩም ከም ዝረአ ስምኩም ኣእትዉ</string>
     <string name="personalid_name_empty_error">ናይ ስም ዓውዲ ባዶ ክኸውን ኣይክእልን እዩ።</string>
     <string name="personalid_configuration_process_failed_title">መስርሕ ፈሺሉ።</string>
+    <string name="personalid_configuration_locked_account">ኣካውንትካ ተዓጽዩ ኣሎ። በጃኹም ንደገፍ ተወከሱ</string>
     <string name="personalid_configuration_process_failed_subtitle">መሳርሒኻ ኣብዚ እዋን\'ዚ ን PersonalID ንምምዝጋብ ብቑዕ ኣይኮነን። በጃኹም ኣብ ካልእ መሳርሒ እንደገና ፈትኑ።</string>
     <string name="personalid_configuration_process_failed_security_subtitle">መሳርሒኻ ኣብዚ እዋን እዚ ብሰንኪ %s ናይ ጸጥታ ባህሪ ዘይምህላዉ ንPersonalID ክምዝገብ ብቑዕ ኣይኮነን። በጃኹም ኣብ ካልእ መሳርሒ እንደገና ፈትኑ።</string>
     <string name="personalid_configuration_process_failed_play_services">እባኮም ኣረጋግጹ ፡ እቲ ፕሌይ ስቶር ኣብ መሳርሒ እትርከቡ እንተሎ እና ትሓዘ እንተኾነ።</string>

app/res/values/strings.xml

@@ -598,6 +598,7 @@
     <string name="personalid_name_fragment_subtitle">Please enter your name as it appears on your government-issued identification</string>
     <string name="personalid_name_empty_error">Name field cannot be empty</string>
     <string name="personalid_configuration_process_failed_title">Process Failed</string>
+    <string name="personalid_configuration_locked_account">Your account has been locked. Please contact support</string>
     <string name="personalid_configuration_process_failed_subtitle">Your device isn\'t eligible to sign up for PersonalID at this time. Please try again on a different device.</string>
     <string name="personalid_configuration_process_failed_play_services">Please make sure Play Store is available on your device and is updated.</string>
     <string name="personalid_configuration_process_failed_temporary_unavailable">Temporary error in establishing your device eligibility. Please try again after a day.</string>

app/src/org/commcare/connect/PersonalIdManager.java

@@ -531,7 +531,7 @@ public void processSuccess(int responseCode, InputStream responseData) {
             }
 
             @Override
-            public void processFailure(int responseCode, @Nullable InputStream errorResponse) {
+            public void processFailure(int responseCode, @Nullable InputStream errorResponse,String endPoint) {
                 Logger.log("ERROR", String.format(Locale.getDefault(), "Failed: %d", responseCode));
             }
 

app/src/org/commcare/connect/network/ApiPersonalId.java

@@ -3,17 +3,18 @@
 import android.content.Context;
 import android.os.Handler;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.collect.ArrayListMultimap;
 
 import org.commcare.CommCareApplication;
 import org.commcare.activities.CommCareActivity;
 import org.commcare.android.database.connect.models.ConnectLinkedAppRecord;
-import org.commcare.connect.ConnectConstants;
 import org.commcare.android.database.connect.models.ConnectUserRecord;
+import org.commcare.connect.ConnectConstants;
 import org.commcare.connect.database.ConnectAppDatabaseUtil;
 import org.commcare.connect.database.ConnectDatabaseHelper;
 import org.commcare.connect.database.ConnectUserDatabaseUtil;
-import org.commcare.connect.network.connect.ConnectApiClient;
 import org.commcare.connect.network.connectId.PersonalIdApiClient;
 import org.commcare.core.network.AuthInfo;
 import org.commcare.dalvik.R;
@@ -37,7 +38,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import androidx.annotation.NonNull;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -216,7 +216,7 @@ public static void dismissProgressDialog(Context context) {
         }
     }
 
-    private static void callApi(Context context, Call<ResponseBody> call, IApiCallback callback) {
+    private static void callApi(Context context, Call<ResponseBody> call, IApiCallback callback, String url) {
         showProgressDialog(context);
         call.enqueue(new Callback<>() {
             @Override
@@ -228,14 +228,14 @@ public void onResponse(@NonNull Call<ResponseBody> call, @NonNull Response<Respo
                         callback.processSuccess(response.code(), responseStream);
                     } catch (IOException e) {
                         // Handle error when reading the stream
-                        callback.processFailure(response.code(), null);
+                        callback.processFailure(response.code(), null, url);
                     }
                 } else {
                     // Handle validation errors
                     logNetworkError(response);
                     InputStream stream = response.errorBody() != null ?
                             response.errorBody().byteStream() : null;
-                    callback.processFailure(response.code(), stream);
+                    callback.processFailure(response.code(), stream, url);
                 }
             }
 
@@ -260,14 +260,14 @@ public static void confirmBackupCode(Context context,
 
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.confirmBackupCode(tokenAuth, params);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.confirmBackupCode);
     }
 
     public static void startConfiguration(Context context, Map<String, String> body, String integrityToken,
             String requestHash, IApiCallback callback) {
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.startConfiguration(integrityToken, requestHash, body);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.startConfiguration);
     }
 
     public static void validateFirebaseIdToken(String token,Context context, String firebaseIdToken, IApiCallback callback) {
@@ -278,7 +278,7 @@ public static void validateFirebaseIdToken(String token,Context context, String
         Objects.requireNonNull(tokenAuth);
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.validateFirebaseIdToken(tokenAuth,params);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.validateFirebaseIdToken);
     }
 
     public static void addOrVerifyName(Context context, String name, String token, IApiCallback callback) {
@@ -291,7 +291,7 @@ public static void addOrVerifyName(Context context, String name, String token, I
 
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.checkName(tokenAuth, params);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.checkName);
     }
 
     public static void updateUserProfile(Context context, String username,
@@ -310,7 +310,7 @@ public static void updateUserProfile(Context context, String username,
         }
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.updateProfile(token, params);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.updateProfile);
     }
 
     public static void setPhotoAndCompleteProfile(Context context, String userName,
@@ -328,15 +328,15 @@ public static void setPhotoAndCompleteProfile(Context context, String userName,
 
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.completeProfile(tokenAuth, params);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.completeProfile);
     }
 
     public static void retrieveCredentials(Context context, String userName, String password, IApiCallback callback) {
         AuthInfo authInfo = new AuthInfo.ProvidedAuth(userName,password,false);
         String tokenAuth = HttpUtils.getCredential(authInfo);
         ApiService apiService = PersonalIdApiClient.getClientApi();
         Call<ResponseBody> call = apiService.retrieveCredentials(tokenAuth);
-        callApi(context, call, callback);
+        callApi(context, call, callback,PersonalIdApiClient.BASE_URL+ApiEndPoints.CREDENTIALS);
     }
 
     private static void logNetworkError(Response<?> response) {

app/src/org/commcare/connect/network/ConnectNetworkHelper.java

@@ -340,7 +340,7 @@ public void processClientError(int responseCode) {
                         ConnectSsoHelper.discardTokens(context, null);
                         handler.processTokenUnavailableError();
                     } else {
-                        handler.processFailure(responseCode, null);
+                        handler.processFailure(responseCode, null, url);
                     }
                 }
             }
@@ -353,7 +353,7 @@ public void processServerError(int responseCode) {
                 CrashUtil.reportException(new Exception(message));
 
                 //500 error for internal server error
-                handler.processFailure(responseCode, null);
+                handler.processFailure(responseCode, null, url);
             }
 
             @Override
@@ -363,7 +363,7 @@ public void processOther(int responseCode) {
                 String message = String.format(Locale.getDefault(), "Call:%s\nResponse code:%d", url, responseCode);
                 CrashUtil.reportException(new Exception(message));
 
-                handler.processFailure(responseCode, null);
+                handler.processFailure(responseCode, null, url);
             }
 
             @Override
@@ -373,7 +373,7 @@ public void handleIOException(IOException exception) {
                     handler.processNetworkFailure();
                 } else {
                     Logger.exception("IO Exception during API call", exception);
-                    handler.processFailure(-1, null);
+                    handler.processFailure(-1, null, url);
                 }
             }
 

app/src/org/commcare/connect/network/IApiCallback.java

@@ -9,7 +9,7 @@
  */
 public interface IApiCallback {
     void processSuccess(int responseCode, InputStream responseData);
-    void processFailure(int responseCode, @Nullable InputStream errorResponse);
+    void processFailure(int responseCode, @Nullable InputStream errorResponse, String url);
     void processNetworkFailure();
     void processOldApiError();
     void processTokenUnavailableError();