Refactor onFailure methods to simplify error handling

Removed userInfo parameter from onFailure methods and related JSON handling.

Author: dporwal-shipit

SCGatewayPhonegap.java

@@ -14,8 +14,7 @@
 import java.util.ArrayList;
 import android.content.Context;
 import android.util.Log;
-import android.
-widget.Toast;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -27,7 +26,6 @@
 import com.smallcase.gateway.data.models.InitialisationResponse;
 import com.smallcase.gateway.data.listeners.DataListener;
 import com.google.gson.Gson;
-import com.smallcase.gateway.data.models.UserInfo;
 import com.smallcase.gateway.data.models.SmallcaseGatewayDataResponse;
 import com.smallcase.gateway.data.listeners.TransactionResponseListener;
 import com.smallcase.gateway.data.listeners.MFHoldingsResponseListener;
@@ -251,7 +249,7 @@ public void onSuccess(@NotNull SmallPlugResult smallPlugResult) {
                 }
 
                 @Override
-                public void onFailure(int i, @NotNull String s, @Nullable String smallcaseAuthToken, @Nullable UserInfo userInfo) {
+                public void onFailure(int i, @NotNull String s) {
 
                     Log.d("SCGatewayPhoneGap", "smallplug onFailure: " + i + s);
 
@@ -260,22 +258,6 @@ public void onFailure(int i, @NotNull String s, @Nullable String smallcaseAuthTo
                         jo.put("errorCode", i);
                         jo.put("errorMessage", s);
 
-                        JSONObject dataObj = new JSONObject();
-                        if (userInfo != null) {
-                            JSONObject userInfoObj = new JSONObject();
-                            if (userInfo.getNumber() != null) {
-                                userInfoObj.put("number", userInfo.getNumber());
-                            }
-                            if (userInfo.getCountryCode() != null) {
-                                userInfoObj.put("countryCode", userInfo.getCountryCode());
-                            }
-                            dataObj.put("userInfo", userInfoObj);
-                        }
-                        
-                        if (dataObj.length() > 0) {
-                            jo.put("data", dataObj);
-                        }
-                        
                         callbackContext.error(jo);
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -329,7 +311,7 @@ public void onSuccess(@NotNull SmallPlugResult smallPlugResult) {
                 }
 
                 @Override
-                public void onFailure(int i, @NotNull String s, @Nullable String smallcaseAuthToken, @Nullable UserInfo userInfo) {
+                public void onFailure(int i, @NotNull String s) {
 
                     Log.d("SCGatewayPhoneGap", "smallplug onFailure: " + i + s);
 
@@ -338,22 +320,6 @@ public void onFailure(int i, @NotNull String s, @Nullable String smallcaseAuthTo
                         jo.put("errorCode", i);
                         jo.put("errorMessage", s);
 
-                        JSONObject dataObj = new JSONObject();
-                        if (userInfo != null) {
-                            JSONObject userInfoObj = new JSONObject();
-                            if (userInfo.getNumber() != null) {
-                                userInfoObj.put("number", userInfo.getNumber());
-                            }
-                            if (userInfo.getCountryCode() != null) {
-                                userInfoObj.put("countryCode", userInfo.getCountryCode());
-                            }
-                            dataObj.put("userInfo", userInfoObj);
-                        }
-                        
-                        if (dataObj.length() > 0) {
-                            jo.put("data", dataObj);
-                        }
-                        
                         callbackContext.error(jo);
                     } catch (JSONException e) {
                         e.printStackTrace();