Added UserSharedPreferenceAdapter for User's private data

Mixed other minor errors

Author: iamhssingh

drfapi/src/main/java/com/civilmachines/drfapi/DjangoBaseRequest.java

@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.support.annotation.Nullable;
 
-import com.android.volley.AuthFailureError;
 import com.android.volley.NetworkResponse;
 import com.android.volley.Response;
 import com.android.volley.toolbox.JsonRequest;
@@ -44,7 +43,6 @@ public abstract class DjangoBaseRequest<T> extends JsonRequest<T> {
     private Context cont;
 
     // Change these static variable to define how token is stored in Android app and sent on server
-    public static String key_token = "token";
     public static String keyAuthorizationHeader = "Authorization";
     public static String keyTokenPrefix = "Bearer ";
 
@@ -79,18 +77,17 @@ public DjangoBaseRequest(int method,
      * Sets Content-Type to application/json
      * Checks for presence of token in SharedPreferenceAdapter and sets it.
      * @return Map<String, String> a Map of headers
-     * @throws AuthFailureError from super
      * @author Himanshu Shankar (https://himanshus.com)
      */
     @Override
-    public Map<String, String> getHeaders() throws AuthFailureError {
-        SharedPreferenceAdapter shaPre;
+    public Map<String, String> getHeaders() {
+        UserSharedPreferenceAdapter shaPre;
 
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/json");
-        shaPre = new SharedPreferenceAdapter(cont);
+        shaPre = new UserSharedPreferenceAdapter(cont);
 
-        String token = shaPre.getString(key_token);
+        String token = shaPre.getToken();
 
         if(token != null){
             headers.put(keyAuthorizationHeader, keyTokenPrefix + token);

drfapi/src/main/java/com/civilmachines/drfapi/DjangoErrorListener.java

@@ -32,7 +32,9 @@
 public abstract class DjangoErrorListener implements Response.ErrorListener {
 
     public abstract void onNetworkError(String response);
+
     public abstract void onAuthFailureError(String response);
+
     public abstract void onTimeoutError(String response);
     public abstract void onNoConnectionError(String response);
     public abstract void onParseError(String response);
@@ -84,12 +86,15 @@ public void onErrorResponse(VolleyError error) {
                 switch (statusCode) {
                     case 400: {
                         onBadRequestError("Server configuration has some error.");
+                        break;
                     }
                     case 404: {
                         onNotFoundError("API Endpoint not found.");
+                        break;
                     }
                     default: {
                         onDefaultHTMLError(response);
+                        break;
                     }
                 }
             } else {
@@ -103,23 +108,26 @@ public void onErrorResponse(VolleyError error) {
                             // Method not allowed error
                             onMethodNotAllowedError(error_response.optString("detail",
                                     "Invalid method used in request."));
+                            break;
                         }
                         case 404: {
                             // Object not found error
                             onNotFoundError(error_response.optString("detail",
                                     "Object with provided detail does not exists."));
+                            break;
                         }
                         case 400: {
                             // Bad request error
-                            if (error_response.optString("detail") != null)
+                            if (error_response.optString("detail", null) != null)
                                 onBadRequestError(error_response.optString("detail"));
                             else
                                 onBadRequestError(error_response);
+                            break;
                         }
                         case 403 | 401: {
-                            // Must trigger a logout signal
                             onForbiddenError(error_response.optString("detail",
                                     "You're not allowed to make this request."));
+                            break;
                         }
                         case 422: {
                             // Similar use case as of bad request, used in drf_user
@@ -130,16 +138,19 @@ else if (error_response.has("detail"))
                                 onUnprocessableEntityError(error_response.optString("detail"));
                             else
                                 onUnprocessableEntityError(error_response);
+                            break;
 
                         }
                         case 415: {
                             // Request sent in unsupported media type, such as text
                             onUnsupportedMediaTypeError(error_response.optString("detail",
                                     "Request sent in invalid format."));
+                            break;
                         }
                         default: {
                             // Default case scenario
                             onDefaultJsonError(error_response);
+                            break;
                         }
                     }
                 } catch (JSONException ex) {
@@ -159,8 +170,15 @@ else if (error instanceof NoConnectionError)
             onNoConnectionError(response);
         else if (error instanceof NetworkError)
             onNetworkError(response);
-        else if( error instanceof AuthFailureError)
-            onAuthFailureError(response);
+        else if (error instanceof AuthFailureError) {
+            JSONObject error_response;
+            try {
+                error_response = new JSONObject(response);
+                onForbiddenError(error_response.optString("detail", "Couldn't perform task because of permission error."));
+            } catch (JSONException ex) {
+                onAuthFailureError(response);
+            }
+        }
         else
             onDefaultError(response);
     }

drfapi/src/main/java/com/civilmachines/drfapi/SharedPreferenceAdapter.java

@@ -28,8 +28,8 @@
 
 public class SharedPreferenceAdapter {
 
-    static private SharedPreferences main;
-    static private SharedPreferences.Editor edit;
+    SharedPreferences main;
+    private SharedPreferences.Editor edit;
 
     /**
      * This function initializes the shared preference with Activity
@@ -44,22 +44,11 @@ public SharedPreferenceAdapter(Context cont){
     }
 
     public SharedPreferenceAdapter(Activity act, String FileName){
-        main =  act.getSharedPreferences(FileName, Activity.MODE_PRIVATE);
+        main = act.getSharedPreferences(FileName, Activity.MODE_PRIVATE);
     }
 
     public SharedPreferenceAdapter(Context cont, String AdapterName){
-        main =  cont.getSharedPreferences(AdapterName, Context.MODE_PRIVATE);
-    }
-
-   /* public SharedPreferenceAdapter(BusinessRecyclerView_Adapter businessRecyclerView_adapter) {
-        main = businessRecyclerView_adapter.onClick(View v);
-    }
-*/
-
-    public boolean onLoggedIn(String val){
-        edit = main.edit();
-        edit.putString("login", val);
-        return edit.commit();
+        main = cont.getSharedPreferences(AdapterName, Context.MODE_PRIVATE);
     }
 
     public int getInt(String key){
@@ -70,10 +59,6 @@ public String getString(String key){
         return main.getString(key, null);
     }
 
-    public String isLoggedIn(){
-        return main.getString("token", null);
-    }
-
     public boolean saveData(String key, String val){
         edit = main.edit();
         edit.putString(key, val);

drfapi/src/main/java/com/civilmachines/drfapi/UserSharedPreferenceAdapter.java

@@ -0,0 +1,34 @@
+package com.civilmachines.drfapi;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+public class UserSharedPreferenceAdapter extends SharedPreferenceAdapter {
+    public static String userPrivate = "user_private";
+    public static String keyToken = "token";
+
+    public UserSharedPreferenceAdapter(Context cont) {
+        super(cont, userPrivate);
+    }
+
+    public UserSharedPreferenceAdapter(Activity act) {
+        super(act, userPrivate);
+    }
+
+    public boolean isLoggedIn() {
+        return main.contains(keyToken) && super.getString(keyToken).length() > 10;
+    }
+
+    public String getToken() {
+        return getString(keyToken);
+    }
+
+    public boolean saveToken(@NonNull String token) {
+        return saveData(keyToken, token);
+    }
+
+    public void logOut() {
+        super.clearData();
+    }
+}