Task #38731【ABookCheck Android】（保守対応）報告入力中はデバイスの「戻る」ボタン機能を無効化

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

@@ -1535,10 +1535,6 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		if (keyCode == KeyEvent.KEYCODE_BACK) {
 		if (keyCode == KeyEvent.KEYCODE_BACK) {
 			Logger.d(TAG, "KeyEvent.KEYCODE_BACK");
 			Logger.d(TAG, "KeyEvent.KEYCODE_BACK");
-
-            if (mOperationId != null && mOperationId > -1) {
-				putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-            }
 			if (isVideoMax) {
 			if (isVideoMax) {
 				videoMaxToDefault();
 				videoMaxToDefault();
 			} else if (isMarking) {
 			} else if (isMarking) {
@@ -1560,7 +1556,9 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				if(isLinkedContent) {
 				if(isLinkedContent) {
 					goToBack();
 					goToBack();
 				} else {
 				} else {
-					moveToBack();
+					if (mOperationId == -1) { //通常PDFコンテンツのみ戻る機能有効
+						moveToBack();
+					}
 				}
 				}
 			}
 			}
 			return false;
 			return false;

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

@@ -222,13 +222,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
             if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
             if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
                 showConfirmSavePanoEdit();
                 showConfirmSavePanoEdit();
             } else {
             } else {
-                if (mOperationId != null && mOperationId > -1) {
-                    putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-                }
                 if (isLinkedContent) {
                 if (isLinkedContent) {
                     goToBack();
                     goToBack();
                 } else {
                 } else {
-                    finishActivity();
+                    if (mOperationId == -1) { //通常リンクコンテンツのみ戻る機能有効
+                        finishActivity();
+                    }
                 }
                 }
             }
             }
         } else {
         } else {