Vera 2.1 stable build

app/src/main/AndroidManifest.xml

@@ -43,19 +43,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateHidden" />
 
-        <activity
-            android:name=".ui.OtpValidationActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize|stateHidden" />
-
-        <activity
-            android:name=".ui.LoginChooseActivity"
-            android:screenOrientation="portrait"
-            /> <activity
-            android:name=".ui.ADALActivity"
-            android:screenOrientation="portrait"
-            />
-
         <activity android:name=".ui.ResetPasswordActivity"
             android:screenOrientation="portrait"
             android:fitsSystemWindows="true"

app/src/main/java/com/vsoft/vera/api/managers/IncidentApiManager.java

@@ -40,10 +40,9 @@ import retrofit2.Retrofit;
 public class IncidentApiManager {
 
     public static void getIncident(Context context, GetIncidentApiListener listener) {
-        String sysId = PrefManager.getSharedPref(context, PrefManager.PREFERENCE_DYNAMIC_USER_SYS_ID);
         CatalogueLog.d("IncidentApiManager: getIncident: ");
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("caller_id="+sysId);
+        stringBuilder.append("caller_id=javascript:gs.getUserID()");
         CatalogueLog.d("IncidentApiManager: getIncident: request parameter: "+stringBuilder.toString());
 
         String accessToken = PrefManager.getSharedPref(context, PrefManager.PREFERENCE_ACCESS_TOKEN);
@@ -52,7 +51,6 @@ public class IncidentApiManager {
             listener.onFailApiCall();
             return;
         }
-
         final Retrofit retrofit = RestClient.getInitializedRestAdapter(accessToken);
         Call<ResponseBody> call = retrofit.create(IncidentApi.class).getIncident(stringBuilder.toString(), "");
         try {

app/src/main/java/com/vsoft/vera/api/managers/LoginApiManager.java

@@ -90,20 +90,20 @@ public class LoginApiManager {
                                 })
                                 .create();
 
-                            LoginApiResponse loginApiResponse = gson.fromJson(jsonObject.toString(), LoginApiResponse.class);
-                            listener.onDoneApiCall(loginApiResponse);
+                        LoginApiResponse loginApiResponse = gson.fromJson(jsonObject.toString(), LoginApiResponse.class);
+                        listener.onDoneApiCall(loginApiResponse);
                     } else
                         listener.onFailApiCall();
                 } catch (JSONException e) {
-                        CatalogueLog.e("LoginApiManager: submitLoginValues: onResponse: ", e);
-                        listener.onFailApiCall();
-                    } catch (IOException e) {
-                        CatalogueLog.e("LoginApiManager: submitLoginValues: onResponse: ", e);
-                        listener.onFailApiCall();
-                    }
-                } else {
+                    CatalogueLog.e("LoginApiManager: submitLoginValues: onResponse: ", e);
+                    listener.onFailApiCall();
+                } catch (IOException e) {
+                    CatalogueLog.e("LoginApiManager: submitLoginValues: onResponse: ", e);
                     listener.onFailApiCall();
                 }
+            } else {
+                listener.onFailApiCall();
+            }
         } catch (IOException e) {
             CatalogueLog.e("LoginApiManager: submitLoginValues: IOException: ", e);
             listener.onFailApiCall();

app/src/main/java/com/vsoft/vera/ui/ChatActivity.java

@@ -207,11 +207,11 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD
 
         mLoggedInUserSysId = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_SYS_ID);
         mLoggedInUsername = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_FIRST_NAME);
