Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
4c6164ae
Commit
4c6164ae
authored
Mar 18, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FCMトークンを取得できない場合、noneIdでセットしてログインできるように修正
parent
4554093e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVLoginActivity.java
+3
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java
+3
-2
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVLoginActivity.java
View file @
4c6164ae
...
...
@@ -34,9 +34,10 @@ public abstract class ABVLoginActivity extends ABVNoAuthenticatedActivity {
ABVToastUtil
.
showMakeText
(
ABVLoginActivity
.
this
,
R
.
string
.
fcm_not_supported
,
Toast
.
LENGTH_SHORT
);
}
});
}
else
{
serverLoginAndCheckChangeUser
(
fcmToken
)
;
// FCMトークンを取得できない場合、noneIdでセットしてログインする
fcmToken
=
"noneId"
;
}
serverLoginAndCheckChangeUser
(
fcmToken
);
}
finally
{
closeProgressPopup
();
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java
View file @
4c6164ae
...
...
@@ -108,9 +108,10 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
String
fcmToken
=
FcmManager
.
getFcmToken
(
mContext
);
if
(
fcmToken
==
null
)
{
ABVToastUtil
.
showMakeText
(
mContext
,
R
.
string
.
fcm_not_supported
,
Toast
.
LENGTH_SHORT
);
}
else
{
noAuthenticatedShowMain
(
isGuestLogin
,
fcmToken
,
urlPath
)
;
// FCMトークンを取得できない場合、noneIdでセットしてログインする
fcmToken
=
"noneId"
;
}
noAuthenticatedShowMain
(
isGuestLogin
,
fcmToken
,
urlPath
);
}
});
}
...
...
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