From 1d62509a443d9d7a5d96d88da5540c90a7748df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sun, 7 Jun 2020 21:46:56 +0300
Subject: [PATCH] add app version code to header

---
 .../pizzacucina/android/activity/BaseActivity.java | 13 +++++++++++++
 .../android/activity/SplashActivity.java           | 11 -----------
 .../ch/pizzacucina/android/api/ApiService.java     | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
index e9e6bf4..14480fd 100644
--- a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
+++ b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
@@ -1,6 +1,8 @@
 package ch.pizzacucina.android.activity;
 
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -41,4 +43,15 @@ public class BaseActivity extends AppCompatActivity {
         BaseActivity.currentActivity = currentActivity;
     }
 
+    public int getAppVersionCode(){
+        PackageInfo pInfo = null;
+        try {
+            pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return 0;
+        }
+        return pInfo.versionCode;
+    }
+
 }
diff --git a/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java
index 5be9e01..0d454d5 100644
--- a/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java
+++ b/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java
@@ -304,17 +304,6 @@ public class SplashActivity extends BaseActivity {
         return params;
     }
 
-    private int getAppVersionCode(){
-        PackageInfo pInfo = null;
-        try {
-            pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return 0;
-        }
-        return pInfo.versionCode;
-    }
-
     private void getCategoryList(){
         Call<ResponseArray<CategoryModel>> call = ApiService.apiInterface.getAllCategories(SessionHelper.getSelectedStore().getStoreName());
         call.enqueue(new Callback<ResponseArray<CategoryModel>>() {
diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiService.java b/app/src/main/java/ch/pizzacucina/android/api/ApiService.java
index 47d530a..ebef9b4 100644
--- a/app/src/main/java/ch/pizzacucina/android/api/ApiService.java
+++ b/app/src/main/java/ch/pizzacucina/android/api/ApiService.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import ch.pizzacucina.android.BuildConfig;
+import ch.pizzacucina.android.activity.BaseActivity;
 import ch.pizzacucina.android.helper.SessionHelper;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -44,6 +45,8 @@ public class ApiService {
 
                 Request.Builder builder = chain.request().newBuilder();
                 builder.addHeader("Content-Type", "application/json");
+                builder.addHeader("application", ApiConstants.APP_TYPE_ID_ANDROID);
+                builder.addHeader("version", getAppVersionCode());
 
                 String url = chain.request().url().toString();
                 if(!url.contains("getSessionId") && !SessionHelper.getSessionId().isEmpty()){
@@ -75,4 +78,15 @@ public class ApiService {
 
         apiInterface = retrofit.create(ApiInterface.class);
     }
+
+    private String getAppVersionCode(){
+        try{
+            int versionCode = BaseActivity.currentActivity.getAppVersionCode();
+            return String.valueOf(versionCode);
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return "";
+        }
+    }
 }
\ No newline at end of file