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
5707d20c
Commit
5707d20c
authored
Apr 24, 2020
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新着更新時、ログアウトすることによりエラーが発生する問題対応
parent
96ea7e01
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
28 deletions
+21
-28
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentDownloader.java
+5
-3
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
+2
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVUIActivity.java
+4
-24
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingActivity.java
+7
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingFragment.java
+3
-0
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentDownloader.java
View file @
5707d20c
...
@@ -171,6 +171,8 @@ public class ContentDownloader {
...
@@ -171,6 +171,8 @@ public class ContentDownloader {
Logger
.
e
(
TAG
,
"execKickTask encountered an exception."
,
e
);
Logger
.
e
(
TAG
,
"execKickTask encountered an exception."
,
e
);
}
catch
(
NetworkDisconnectedException
e
)
{
}
catch
(
NetworkDisconnectedException
e
)
{
Logger
.
e
(
TAG
,
"execKickTask encountered an exception."
,
e
);
Logger
.
e
(
TAG
,
"execKickTask encountered an exception."
,
e
);
}
catch
(
NullPointerException
e
)
{
Logger
.
e
(
TAG
,
"execKickTask encountered an exception."
,
e
);
}
finally
{
}
finally
{
isKickTask
=
false
;
isKickTask
=
false
;
}
}
...
@@ -178,7 +180,7 @@ public class ContentDownloader {
...
@@ -178,7 +180,7 @@ public class ContentDownloader {
});
});
}
}
private
void
execKickTask
()
throws
AcmsException
,
NetworkDisconnectedException
{
private
void
execKickTask
()
throws
AcmsException
,
NetworkDisconnectedException
,
NullPointerException
{
autoPaused
=
false
;
autoPaused
=
false
;
if
(
Logger
.
isDebugEnabled
())
{
if
(
Logger
.
isDebugEnabled
())
{
Logger
.
d
(
TAG
,
"downloaderMap %s"
,
getDownloadMapForDebug
());
Logger
.
d
(
TAG
,
"downloaderMap %s"
,
getDownloadMapForDebug
());
...
@@ -622,7 +624,7 @@ public class ContentDownloader {
...
@@ -622,7 +624,7 @@ public class ContentDownloader {
* @throws AcmsException
* @throws AcmsException
* @throws NetworkDisconnectedException
* @throws NetworkDisconnectedException
*/
*/
private
void
startDownload
(
ContentDto
contentDto
)
throws
AcmsException
,
NetworkDisconnectedException
{
private
void
startDownload
(
ContentDto
contentDto
)
throws
AcmsException
,
NetworkDisconnectedException
,
NullPointerException
{
contentDto
.
status
=
DownloadStatusType
.
Downloading
.
type
();
contentDto
.
status
=
DownloadStatusType
.
Downloading
.
type
();
contentDto
.
resourcePath
=
ABVEnvironment
.
getInstance
().
getContentResourcesDirectoryPath
(
contentDto
.
contentId
,
false
);
contentDto
.
resourcePath
=
ABVEnvironment
.
getInstance
().
getContentResourcesDirectoryPath
(
contentDto
.
contentId
,
false
);
contentDto
.
downloadStartDate
=
DateTimeUtil
.
getCurrentDate
();
contentDto
.
downloadStartDate
=
DateTimeUtil
.
getCurrentDate
();
...
@@ -691,7 +693,7 @@ public class ContentDownloader {
...
@@ -691,7 +693,7 @@ public class ContentDownloader {
return
downloadUrl
;
return
downloadUrl
;
}
}
private
GetContentParameters
getContentParameter
(
ContentDto
contentDto
)
{
private
GetContentParameters
getContentParameter
(
ContentDto
contentDto
)
throws
NullPointerException
{
GetContentParameters
param
;
GetContentParameters
param
;
param
=
new
GetContentParameters
(
contentDto
.
contentId
,
cache
.
getMemberInfo
().
sid
,
ContentZipType
.
ContentDownload
);
param
=
new
GetContentParameters
(
contentDto
.
contentId
,
cache
.
getMemberInfo
().
sid
,
ContentZipType
.
ContentDownload
);
return
param
;
return
param
;
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
View file @
5707d20c
...
@@ -499,7 +499,8 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
...
@@ -499,7 +499,8 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
if
(!
contentRefresher
.
isRefreshing
())
{
if
(!
contentRefresher
.
isRefreshing
())
{
configureKeepScreen
();
configureKeepScreen
();
}
}
if
(
e
!=
null
)
{
//新着更新時にログアウトすることで、SIDが取得できなく、例外が発生したときにはトースト非表示
if
(
e
!=
null
&&
ABVDataCache
.
getInstance
().
getMemberInfo
()
!=
null
)
{
handleError
(
e
);
handleError
(
e
);
}
}
}
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVUIActivity.java
View file @
5707d20c
...
@@ -120,8 +120,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
...
@@ -120,8 +120,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
}
}
//更新する場合中止させる。
//更新する場合中止させる。
protected
boolean
refreshStop
()
{
public
boolean
refreshStop
()
{
if
(
refreshFlag
())
{
try
{
try
{
contentRefresher
.
stopRefresh
();
contentRefresher
.
stopRefresh
();
...
@@ -131,28 +130,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
...
@@ -131,28 +130,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
// 停止ができなかった場合はfalseを返す。
// 停止ができなかった場合はfalseを返す。
return
false
;
return
false
;
}
}
}
return
true
;
}
//更新の場合動作させないメッセージ
protected
boolean
refreshMessage
()
{
if
(
refreshFlag
())
{
handleErrorMessageToast
(
ErrorCode
.
L113
);
return
true
;
return
true
;
}
else
{
return
false
;
}
}
//更新中の場合true
protected
boolean
refreshFlag
()
{
// if (progressRefresh.getVisibility() == View.VISIBLE) {
// return true;
// }else{
// return false;
// }
return
false
;
}
}
@Override
@Override
...
@@ -442,10 +420,12 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
...
@@ -442,10 +420,12 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
}
}
});
});
}
}
//ログアウト時にも呼ばれるのでチェック
if
(
ABVDataCache
.
getInstance
().
getMemberInfo
()
!=
null
)
{
// 自動ダウンロード対象がある場合、新着更新が完了したあとに開始するように修正(jang)
// 自動ダウンロード対象がある場合、新着更新が完了したあとに開始するように修正(jang)
ContentDownloader
.
getInstance
().
autoDownload
();
ContentDownloader
.
getInstance
().
autoDownload
();
}
}
}
/**
/**
* メモ・マーキング・しおりをコピーします
* メモ・マーキング・しおりをコピーします
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingActivity.java
View file @
5707d20c
...
@@ -83,4 +83,11 @@ public class ABookSettingActivity extends PreferenceActivity {
...
@@ -83,4 +83,11 @@ public class ABookSettingActivity extends PreferenceActivity {
return
(
getResources
().
getConfiguration
().
screenLayout
&
Configuration
.
SCREENLAYOUT_SIZE_MASK
)
==
Configuration
.
SCREENLAYOUT_SIZE_NORMAL
;
return
(
getResources
().
getConfiguration
().
screenLayout
&
Configuration
.
SCREENLAYOUT_SIZE_MASK
)
==
Configuration
.
SCREENLAYOUT_SIZE_NORMAL
;
}
}
/**
* 新着更新の中止処理
*/
public
void
stopRefresher
()
{
ABVUIActivity
activity
=
ActivityHandlingHelper
.
getInstance
().
getPreviousOfSettingActivity
();
activity
.
refreshStop
();
}
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingFragment.java
View file @
5707d20c
...
@@ -177,6 +177,9 @@ public class ABookSettingFragment extends PreferenceFragment {
...
@@ -177,6 +177,9 @@ public class ABookSettingFragment extends PreferenceFragment {
private
void
logout
()
{
private
void
logout
()
{
try
{
try
{
// 新着更新が実行されている場合停止
((
ABookSettingActivity
)
getActivity
()).
stopRefresher
();
// modify by Jang 2013.06.20
// modify by Jang 2013.06.20
UserAuthenticateLogic
user
=
AbstractLogic
.
getLogic
(
UserAuthenticateLogic
.
class
);
UserAuthenticateLogic
user
=
AbstractLogic
.
getLogic
(
UserAuthenticateLogic
.
class
);
// ログイン情報がある場合のみログアウト処理を行う
// ログイン情報がある場合のみログアウト処理を行う
...
...
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