-Create ref Number when getting error

-Fixing toast and layout

app/src/main/java/com/fusi24/entryPermitScanner/base/BaseActivity.java

@@ -21,7 +21,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public RestService getRestService() {
         if (restService == null) {
-            restService = RestServiceFactory.create(getJwtToken(), this);
+            restService = RestServiceFactory.create(getJwtToken(), getSessionManager().getUserSid(), this);
         }
         return restService;
     }

app/src/main/java/com/fusi24/entryPermitScanner/data/SessionManager.java

@@ -2,6 +2,13 @@ package com.fusi24.entryPermitScanner.data;
 
 import android.content.SharedPreferences;
 
+import com.fusi24.entryPermitScanner.data.entity.DataSite;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
 public class SessionManager {
 
     private static final String IS_LOGIN                = "is_login";
@@ -13,6 +20,7 @@ public class SessionManager {
     private static final String USER_TELEPHONE          = "user_telephone";
     private static final String USER_RFID_NUMBER        = "user_rfid_number";
     private static final String GATE                    = "gate";
+    private static final String SITE_LIST               = "site_list";
     private static final String IS_SERIALPORT_2         = "serial_port_2";
     private static final String IS_DEVELOPMENT          = "development";
 
@@ -112,6 +120,24 @@ public class SessionManager {
         editor.apply();
     }
 
+    public List<DataSite> getSiteList(){
+        List<DataSite> siteList;
+        String jsonPreferences = preferences.getString(SITE_LIST, "");
+
+        Type type = new TypeToken<List<DataSite>>() {}.getType();
+        siteList = new Gson().fromJson(jsonPreferences, type);
+
+        return siteList;
+    }
+
+    public void setSiteList(List<DataSite> list){
+        String jsonCurProduct = new Gson().toJson(list);
+
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString(SITE_LIST , jsonCurProduct);
+        editor.apply();
+    }
+
     public Boolean isSerialPort2() {
         return preferences.getBoolean(IS_SERIALPORT_2, false);
     }

app/src/main/java/com/fusi24/entryPermitScanner/data/api/RestServiceFactory.java

@@ -7,12 +7,12 @@ import androidx.annotation.NonNull;
 import com.fusi24.entryPermitScanner.BuildConfig;
 import com.fusi24.entryPermitScanner.config.Constant;
 import com.fusi24.entryPermitScanner.data.SessionManager;
+import com.fusi24.entryPermitScanner.data.interceptor.RestHeaderModifierInterceptor;
 import com.fusi24.entryPermitScanner.util.Helper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
@@ -20,8 +20,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class RestServiceFactory {
 
-    public static RestService create(String token, Context context) {
-        OkHttpClient client = makeClientService(makeLoggingInterceptor(), token);
+    public static RestService create(String token, String userId, Context context) {
+        OkHttpClient client = makeClientService(makeLoggingInterceptor(), token, userId, context);
         return makeRestService(client, makeGson(), context);
     }
 
@@ -49,14 +49,9 @@ public class RestServiceFactory {
 
     @NonNull
     private static OkHttpClient makeClientService(
-            HttpLoggingInterceptor loggingInterceptor, String token) {
+            HttpLoggingInterceptor loggingInterceptor, String token, String userId, Context context) {
         return new OkHttpClient.Builder()
-                .addInterceptor(chain -> {
-                    Request.Builder ongoing = chain.request().newBuilder();
-                    ongoing.addHeader("Content-Type", "application/json");
-                    ongoing.addHeader("x-api-key", token);
-                    return chain.proceed(ongoing.build());
-                })
+                .addInterceptor(new RestHeaderModifierInterceptor(token, userId, context))
                 .addInterceptor(loggingInterceptor)
                 .build();
     }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/APIError.java

@@ -0,0 +1,47 @@
+package com.fusi24.entryPermitScanner.data.entity;
+
+public class APIError {
+
+    private int statusCode;
+    private String message;
+    private String refNumber;
+
+    public APIError(int statusCode, String message, String refNumber){
+        this.statusCode = statusCode;
+        this.message = message;
+        this.refNumber = refNumber;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getRefNumber() {
+        return refNumber;
+    }
+
+    public void setRefNumber(String refNumber) {
+        this.refNumber = refNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "APIError{" +
+                "statusCode=" + statusCode +
+                ", message='" + message + '\'' +
+                ", refNumber='" + refNumber + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/fusi24/entryPermitScanner/data/interceptor/RestHeaderModifierInterceptor.java

@@ -0,0 +1,59 @@
+package com.fusi24.entryPermitScanner.data.interceptor;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.widget.Toast;
+
+import com.fusi24.entryPermitScanner.data.entity.APIError;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import timber.log.Timber;
+
+public class RestHeaderModifierInterceptor implements Interceptor {
+
+    private String token;
+    private String userId;
+    private Context context;
+
+    public RestHeaderModifierInterceptor(String token, String userId, Context context){
+        this.token = token;
+        this.userId = userId;
+        this.context = context;
+    }
+
+    @NotNull
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request()
+                .newBuilder()
+                .addHeader("Content-Type", "application/json")
+                .addHeader("x-api-key", token)
+                .addHeader("userId",userId)
+                .build();
+        Response response = chain.proceed(request);
+
+        if(!response.isSuccessful()){
+            APIError error = new APIError(response.code(),response.message(),response.header("refNumber"));
+            Timber.d("DEVELOPER : %s", error);
+            if(error.getRefNumber() != null)
+                backgroundThreadToast(context,"Error Rest API Service with Ref Number: "+error.getRefNumber());
+            else
+                backgroundThreadToast(context,"Error Occurred with Response: "+error.getStatusCode()+" "+error.getMessage());
+        }
+
+        return response;
+    }
+
+    public static void backgroundThreadToast(final Context context, final String msg){
+        if(context != null && msg != null){
+            new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, msg, Toast.LENGTH_LONG).show());
+        }
+    }
+}

app/src/main/java/com/fusi24/entryPermitScanner/ui/ScanActivity.java

@@ -8,7 +8,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -137,11 +136,11 @@ public class ScanActivity extends LFScanProcessing implements GoogleApiClient.Co
     }
 
     private void setStatusScan() {
-        switch (Integer.parseInt(idCheckType)) {
-            case 649:
+        switch (checkTypeName) {
+            case "Check In":
                 binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_green));
                 break;
-            case 650:
+            case "Check Out":
             default:
                 binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_blue));
                 break;
@@ -202,18 +201,18 @@ public class ScanActivity extends LFScanProcessing implements GoogleApiClient.Co
                 double latitude = location.getLatitude();
                 double longitude = location.getLongitude();
                 longLat = longitude + "," + latitude;
-                System.out.println("DEVELOPER Location 1 : " + location.getLatitude() + " , " + location.getLongitude());
+                Timber.i("DEVELOPER Location 1 : " + location.getLatitude() + " , " + location.getLongitude());
             }
         });
