Merge branch 'features/1.1.100' into features/1.2.0

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -874,7 +874,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
             abookCheckParam.put(key, uri.getQueryParameter(key));
         }
         mCmd = abookCheckParam.get(ABookKeys.CMD);
-        mTaskKey = abookCheckParam.get(ABookKeys.TASK_KEY);
+        if (abookCheckParam.containsKey(ABookKeys.TASK_KEY)) {
+			mTaskKey = abookCheckParam.get(ABookKeys.TASK_KEY);
+		}
 
 		int taskReportLevel = 0;  // 作業報告レベル（0：報告、１：報告（回答）、２：報告（回答））
 		if (abookCheckParam.containsKey(ABookKeys.TASK_REPORT_LEVEL)) {
@@ -1011,8 +1013,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 			mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
 			//編集可否を判別
 			mEnablePhotoEdit = abookCheckParam.get(ABookKeys.EDITABLE) == null ? "0" : abookCheckParam.get(ABookKeys.EDITABLE);	//添付したファイルの編集可否のパラメタ
-			getAttachedDataUrl();
-		} else if (mCmd.equals(ABookKeys.CMD_EDIT_ATTACHED)){
+			getAttachedDataUrl(abookCheckParam.get(ABookKeys.TASK_KEY));
+		} else if (mCmd.equals(ABookKeys.CMD_EDIT_ATTACHED)) {
 			//編集パラメタ(
 			mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);	//再編集するファイルの名
 			mEditFilePath = abookCheckParam.get(ABookKeys.FILE_PATH);	//再編集するファイルのパス
@@ -1089,11 +1091,12 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 		}
     }
 
-    public void commonAttachedDataUrl (String data) {
+
+    public void commonAttachedDataUrl (String taskKey, String data) {
         boolean isError = false;
         if (data != null) {
             try {
-				String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), mTaskKey, mAttachedFileName);
+				String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), taskKey, mAttachedFileName);
                 ABookCheckWebViewHelper.getInstance().decodeToImage(data, imagePath);
                 //アプリ内のファイルのみ削除（Galleryファイルは削除しない）
                 if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) {
@@ -1109,7 +1112,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
                 Logger.e(TAG, e);
             }
         }
-        afterABookCheckApi(mCmd, mTaskKey, isError ? 1 : 0, "", null);
+        afterABookCheckApi(mCmd, taskKey, isError ? 1 : 0, "", null);
     }
 
     protected Uri attachmentImageProcessing(Uri uri) throws Exception {
@@ -1162,11 +1165,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
     /**
      * 添付ファイルのBase64文字列取得
      */
-    public void getAttachedDataUrl() {
+    public void getAttachedDataUrl(final String taskKey) {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                webViewLoadUrl("javascript:android.getAttachedDataUrl(CHK.getAttachedDataUrl())");
+                webViewLoadUrl("javascript:android.getAttachedDataUrl('" + taskKey + "', CHK.getAttachedDataUrl())");
             }
         });
     }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java

@@ -452,8 +452,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
         }
 
         @JavascriptInterface
-        public void getAttachedDataUrl(String data) {
-            commonAttachedDataUrl(data);
+        public void getAttachedDataUrl(String taskKey, String data) {
+            commonAttachedDataUrl(taskKey, data);
         }
 
         @JavascriptInterface

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java

@@ -518,8 +518,8 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
         }
 
         @org.xwalk.core.JavascriptInterface
-        public void getAttachedDataUrl(String data) {
-            commonAttachedDataUrl(data);
+        public void getAttachedDataUrl(String taskKey, String data) {
+            commonAttachedDataUrl(taskKey, data);
         }
 
         @org.xwalk.core.JavascriptInterface

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java

@@ -107,30 +107,6 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
     }
 
     @Override
-    public void commonAttachedDataUrl (String data) {
-        boolean isError = false;
-        if (data != null) {
-            try {
-                final String imagePath = ABVEnvironment.getInstance().getTempFilePath(getContentId(), mTaskKey, mAttachedFileName);
-                ABookCheckWebViewHelper.getInstance().decodeToImage(data, imagePath);
-                //アプリ内のファイルのみ削除（Galleryファイルは削除しない）
-                if (mLocalFile != null && mLocalFile.getPath().contains(getPackageName())) {
-                    FileUtil.delete(mLocalFile);
-                }
-                mLocalFile = null;
-                //編集可能可否をチェックする。
-                if (mEnablePhotoEdit.equals("1")) { //編集の場合、編集画面を開ける。
-                    commonOpenEditPage();
-                }
-            } catch (Exception e) {
-                isError = true;
-                Logger.e(TAG, e);
-            }
-        }
-        afterABookCheckApi(mCmd, mTaskKey, isError ? 1 : 0, "", null);
-    }
-
-    @Override
     protected  void commonConfigureHeader() {
 //        if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示
 //            helpButton.setVisibility(View.VISIBLE);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java

@@ -537,8 +537,8 @@ public class OperationTaskLayout extends RelativeLayout {
 
     private class JsInf {
         @JavascriptInterface
-        public void getAttachedDataUrl(String data) {
-            ((ABVContentViewActivity) OperationTaskLayout.this.mContext).commonAttachedDataUrl(data);
+        public void getAttachedDataUrl(String taskKey, String data) {
+            ((ABVContentViewActivity) OperationTaskLayout.this.mContext).commonAttachedDataUrl(taskKey, data);
         }
 
         @JavascriptInterface