Skip to content

Krishna Vemulavada / vera_2.1_app

Go to a project
Commit 64c71424 by Krishna Vemulawada
Options

pull code

parents 4d36b95e c7afbbdb
Inline Side-by-side
Showing with 18 additions and 14 deletions
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
...@@ -178,12 +178,6 @@ public class ADALActivity extends AppCompatActivity { ...@@ -178,12 +178,6 @@ public class ADALActivity extends AppCompatActivity {
if (NetworkConnectivity.haveNetworkConnection(ADALActivity.this)) { if (NetworkConnectivity.haveNetworkConnection(ADALActivity.this)) {
onCallGraphClicked(); onCallGraphClicked();
mWaitHandler.postDelayed(new Runnable() {
@Override
public void run() {
updateSuccessUI();
}
}, 5000);
} else { } else {
DialogUtils.showNoConnectionDialog(ADALActivity .this); DialogUtils.showNoConnectionDialog(ADALActivity .this);
...@@ -212,7 +206,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -212,7 +206,7 @@ public class ADALActivity extends AppCompatActivity {
if( sIntSignInInvoked.compareAndSet(false, true)) { if( sIntSignInInvoked.compareAndSet(false, true)) {
if (msg.what == MSG_INTERACTIVE_SIGN_IN_PROMPT_AUTO){ if (msg.what == MSG_INTERACTIVE_SIGN_IN_PROMPT_AUTO){
mAuthContext.acquireToken(getActivity(), RESOURCE_ID, CLIENT_ID, REDIRECT_URI, PromptBehavior.Always, getAuthInteractiveCallback()); mAuthContext.acquireToken(getActivity(), RESOURCE_ID, CLIENT_ID, REDIRECT_URI, PromptBehavior.Always, getAuthInteractiveCallback());
}else if(msg.what == MSG_INTERACTIVE_SIGN_IN_PROMPT_ALWAYS){ } else if(msg.what == MSG_INTERACTIVE_SIGN_IN_PROMPT_ALWAYS){
mAuthContext.acquireToken(getActivity(), RESOURCE_ID, CLIENT_ID, REDIRECT_URI, PromptBehavior.Always, getAuthInteractiveCallback()); mAuthContext.acquireToken(getActivity(), RESOURCE_ID, CLIENT_ID, REDIRECT_URI, PromptBehavior.Always, getAuthInteractiveCallback());
} }
} }
...@@ -279,6 +273,17 @@ public class ADALActivity extends AppCompatActivity { ...@@ -279,6 +273,17 @@ public class ADALActivity extends AppCompatActivity {
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if(resultCode == 2003){
/* update the UI to post call graph state */
runOnUiThread(new Runnable() {
@Override
public void run() {
updateSuccessUI();
}
});
}
mAuthContext.onActivityResult(requestCode, resultCode, data); mAuthContext.onActivityResult(requestCode, resultCode, data);
} }
...@@ -391,7 +396,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -391,7 +396,7 @@ public class ADALActivity extends AppCompatActivity {
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(convertDpToPx(this, 300), LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(convertDpToPx(this, 300),
convertDpToPx(this, 450)); convertDpToPx(this, 450));
layoutParams.setMargins(convertDpToPx(this, 30), convertDpToPx(this, 30), convertDpToPx(this, 30), convertDpToPx(this, 30)); layoutParams.setMargins(convertDpToPx(this, 55), convertDpToPx(this, 30), convertDpToPx(this, 30), convertDpToPx(this, 30));
logo_banner.setLayoutParams(layoutParams); logo_banner.setLayoutParams(layoutParams);
signOutButton.setVisibility(View.GONE); signOutButton.setVisibility(View.GONE);
...@@ -446,12 +451,12 @@ public class ADALActivity extends AppCompatActivity { ...@@ -446,12 +451,12 @@ public class ADALActivity extends AppCompatActivity {
callGraphAPI(); callGraphAPI();
/* update the UI to post call graph state */ /* update the UI to post call graph state */
runOnUiThread(new Runnable() { /*runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
updateSuccessUI(); updateSuccessUI();
} }
}); });*/
} }
@Override @Override
...@@ -525,12 +530,12 @@ public class ADALActivity extends AppCompatActivity { ...@@ -525,12 +530,12 @@ public class ADALActivity extends AppCompatActivity {
callGraphAPI(); callGraphAPI();
/* update the UI to post call graph state */ /* update the UI to post call graph state */
runOnUiThread(new Runnable() { /*runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
updateSuccessUI(); updateSuccessUI();
} }
}); });*/
/* set the sIntSignInInvoked boolean back to false */ /* set the sIntSignInInvoked boolean back to false */
sIntSignInInvoked.set(false); sIntSignInInvoked.set(false);
......
app/src/main/java/com/vsoft/vera/ui/OtpValidationActivity.java
...@@ -106,11 +106,10 @@ public class OtpValidationActivity extends Activity { ...@@ -106,11 +106,10 @@ public class OtpValidationActivity extends Activity {
} }
if (!TextUtils.isEmpty(phoneString) ) { if (!TextUtils.isEmpty(phoneString) && phoneString.length() >= 10) {
KeyboardUtil.hideKeyboard(OtpValidationActivity.this); KeyboardUtil.hideKeyboard(OtpValidationActivity.this);
if (mApplication.isNetConnected()) { if (mApplication.isNetConnected()) {
new generateOtp().execute(phoneString); new generateOtp().execute(phoneString);
} else { } else {
......
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