-        userSysId = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_DYNAMIC_USER_SYS_ID);
+        userSysId = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_SYS_ID);
         if(TextUtils.isEmpty(mLoggedInUserSysId) || TextUtils.isEmpty(mLoggedInUsername)) {
             CatalogueLog.e("User Sys id or Name is Null");
 
-            Intent intent = new Intent(this, ADALActivity.class);
+            Intent intent = new Intent(this, LoginScreen.class);
             intent.putExtra(Constants.DATA_KEY_LOGIN_REQUEST_CODE, Constants.LOGIN_SCREEN_REQUEST_CODE);
             startActivity(intent);
             finish();

app/src/main/java/com/vsoft/vera/ui/HomeScreen.java

@@ -172,80 +172,36 @@ public class HomeScreen extends HandleNotificationActivity {
 //            alert.show();
 //        }
 
-        //        if(BuildConfig.BUILD_TYPE_INT == 1 ||BuildConfig.BUILD_TYPE_INT == 3 ) {
-//            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//            StringBuilder stringBuilder = new StringBuilder();
-//            stringBuilder.append("ServiceNow Instance: ");
-//            stringBuilder.append(Constants.DOMAIN);
-//            stringBuilder.append("\n");
-//            stringBuilder.append("Socket URL: ");
-//            stringBuilder.append(Constants.CHAT_SERVER_URL);
-//            stringBuilder.append("\n");
-//            stringBuilder.append("Flavor: ");
-//            stringBuilder.append(BuildConfig.FLAVOR);
-//            stringBuilder.append("\n");
-//            stringBuilder.append("Build Type: ");
-//            stringBuilder.append(BuildConfig.BUILD_TYPE);
-//            stringBuilder.append("\n");
-//            stringBuilder.append("\n");
-//            stringBuilder.append("Version: "+BuildConfig.VERSION_NAME);
-//            builder.setMessage(stringBuilder.toString())
-//                    .setTitle("App Info")
-//                    .setCancelable(false)
-//                    .setPositiveButton(R.string.ok_string, new DialogInterface.OnClickListener() {
-//                        public void onClick(DialogInterface dialog, int id) {
-//                            dialog.dismiss();
-//                        }
-//                    });
-//            AlertDialog alert = builder.create();
-//            alert.show();
-//        }
-
-        if(BuildConfig.BUILD_TYPE_INT == 1 ||BuildConfig.BUILD_TYPE_INT == 3 ) {
-            String userFullName = PrefManager.getSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_FULL_NAME);
-            if(userFullName!= null){
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                StringBuilder stringBuilder = new StringBuilder();
-                stringBuilder.append("Username: ");
-                stringBuilder.append(userFullName);
-                stringBuilder.append("\n");
-                stringBuilder.append("\n");
-                stringBuilder.append("Version: "+BuildConfig.VERSION_NAME);
-
-                builder.setMessage(stringBuilder.toString())
-                        .setTitle("User Details")
-                        .setCancelable(false)
-                        .setPositiveButton(R.string.ok_string, new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                dialog.dismiss();
-                            }
-                        });
-                AlertDialog alert = builder.create();
-                alert.show();
-            }else {
-                String mobileNumber = PrefManager.getSharedPref(HomeScreen.this, PrefManager.MOBILE_NUMBER);
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                StringBuilder stringBuilder = new StringBuilder();
-                stringBuilder.append("Username: ");
-                stringBuilder.append(mobileNumber);
-                stringBuilder.append("\n");
-                stringBuilder.append("\n");
-                stringBuilder.append("Version: "+BuildConfig.VERSION_NAME);
-
-                builder.setMessage(stringBuilder.toString())
-                        .setTitle("User Details")
-                        .setCancelable(false)
-                        .setPositiveButton(R.string.ok_string, new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                dialog.dismiss();
-                            }
-                        });
-                AlertDialog alert = builder.create();
-                alert.show();
-            }
-
+                if(BuildConfig.BUILD_TYPE_INT == 1 ||BuildConfig.BUILD_TYPE_INT == 3 ) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("ServiceNow Instance: ");
+            stringBuilder.append(Constants.DOMAIN);
+            stringBuilder.append("\n");
+            stringBuilder.append("Socket URL: ");
+            stringBuilder.append(Constants.CHAT_SERVER_URL);
+            stringBuilder.append("\n");
+            stringBuilder.append("Flavor: ");
+            stringBuilder.append(BuildConfig.FLAVOR);
+            stringBuilder.append("\n");
+            stringBuilder.append("Build Type: ");
+            stringBuilder.append(BuildConfig.BUILD_TYPE);
+            stringBuilder.append("\n");
+            stringBuilder.append("\n");
+            stringBuilder.append("Version: "+BuildConfig.VERSION_NAME);
+            builder.setMessage(stringBuilder.toString())
+                    .setTitle("App Info")
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.ok_string, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            dialog.dismiss();
+                        }
+                    });
+            AlertDialog alert = builder.create();
+            alert.show();
         }
 
+
     }
 
     @OnClick(R.id.home_screen_logout_image_view)
@@ -350,10 +306,8 @@ public class HomeScreen extends HandleNotificationActivity {
                 PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_FULL_NAME, "");
                 PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_EMAIL_ID, "");
                 PrefManager.setSharedPref(HomeScreen.this, PrefManager.SESSION_ID, "");
-                PrefManager.setSharedPref(HomeScreen.this, PrefManager.MOBILE_NUMBER, "");
-                PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_DYNAMIC_USER_SYS_ID, "");
 
