Skip to content

Krishna Vemulavada / vera_2.1_app

Go to a project
Commit 6c3966bf by Krishna Vemulawada
Options

upto demo fulton county

parent 3be92f3a
Inline Side-by-side
Showing with 30 additions and 7 deletions
app/build.gradle
...@@ -72,7 +72,7 @@ android { ...@@ -72,7 +72,7 @@ android {
vportal { vportal {
applicationId "com.vsoft.vera.vportal" applicationId "com.vsoft.vera.vportal"
versionCode 1 versionCode 1
versionName "0.2.5" versionName "0.2.6"
} }
} }
} }
......
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
...@@ -696,7 +696,6 @@ public class ADALActivity extends AppCompatActivity { ...@@ -696,7 +696,6 @@ public class ADALActivity extends AppCompatActivity {
PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_LAST_NAME, lastName); PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_LAST_NAME, lastName);
PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_SYS_ID, sysid); PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_SYS_ID, sysid);
/*For pre fill value in variable form*/ /*For pre fill value in variable form*/
PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_ID, userId); PrefManager.setSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_ID, userId);
new GetyUserSysIDAsync().execute(); new GetyUserSysIDAsync().execute();
......
app/src/main/java/com/vsoft/vera/ui/ChatActivity.java
...@@ -211,7 +211,7 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD ...@@ -211,7 +211,7 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD
if(TextUtils.isEmpty(mLoggedInUserSysId) || TextUtils.isEmpty(mLoggedInUsername)) { if(TextUtils.isEmpty(mLoggedInUserSysId) || TextUtils.isEmpty(mLoggedInUsername)) {
CatalogueLog.e("User Sys id or Name is Null"); CatalogueLog.e("User Sys id or Name is Null");
Intent intent = new Intent(this, LoginScreen.class); Intent intent = new Intent(this, ADALActivity.class);
intent.putExtra(Constants.DATA_KEY_LOGIN_REQUEST_CODE, Constants.LOGIN_SCREEN_REQUEST_CODE); intent.putExtra(Constants.DATA_KEY_LOGIN_REQUEST_CODE, Constants.LOGIN_SCREEN_REQUEST_CODE);
startActivity(intent); startActivity(intent);
finish(); finish();
......
app/src/main/java/com/vsoft/vera/ui/HomeScreen.java
...@@ -222,6 +222,26 @@ public class HomeScreen extends HandleNotificationActivity { ...@@ -222,6 +222,26 @@ public class HomeScreen extends HandleNotificationActivity {
}); });
AlertDialog alert = builder.create(); AlertDialog alert = builder.create();
alert.show(); 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();
} }
} }
...@@ -330,6 +350,8 @@ public class HomeScreen extends HandleNotificationActivity { ...@@ -330,6 +350,8 @@ public class HomeScreen extends HandleNotificationActivity {
PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_FULL_NAME, ""); PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_FULL_NAME, "");
PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_EMAIL_ID, ""); PrefManager.setSharedPref(HomeScreen.this, PrefManager.PREFERENCE_USER_EMAIL_ID, "");
PrefManager.setSharedPref(HomeScreen.this, PrefManager.SESSION_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, ADALActivity.class);
loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
......
app/src/main/java/com/vsoft/vera/ui/OtpValidationActivity.java
...@@ -246,6 +246,7 @@ public class OtpValidationActivity extends Activity { ...@@ -246,6 +246,7 @@ public class OtpValidationActivity extends Activity {
} }
if(apiStatus==1){ if(apiStatus==1){
PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.MOBILE_NUMBER, phoneString);
new LoginDetailsSendToServer().execute(); new LoginDetailsSendToServer().execute();
}else{ }else{
Toast.makeText(OtpValidationActivity.this,apiMessage,Toast.LENGTH_LONG).show(); Toast.makeText(OtpValidationActivity.this,apiMessage,Toast.LENGTH_LONG).show();
...@@ -394,8 +395,8 @@ public class OtpValidationActivity extends Activity { ...@@ -394,8 +395,8 @@ public class OtpValidationActivity extends Activity {
PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_LAST_NAME, lastName); PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_LAST_NAME, lastName);
/*For pre fill value in variable form*/ /*For pre fill value in variable form*/
PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_FULL_NAME, "");
PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_ID, userId); PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_ID, userId);
PrefManager.setSharedPref(OtpValidationActivity.this, PrefManager.PREFERENCE_USER_SYS_ID, sysid);
new GetyUserSysIDAsync().execute(); new GetyUserSysIDAsync().execute();
......
app/src/main/java/com/vsoft/vera/utils/Constants.java
...@@ -12,7 +12,7 @@ public class Constants { ...@@ -12,7 +12,7 @@ public class Constants {
public static final String TAG = AppConfig.APP_INTERNAL_NAME; public static final String TAG = AppConfig.APP_INTERNAL_NAME;
//default set to us //default set to us
public static String TWILIO_COUNTRY_CODE = "+1"; public static String TWILIO_COUNTRY_CODE = "+91";
public static final String[] month = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; public static final String[] month = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
/** /**
......
app/src/main/java/com/vsoft/vera/utils/PrefManager.java
...@@ -16,6 +16,7 @@ public class PrefManager { ...@@ -16,6 +16,7 @@ public class PrefManager {
public static final String PREFERENCE_USER_ID = "user_id"; public static final String PREFERENCE_USER_ID = "user_id";
public static final String PREFERENCE_USER_EMAIL_ID = "user_email_id"; public static final String PREFERENCE_USER_EMAIL_ID = "user_email_id";
public static final String SESSION_ID = "session_id"; public static final String SESSION_ID = "session_id";
public static final String MOBILE_NUMBER = "mobile_number";
//Chat Server Url //Chat Server Url
public static final String PREFERENCE_CHAT_SERVER_URL = "chat_server_url"; public static final String PREFERENCE_CHAT_SERVER_URL = "chat_server_url";
......
app/vportal/staging/output.json
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.2.4","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.2.6","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}]
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment