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
4476664f
Commit
4476664f
authored
4 years ago
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
パスワード暗号化処理問題対応
アプリロックの場合、サービスオプション取得できない問題対応
parent
214f0848
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/SecurityUtil.java
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/LoginActivity.java
+5
-0
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/SecurityUtil.java
View file @
4476664f
...
@@ -267,7 +267,7 @@ public class SecurityUtil {
...
@@ -267,7 +267,7 @@ public class SecurityUtil {
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isAddUserPasswordSalt
())
{
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isAddUserPasswordSalt
())
{
String
salt
=
getHashedSalt
(
loginId
);
String
salt
=
getHashedSalt
(
loginId
);
try
{
try
{
return
MD5
.
getMd5Hash
(
loginI
d
+
salt
);
return
MD5
.
getMd5Hash
(
passwor
d
+
salt
);
}
catch
(
NoSuchAlgorithmException
e
)
{
}
catch
(
NoSuchAlgorithmException
e
)
{
throw
new
ABVRuntimeException
(
e
);
throw
new
ABVRuntimeException
(
e
);
}
}
...
...
This diff is collapsed.
Click to expand it.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/LoginActivity.java
View file @
4476664f
...
@@ -16,6 +16,7 @@ import jp.agentec.abook.abv.bl.common.exception.AcmsException;
...
@@ -16,6 +16,7 @@ import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import
jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException
;
import
jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException
;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
import
jp.agentec.abook.abv.bl.common.util.SecurityUtil
;
import
jp.agentec.abook.abv.bl.common.util.SecurityUtil
;
import
jp.agentec.abook.abv.bl.data.ABVDataCache
;
import
jp.agentec.abook.abv.bl.data.dao.AbstractDao
;
import
jp.agentec.abook.abv.bl.data.dao.AbstractDao
;
import
jp.agentec.abook.abv.bl.data.dao.AcmsDao
;
import
jp.agentec.abook.abv.bl.data.dao.AcmsDao
;
import
jp.agentec.abook.abv.bl.data.dao.MemberInfoDao
;
import
jp.agentec.abook.abv.bl.data.dao.MemberInfoDao
;
...
@@ -172,6 +173,10 @@ public class LoginActivity extends ABVLoginActivity {
...
@@ -172,6 +173,10 @@ public class LoginActivity extends ABVLoginActivity {
// 一定時間経過後、アプリロックか強制ログアウトの状態かチェックする
// 一定時間経過後、アプリロックか強制ログアウトの状態かチェックする
oldMemberInfoDto
=
AbstractDao
.
getDao
(
MemberInfoDao
.
class
).
getMemberInfo
();
oldMemberInfoDto
=
AbstractDao
.
getDao
(
MemberInfoDao
.
class
).
getMemberInfo
();
if
(
oldMemberInfoDto
!=
null
)
{
if
(
oldMemberInfoDto
!=
null
)
{
//サービスオプション情報をキャッシュにセット
final
ABVDataCache
dataCache
=
ABVDataCache
.
getInstance
();
dataCache
.
refreshServiceOptions
();
// ユーザが一定時間経過後アプリロックの状態であるかチェック
// ユーザが一定時間経過後アプリロックの状態であるかチェック
if
(
oldMemberInfoDto
.
loginStatus
==
LoginStatus
.
LimitLogin
.
statusCode
())
{
if
(
oldMemberInfoDto
.
loginStatus
==
LoginStatus
.
LimitLogin
.
statusCode
())
{
mEdtLoginId
.
setText
(
oldMemberInfoDto
.
loginId
);
mEdtLoginId
.
setText
(
oldMemberInfoDto
.
loginId
);
...
...
This diff is collapsed.
Click to expand it.
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