-        locationClient.getLastLocation().addOnCanceledListener(() -> Toast.makeText(this, "Get last location cancelled", Toast.LENGTH_SHORT).show());
-        locationClient.getLastLocation().addOnFailureListener(e -> System.out.println(e.getMessage()));
+        locationClient.getLastLocation().addOnCanceledListener(() -> Timber.i("Get last location cancelled"));
+        locationClient.getLastLocation().addOnFailureListener(Timber::e);
     }
 
     private void getSimpleLocation(){
         double latitude = simpleLocation.getLatitude();
         double longitude = simpleLocation.getLongitude();
         longLat = longitude + "," + latitude;
-        Toast.makeText(this, "Simple Location ==> Latitude : " + latitude + ", Longitude : " + longitude, Toast.LENGTH_LONG).show();
+        Timber.i("Simple Location ==> Latitude : " + latitude + ", Longitude : " + longitude);
     }
 
     @Override
@@ -240,7 +239,7 @@ public class ScanActivity extends LFScanProcessing implements GoogleApiClient.Co
 
             longLat = currentLongitude + "," + currentLatitude;
 
-            Toast.makeText(this, "Latitude : " + currentLatitude + ", Longitude : " + currentLongitude, Toast.LENGTH_LONG).show();
+            Timber.i("Latitude : " + currentLatitude + ", Longitude : " + currentLongitude);
         }
     }
 
@@ -284,6 +283,6 @@ public class ScanActivity extends LFScanProcessing implements GoogleApiClient.Co
         currentLongitude = location.getLongitude();
 
         longLat = currentLongitude + "," + currentLatitude;
-        Toast.makeText(this, "Latitude : " + currentLatitude + ", Longitude : " + currentLongitude, Toast.LENGTH_LONG).show();
+        Timber.i("Latitude : " + currentLatitude + ", Longitude : " + currentLongitude);
     }
 }

app/src/main/java/com/fusi24/entryPermitScanner/ui/home/HomeActivity.java

@@ -214,8 +214,10 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
 
     @Override
     public void showDataDevice(List<DataDevice> dataDevices) {
-        binding.tvGateName.setText(dataDevices.get(0).getGate().getName());
-        siteAdapter.updateSiteList(Stream.of(dataDevices.get(0).getGate().getSites()).sortBy(DataSite::getId).toList());
+        getSessionManager().setGate(dataDevices.get(0).getGate().getName());
+        getSessionManager().setSiteList(Stream.of(dataDevices.get(0).getGate().getSites()).sortBy(DataSite::getId).toList());
+        binding.tvGateName.setText(getSessionManager().getGate());
+        siteAdapter.updateSiteList(getSessionManager().getSiteList());
         siteAdapter.notifyDataSetChanged();
     }
 

app/src/main/java/com/fusi24/entryPermitScanner/ui/scanresult/ScanResultActivity.java

@@ -28,6 +28,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import timber.log.Timber;
+
 public class ScanResultActivity extends BaseActivity implements ScanResultView {
 
     public static final String RFID_CARD_NUMBER = "rfid_card_number";
@@ -111,7 +113,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
         String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition, problems.documentType.category,problems.documentType.group"};
 
         String bebas = "Location = " + longLat;
-        Toast.makeText(this, bebas, Toast.LENGTH_LONG).show();
+        Timber.i(bebas);
 
         presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, getSessionManager().getUserId(), expand);
     }
@@ -127,11 +129,11 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     }
 
     private void setStatusScan(){
-        switch (Integer.parseInt(idCheckType)){
-            case 649 :
+        switch (checkTypeName){
+            case "Check In" :
                 binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_green_no_rad));
                 break;
-            case 650 :
+            case "Check Out" :
             default:
                 binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_blue_no_rad));
                 break;

app/src/main/res/layout/activity_home.xml

@@ -51,6 +51,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="12dp"
+                            android:layout_marginEnd="12dp"
                             android:layout_weight="1"
                             android:textSize="14sp"
                             android:textColor="@color/colorBlack"
@@ -83,6 +84,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:layout_marginStart="12dp"
+                            android:layout_marginEnd="12dp"
                             android:textSize="14sp"
                             android:textColor="@color/colorBlack"
                             tools:text="0009449244" />
@@ -114,6 +116,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:layout_marginStart="12dp"
+                            android:layout_marginEnd="12dp"
                             android:textSize="14sp"
                             android:textColor="@color/colorBlack"
                             tools:text="Deddy Corbuzier" />
@@ -145,6 +148,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:layout_marginStart="12dp"
+                            android:layout_marginEnd="12dp"
                             android:textSize="14sp"
                             android:textColor="@color/colorBlack"
                             android:text="@string/label_strip"
@@ -177,6 +181,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:layout_marginStart="12dp"
+                            android:layout_marginEnd="12dp"
                             android:textSize="14sp"
                             android:textColor="@color/colorBlack"
                             tools:listitem="@layout/row_site"