-                Intent loginIntent = new Intent(HomeScreen.this, ADALActivity.class);
+                Intent loginIntent = new Intent(HomeScreen.this, LoginScreen.class);
                 loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 startActivity(loginIntent);
             } else {

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

@@ -42,7 +42,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
- * Created by Kunj on 11/8/16.
+ * Created by Krishna on 16/10/19.
  */
 public class LoginScreen extends Activity {
 
@@ -78,7 +78,7 @@ public class LoginScreen extends Activity {
                     switch (keyCode) {
                         case KeyEvent.KEYCODE_DPAD_CENTER:
                         case KeyEvent.KEYCODE_ENTER:
-                            callLoginAPI(false);
+                            callLoginAPI();
                             return true;
                         default:
                             break;
@@ -114,22 +114,6 @@ public class LoginScreen extends Activity {
         Util.sendScreenName(tracker, getString(R.string.login_screen_string));
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if(requestCode == Constants.LOGIN_SCREEN_OTP_REQUEST_CODE){
-                if(data!=null && data.getExtras()!=null){
-                    String message =   data.getExtras().getString(Constants.MESSAGE);
-                    if(message.equalsIgnoreCase(Constants.RESPONSE_SUCCESS)){
-                        callLoginAPI(false);
-                    }else{
-                        Toast.makeText(this,"Something went Wrong",Toast.LENGTH_LONG).show();
-                    }
-                }
-        }
-    }
-
     private void CheckLoginValues() {
         String sysId = PrefManager.getSharedPref(LoginScreen.this, PrefManager.PREFERENCE_USER_SYS_ID);
         if (!TextUtils.isEmpty(sysId)) {
@@ -153,7 +137,7 @@ public class LoginScreen extends Activity {
         }
     }
 
-    private void callLoginAPI(boolean withOtp) {
+    private void callLoginAPI() {
         String userNameString = mUserNameEditText.getText().toString().trim();
         String passwordString = mPasswordEditText.getText().toString().trim();
 
@@ -166,26 +150,19 @@ public class LoginScreen extends Activity {
         if (!TextUtils.isEmpty(userNameString) && !TextUtils.isEmpty(passwordString)) {
             KeyboardUtil.hideKeyboard(LoginScreen.this);
             if (mApplication.isNetConnected()) {
-
-                if(withOtp){
-                    launchOptValidationScreen();
-                }else{
-                    new LoginDetailsSendToServer().execute(mUserNameEditText.getText().toString().trim(), mPasswordEditText.getText().toString().trim());
-                }
+                new LoginDetailsSendToServer().execute(mUserNameEditText.getText().toString().trim(), mPasswordEditText.getText().toString().trim());
             } else {
                 DialogUtils.showNoConnectionDialog(LoginScreen.this);
             }
         }
     }
 
+    @OnClick(R.id.login_screen_login_text_view)
+    void onLoginClicked() {
+        callLoginAPI();
 
-    private void launchOptValidationScreen(){
-
-        Intent intent = new Intent(LoginScreen.this,OtpValidationActivity.class);
-        startActivityForResult(intent,Constants.LOGIN_SCREEN_OTP_REQUEST_CODE);
     }
 
-
     private class LoginDetailsSendToServer extends AsyncTask<String, Integer, Integer> {
         private ProgressDialog progressDialog;
         private static final int USER_DETAIL = 1;
@@ -317,7 +294,7 @@ public class LoginScreen extends Activity {
                     PrefManager.setSharedPref(LoginScreen.this, PrefManager.PREFERENCE_USER_EMAIL_ID, userEmailId);
 
 
-					/*Send broadcast to start SyncService*/
+                    /*Send broadcast to start SyncService*/
                     Intent intent = new Intent(Constants.APPLICATION_BROADCAST_INTENT);
                     intent.putExtra(Constants.APPLICATION_BROADCAST_DATA_ACTION, Constants.ACTION_SYNC);
                     LocalBroadcastManager.getInstance(LoginScreen.this).sendBroadcast(intent);

app/src/main/java/com/vsoft/vera/utils/PrefManager.java

@@ -11,12 +11,10 @@ public class PrefManager {
     public static final String PREFERENCE_USER_FIRST_NAME = "firstName";
     public static final String PREFERENCE_USER_LAST_NAME = "lastName";
     public static final String PREFERENCE_USER_SYS_ID = "sysId";
-    public static final String PREFERENCE_DYNAMIC_USER_SYS_ID = "dynamic_sysId";
     public static final String PREFERENCE_USER_FULL_NAME = "full_name";
     public static final String PREFERENCE_USER_ID = "user_id";
     public static final String PREFERENCE_USER_EMAIL_ID = "user_email_id";
     public static final String SESSION_ID = "session_id";
-    public static final String MOBILE_NUMBER = "mobile_number";
     //Chat Server Url
     public static final String PREFERENCE_CHAT_SERVER_URL = "chat_server_url";
 

app/src/main/res/drawable-mdpi/login_screen_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+<!--    <solid android:color="@color/button_bg" />-->
+
+<!--    <corners android:radius="10dip" />-->
+
+<!--    <stroke-->
+<!--        android:width="1dp"-->
+<!--        android:color="@color/button_bg" />-->
+
+    <corners
+        android:radius="0dp"
+        />
+    <gradient
+        android:angle="45"
+        android:centerX="35%"
+        android:startColor="#e5e5e5"
+        android:centerColor="#7f7f7f"
+        android:endColor="#b2b2b2"
+        android:type="linear"
+        />
+    <padding
+        android:left="0dp"
+        android:top="0dp"
+        android:right="0dp"
+        android:bottom="0dp"
+        />
+    <size
+        android:width="200dp"
+        android:height="400dp"
+        />
+
+
+</shape>

app/src/main/res/drawable/ic_person_login_screen.xml

+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

app/src/main/res/drawable/login_bg.xml

@@ -16,9 +16,9 @@
     <gradient
         android:angle="45"
         android:centerX="35%"
-        android:centerColor="#6699c8"
-        android:startColor="#7faad1"
-        android:endColor="#1966ad"
+        android:startColor="#303030"
+        android:centerColor="#666666"
+        android:endColor="#303030"
         android:type="linear"
         />
     <padding

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

@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_centerVertical="true"
-                android:text="FULTON COUNTY"
+                android:text="@string/app_name"
                 android:textColor="@color/screen_bg_color_white" />
 
             <ImageView

app/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">Fulton-County</string>
+    <string name="app_name">VERA-2.1</string>
 
     <string name="set_string">Set</string>
     <string name="submit_string">Submit</string>

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

@@ -12,8 +12,8 @@ public class AppConfig {
     public static final String LOGIN_CLIENT_ID_RELEASE = "d958eb06b0f3830093781f441d59febc";
     public static final String LOGIN_CLIENT_SECRET_RELEASE = "krD*!O}1.8";
 
-    public static final String LOGIN_CLIENT_ID_DEBUG = "89cfc0656ce6b30012af8b50316c9376";
-    public static final String LOGIN_CLIENT_SECRET_DEBUG = ")R+)DZh|,T";
+    public static final String LOGIN_CLIENT_ID_DEBUG = "0ab7489795c40410d06a70ea1d212df1";
+    public static final String LOGIN_CLIENT_SECRET_DEBUG = "Cmei6uCRfM";
 
     public static final String LOGIN_CLIENT_ID_STAGING = "091b5d1ea97cd700e4268b90dd5521ca";
     public static final String LOGIN_CLIENT_SECRET_STAGING = "+tPJ@jS<;S";
@@ -61,8 +61,8 @@ public class AppConfig {
     /**
      * We will hit the below url to get the chat server url.
      * */
-    public static final String CHAT_SERVER_API_URL_RELEASE = "http://52.21.5.26:12814/service_discovery";
+    public static final String CHAT_SERVER_API_URL_RELEASE = "http://52.21.5.26:12811/service_discovery";
     public static final String CHAT_SERVER_API_URL_DEBUG = "http://52.21.5.26:12811/service_discovery";
-    public static final String CHAT_SERVER_API_URL_STAGING = "http://52.21.5.26:12813/service_discovery";
+    public static final String CHAT_SERVER_API_URL_STAGING = "http://52.21.5.26:12811/service_discovery";
 
 }

app/src/vportal/res/layout/activity_login_view.xml

@@ -2,6 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    
     android:focusableInTouchMode="true"
     android:scrollbarStyle="insideOverlay">
 

app/src/vportal/res/layout/splash_screen.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:id="@+id/splash_main_lyt"
@@ -11,8 +11,10 @@
 		android:id="@+id/splash_image"
 		android:layout_gravity="center"
 		android:layout_width="200dp"
+		android:layout_centerHorizontal="true"
+		android:layout_centerVertical="true"
 		android:layout_height="150dp"
 
 		/>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

app/src/vportal/res/values/strings.xml

 <resources>
-	<string name="app_name">Fulton-County</string>
+	<string name="app_name">VERA-2.1</string>
 
 	<!--home Screen Option-->
 	<!--Start-->

app/vportal/debug/output.json

-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.0.6","enabled":true,"outputFile":"app-vportal-debug.apk","fullName":"vportalDebug","baseName":"vportal-debug"},"path":"app-vportal-debug.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.2.6","enabled":true,"outputFile":"app-vportal-debug.apk","fullName":"vportalDebug","baseName":"vportal-debug"},"path":"app-vportal-debug.apk","properties":{}}]
\ No newline at end of file