Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Krishna Vemulavada
/
vera_2.1_app
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8dc6fa57
authored
Sep 30, 2019
by
Simhachalam ch
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fixed sso addal logout issue
parent
e187aa8b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
app/src/main/java/com/vsoft/vera/api/managers/OtpApiManager.java
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
app/src/main/java/com/vsoft/vera/utils/Constants.java
app/src/main/java/com/vsoft/vera/api/managers/OtpApiManager.java
View file @
8dc6fa57
...
@@ -31,7 +31,7 @@ public class OtpApiManager {
...
@@ -31,7 +31,7 @@ public class OtpApiManager {
OtpPostData
otpPostData
=
new
OtpPostData
();
OtpPostData
otpPostData
=
new
OtpPostData
();
otpPostData
.
setPhone_number
(
mobileNumber
);
otpPostData
.
setPhone_number
(
mobileNumber
);
otpPostData
.
setVia
(
"sms"
);
otpPostData
.
setVia
(
"sms"
);
otpPostData
.
setCountry_code
(
"+1"
);
otpPostData
.
setCountry_code
(
Constants
.
TWILIO_COUNTRY_CODE
);
otpPostData
.
setLn
(
"en"
);
otpPostData
.
setLn
(
"en"
);
Call
<
ResponseBody
>
call
=
retrofit
.
create
(
OtpApi
.
class
).
getOtp
(
otpPostData
);
Call
<
ResponseBody
>
call
=
retrofit
.
create
(
OtpApi
.
class
).
getOtp
(
otpPostData
);
...
@@ -98,7 +98,7 @@ public class OtpApiManager {
...
@@ -98,7 +98,7 @@ public class OtpApiManager {
final
Retrofit
retrofit
=
RestClient
.
getInitializedRestAdapterWithOutAuthorizationHeader
();
final
Retrofit
retrofit
=
RestClient
.
getInitializedRestAdapterWithOutAuthorizationHeader
();
Call
<
ResponseBody
>
call
=
retrofit
.
create
(
OtpApi
.
class
).
validateOtp
(
mobileNumber
,
"+1"
,
verificationCode
,
"en"
);
Call
<
ResponseBody
>
call
=
retrofit
.
create
(
OtpApi
.
class
).
validateOtp
(
mobileNumber
,
Constants
.
TWILIO_COUNTRY_CODE
,
verificationCode
,
"en"
);
try
{
try
{
//Retrofit synchronous call
//Retrofit synchronous call
...
...
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
View file @
8dc6fa57
...
@@ -168,7 +168,7 @@ public class ADALActivity extends AppCompatActivity {
...
@@ -168,7 +168,7 @@ public class ADALActivity extends AppCompatActivity {
public
void
handleMessage
(
Message
msg
)
{
public
void
handleMessage
(
Message
msg
)
{
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
.
A
uto
,
getAuthInteractiveCallback
());
mAuthContext
.
acquireToken
(
getActivity
(),
RESOURCE_ID
,
CLIENT_ID
,
REDIRECT_URI
,
PromptBehavior
.
A
lways
,
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
());
}
}
...
...
app/src/main/java/com/vsoft/vera/utils/Constants.java
View file @
8dc6fa57
...
@@ -11,6 +11,7 @@ import com.vsoft.vera.api.interfaces.PendingApprovalsApi;
...
@@ -11,6 +11,7 @@ import com.vsoft.vera.api.interfaces.PendingApprovalsApi;
public
class
Constants
{
public
class
Constants
{
public
static
final
String
TAG
=
AppConfig
.
APP_INTERNAL_NAME
;
public
static
final
String
TAG
=
AppConfig
.
APP_INTERNAL_NAME
;
public
static
final
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"
};
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment