Merge branch 'features/1.3.0' into 'features/1.3.0_test'

Features/1.3.0

See merge request !56

ABVJE_Launcher_Android/assets/chat/public/js/language_en.js

@@ -11,7 +11,7 @@ $.lang.en = {
     "roomListEmptyString":"There is no room available.",
     "left":"%@ has left",
     "join":"%@ has joined",
-    "added":"%@  has been added",
+    "added":"%@ has been invited",
     "welcome":"Welcome to %@",
     "userListDivideString":", ",
     "orderByTime":"OrderByTime",
@@ -44,5 +44,7 @@ $.lang.en = {
     "errorConnect":"There was a problem with the network.\n Please check the connection status of the network.",
     "errorRoomNotFound":"This chat room has already been deleted.",
     "serverErrorOccured":"App will not be able to communicate with the server. \n After a few moments, please try again.",
-    "memberDeleteTitle":"Do you want to remove selected members from the list?"
+    "memberDeleteTitle":"Do you want to remove selected members from the list?",
+    "photo":"Photo",
+    "video":"Video"
 }

ABVJE_Launcher_Android/assets/chat/public/js/language_ja.js

@@ -11,7 +11,7 @@ $.lang.ja = {
     "roomListEmptyString":"入場できるルームがありません。",
     "left":"%@ 様が退場しました。",
     "join":"%@ 様が入場しました。",
-    "added":"%@ 様がルームに招待されました。",
+    "added":"%@ 様を招待しました。",
     "welcome":"%@ に入場しました。",
     "userListDivideString":" 様, ",
     "orderByTime":"新着順",
@@ -44,5 +44,7 @@ $.lang.ja = {
     "errorConnect":"ネットワークに問題がありました。\nネットワークの接続状態を確認してください。",
     "errorRoomNotFound":"既に削除されたチャットルームです。",
     "serverErrorOccured":"サーバと通信できません。\nしばらく時間をおいて再度操作してください。",
-    "memberDeleteTitle":"選択したメンバーをリストから削除しますか？"
+    "memberDeleteTitle":"選択したメンバーをリストから削除しますか？",
+    "photo":"写真",
+    "video":"動画"
 }

ABVJE_Launcher_Android/assets/chat/public/js/language_ko.js

@@ -11,7 +11,7 @@ $.lang.ko = {
     "roomListEmptyString":"입장 가능한 방이 없습니다.",
     "left":"%@ 님이 방을 떠났습니다.",
     "join":"%@ 님이 참가했습니다.",
-    "added":"%@ 님이 방에 초대되었습니다.",
+    "added":"%@ 님을 초대했습니다.",
     "welcome":"%@ 에 입장했습니다.",
     "userListDivideString":" 님, ",
     "orderByTime":"최신순",
@@ -24,7 +24,7 @@ $.lang.ko = {
     "groupListKeyword":"검색",
     "groupPageSubtitle":"그룹",
     "noMessages":"메시지가 없습니다.",
-    "image":"사진",
+    "image":"이미지",
     "chatKeyword":"검색",
     "userListKeyword":"검색",
     "newRoomName":"방제목 입력",
@@ -44,5 +44,7 @@ $.lang.ko = {
     "errorConnect":"네트워크에 문제가 발생했습니다.\n네트워크 연결상태를 확인하여 주십시요.",
     "errorRoomNotFound":"이미 삭제된 채팅룸입니다.",
     "serverErrorOccured":"서버와 통신할 수 없습니다.\n잠시 후 다시 시도해보시기 바랍니다.",
-    "memberDeleteTitle":"목록에서 선택된 멤버를 삭제하시겠습니까?"
+    "memberDeleteTitle":"목록에서 선택된 멤버를 삭제하시겠습니까?",
+    "photo":"사진",
+    "video":"동영상"
 }

ABVJE_Launcher_Android/assets/chat/public/newstart.html

@@ -209,10 +209,24 @@
           <div class="input_msg_write">
             <div class="input-group">
               <div class="input-group-prepend">
-                <button class="btn input-group-text" id="fileUploadButton" type="button"><i class="fa fa-camera"></i></button>
-                <form id="image-form">
-                  <input class="d-none" type="file" name="image" id="imageInputTag" accept="image/x-png,image/jpeg">
-                </form>
+                <button class="btn input-group-text dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-camera"></i></button>
+                  <!-- Video Upload -->
+                  <div class="dropdown-menu">
+                    <a class="dropdown-item" id="fileUploadButton" href="#">Photo
+                      <a href="#">
+                        <form id="image-form">
+                        <input class="d-none" type="file" name="image" id="imageInputTag" accept="image/x-png,image/jpeg">
+                        </form>
+                      </a>
+                    </a>
+                    <a class="dropdown-item" id="fileUploadButton2" href="#">Video
+                      <a href="#">
+                        <form id="image-form2">
+                        <input class="d-none" type="file" name="image" id="imageInputTag2" accept="video/mp4">
+                        </form>
+                      </a>
+                    </a>
+                  </div>
               </div>
               <input id="message-form" type="text" class="write_msg form-control" name="message" placeholder="Type a message" autocomplete="off">
               <div class="input-group-append">

ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/OnAppDownloadReceiver.java

@@ -44,7 +44,8 @@ public class OnAppDownloadReceiver extends BroadcastReceiver {
                 Toast.makeText(context, intent.getAction(), Toast.LENGTH_LONG).show();
             } else {
                 // APK 確認することではない場合
-                if (!downloadedTo.toLowerCase().endsWith(".png") && !downloadedTo.toLowerCase().endsWith(".jpg") && !downloadedTo.toLowerCase().endsWith(".jpeg")) {
+                if (!downloadedTo.toLowerCase().endsWith(".png") && !downloadedTo.toLowerCase().endsWith(".jpg") && !downloadedTo.toLowerCase().endsWith(".jpeg")
+                        && !downloadedTo.toLowerCase().endsWith(".mp4") && !downloadedTo.toLowerCase().endsWith(".mov")) {
                     File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), ABVEnvironment.APK_FILE_NAME);
                     if (file.exists()) {
                         Intent i = new Intent(Intent.ACTION_VIEW);