Commit a6d6e5bf by Kazuyuki Hida

課題6,7,8を修正(Bizからの移植)

parent 7917561a
......@@ -71,7 +71,7 @@ public class ABVDataCache {
* @return サービスオプション情報です。指定したserviceOptionIdがサービスオプションリストに存在しない場合はnullを返します。
* @since 1.0.0
*/
public ServiceOptionDto getServiceOption(int serviceOptionId) {
public synchronized ServiceOptionDto getServiceOption(int serviceOptionId) {
if (serviceOptionDtoList != null) {
for (ServiceOptionDto serviceOptionDto : Collections.unmodifiableCollection(serviceOptionDtoList)) {
if (serviceOptionDto.serviceOptionId == serviceOptionId) {
......
......@@ -127,10 +127,15 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
}
private void logoutAlert(int messageRes) {
AlertDialogUtil.showAlertDialog(ABVNoAuthenticatedActivity.this, R.string.app_name, messageRes, true, new DialogInterface.OnClickListener() {
runOnUiThread(new Runnable() {
@Override
public void onClick(DialogInterface dialog, int which) {
LogoutHelper.logout(ABVNoAuthenticatedActivity.this);
public void run() {
AlertDialogUtil.showAlertDialog(ABVNoAuthenticatedActivity.this, R.string.app_name, messageRes, true, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
LogoutHelper.logout(ABVNoAuthenticatedActivity.this);
}
});
}
});
}
......
......@@ -86,7 +86,6 @@ public class LoginPasswordChangeActivity extends ABVNoAuthenticatedActivity {
if (mType == 1 || mType == 2) {
// 催促
showMainActivity(mLoginId);
finish();
} else {
finishActivity();
}
......@@ -177,7 +176,6 @@ public class LoginPasswordChangeActivity extends ABVNoAuthenticatedActivity {
ABVToastUtil.showMakeText(LoginPasswordChangeActivity.this, getString(R.string.change_password_ok), Toast.LENGTH_LONG);
showMainActivity(mLoginId);
finish();
} catch (NetworkDisconnectedException e) {
Logger.e("NetworkDisconnectedException", e);
handleErrorMessageToast(ErrorCode.NETWORK);
......
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 to comment