Commit d33f2864 by Kim Jinsung

Merge branch 'features/1.2.363_42435' into 'features/1.2.363'

Bug #42435 パノラマ(動画・画像)とオブジェクトコンテンツでメールアクションボタン問題

See merge request !111
parents 21959eb1 23377ff1
...@@ -156,4 +156,6 @@ public class ABookKeys { ...@@ -156,4 +156,6 @@ public class ABookKeys {
public static final String APPROVAL_LIST = "approvalList"; public static final String APPROVAL_LIST = "approvalList";
public static final String PHASE_LIST = "phaseList"; public static final String PHASE_LIST = "phaseList";
public static final String PROCESS_LIST = "processList"; public static final String PROCESS_LIST = "processList";
public static final String MAIL_TO_URL = "mailto";
} }
...@@ -291,6 +291,15 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -291,6 +291,15 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
} }
return true; return true;
} }
//mailtoスキームチェック
String mailUrl = ABookKeys.MAIL_TO_URL;
if (url.length() > mailUrl.length() && mailUrl.equals(url.substring(0, mailUrl.length()))) {
//メーラー起動
Intent intent = new Intent(Intent.ACTION_SENDTO,Uri.parse(url));
startActivity(intent);
return true;
}
return false; return false;
} }
......
...@@ -352,6 +352,14 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -352,6 +352,14 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
} else if (url.startsWith(ABookKeys.PING)) { } else if (url.startsWith(ABookKeys.PING)) {
return true; return true;
} }
//mailtoスキームチェック
String mailUrl = ABookKeys.MAIL_TO_URL;
if (url.length() > mailUrl.length() && mailUrl.equals(url.substring(0, mailUrl.length()))) {
//メーラー起動
Intent intent = new Intent(Intent.ACTION_SENDTO,Uri.parse(url));
startActivity(intent);
return true;
}
return false; return false;
} }
}); });
......
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