-Changed sourceset ic_launcher icon for vportal app.

app/src/main/java/com/vsoft/servicenow/chat/ChatActivity.java

@@ -362,6 +362,7 @@ public class ChatActivity extends HandleNotificationActivity implements OnDSList
         // TODO : pass the user auth token to chat server
         // TODO : pass the user auth token to chat server
         //sending token to server
         //sending token to server
         String accessToken = PrefManager.getSharedPref(ChatActivity.this, PrefManager.PREFERENCE_ACCESS_TOKEN);
         String accessToken = PrefManager.getSharedPref(ChatActivity.this, PrefManager.PREFERENCE_ACCESS_TOKEN);
+        Log.e(TAG, "Access Token "+accessToken);
         String loginUserName = PrefManager.getSharedPref(ChatActivity.this, PrefManager.PREFERENCE_LOGIN_USER_NAME);
         String loginUserName = PrefManager.getSharedPref(ChatActivity.this, PrefManager.PREFERENCE_LOGIN_USER_NAME);
         if(!TextUtils.isEmpty(accessToken) && !TextUtils.isEmpty(loginUserName)) {
         if(!TextUtils.isEmpty(accessToken) && !TextUtils.isEmpty(loginUserName)) {
             String userDetailURL = Constants.CHAT_USER_API_URL + "?" + Constants.URL_PARAM_SYSPRM_USERNAME + "=" + loginUserName;
             String userDetailURL = Constants.CHAT_USER_API_URL + "?" + Constants.URL_PARAM_SYSPRM_USERNAME + "=" + loginUserName;

app/src/main/java/com/vsoft/servicenow/ui/LoginScreen.java

@@ -3,7 +3,6 @@ package com.vsoft.servicenow.ui;
 import android.app.Activity;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.content.LocalBroadcastManager;
@@ -14,7 +13,8 @@ import android.widget.EditText;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
 import com.google.android.gms.analytics.Tracker;
 import com.google.android.gms.analytics.Tracker;
-import com.vsoft.servicenow.api.interfaces.UserApi;
+import com.vsoft.servicenow.CatalogueApplication;
+import com.vsoft.servicenow.R;
 import com.vsoft.servicenow.api.listeners.get.GetUserDetailApiListener;
 import com.vsoft.servicenow.api.listeners.get.GetUserDetailApiListener;
 import com.vsoft.servicenow.api.listeners.get.GetUserLoginApiListener;
 import com.vsoft.servicenow.api.listeners.get.GetUserLoginApiListener;
 import com.vsoft.servicenow.api.listeners.put.PutDeviceRegistrationApiListener;
 import com.vsoft.servicenow.api.listeners.put.PutDeviceRegistrationApiListener;
@@ -22,17 +22,11 @@ import com.vsoft.servicenow.api.managers.LoginApiManager;
 import com.vsoft.servicenow.api.managers.UserApiManager;
 import com.vsoft.servicenow.api.managers.UserApiManager;
 import com.vsoft.servicenow.api.pojos.LoginApiResponse;
 import com.vsoft.servicenow.api.pojos.LoginApiResponse;
 import com.vsoft.servicenow.db.models.UserApiValues;
 import com.vsoft.servicenow.db.models.UserApiValues;
-import com.vsoft.servicenow.utils.CatalogueLog;
 import com.vsoft.servicenow.utils.Constants;
 import com.vsoft.servicenow.utils.Constants;
 import com.vsoft.servicenow.utils.DialogUtils;
 import com.vsoft.servicenow.utils.DialogUtils;
 import com.vsoft.servicenow.utils.KeyboardUtil;
 import com.vsoft.servicenow.utils.KeyboardUtil;
-import com.vsoft.servicenow.utils.Util;
-import com.vsoft.servicenow.CatalogueApplication;
-import com.vsoft.servicenow.R;
 import com.vsoft.servicenow.utils.PrefManager;
 import com.vsoft.servicenow.utils.PrefManager;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.vsoft.servicenow.utils.Util;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -86,6 +80,15 @@ public class LoginScreen extends Activity {
         CatalogueApplication application = (CatalogueApplication) getApplication();
         CatalogueApplication application = (CatalogueApplication) getApplication();
         Tracker tracker = application.getDefaultTracker();
         Tracker tracker = application.getDefaultTracker();
         Util.sendScreenName(tracker, getString(R.string.login_screen_string));
         Util.sendScreenName(tracker, getString(R.string.login_screen_string));
+
+        //set login details
+
+        String packageName = this.getApplicationContext().getPackageName();
+        if(packageName.contains(".debug")){
+            //demo1 instance - development & internal testing
+           mUserNameEditText.setText("prasad.k");
+           mPasswordEditText.setText("Vsoft@123");
+        }
     }
     }
 
 
     private void CheckLoginValues() {
     private void CheckLoginValues() {

app/src/vportal/java/com/vsoft/servicenow/AppConfig.java

@@ -20,7 +20,7 @@ public class AppConfig {
      * Web services urls
      * Web services urls
      */
      */
     /*Catalogue Category API */
     /*Catalogue Category API */
-    public static final String URL_GET_CATALOGUE = "api/vsng2/uofl_mobile/catalogue_screen";
+    public static final String URL_GET_CATALOGUE = "api/vsng2/uofl_mobile/catalogue_variable_screen";
 
 
     /*Catalogue Category Items API */
     /*Catalogue Category Items API */
     public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/uofl_mobile/catalog_item";
     public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/uofl_mobile/catalog_item";

app/src/vportal/java/com/vsoft/servicenow/MenuProvider.java

@@ -36,5 +36,9 @@ public class MenuProvider {
                     .setTitle(R.string.home_screen_chat_title)
                     .setTitle(R.string.home_screen_chat_title)
                     .setMenuIconResId(R.string.home_screen_chat_icon)
                     .setMenuIconResId(R.string.home_screen_chat_icon)
                     .build()
                     .build()
+//            new NotificationMenuItemData.Builder()
+//                    .ChatMenuItemData(R.string.home_screen_notification_title)
+//                    .setMenuIconResId(R.string.home_screen_notification_icon)
+//                    .build()
     );
     );
 }
 }