From a3635216db123c9d94c59940eb0a3e1e051d23d1 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Wed, 23 Oct 2019 14:00:55 +1100
Subject: [PATCH] Enable sending audio recordings

---
 _locales/en/messages.json                |  3 +--
 background.html                          |  6 ++----
 js/models/conversations.js               |  4 +++-
 js/modules/loki_app_dot_net_api.js       | 11 ++++++++++-
 js/views/conversation_view.js            |  5 -----
 js/views/nickname_dialog_view.js         |  5 ++---
 js/views/standalone_registration_view.js |  5 ++---
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index ebfe68fab..1355e2f87 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1228,8 +1228,7 @@
       "Option to control creation and send of link previews in setting screen"
   },
   "linkPreviewsSettingDescription": {
-    "message":
-      "Enable link previews",
+    "message": "Enable link previews",
     "description": "Description shown for the Link Preview option "
   },
   "spellCheckDescription": {
diff --git a/background.html b/background.html
index 8bb34969d..91db71824 100644
--- a/background.html
+++ b/background.html
@@ -133,12 +133,12 @@
               <div class='flex'>
                 <button class='emoji' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                 <textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
-                <div class='capture-audio hide'>
+                <div class='capture-audio'>
                     <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                 </div>
                 <div id='choose-file' class='choose-file'>
                     <button class='paperclip thumbnail' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
-                    <input type='file' class='file-input' multiple='multiple' accept='video/* image/*'>
+                    <input type='file' class='file-input' multiple='multiple'>
                 </div>
               </div>
             </form>
@@ -654,8 +654,6 @@
                 <div class='error'></div>
             </div>
             <div class='buttons'>
-              <!-- <a class='button grey' id='back-button'>Back</a> -->
-              <!-- <a class='button' id='save-button' data-loading-text='Please wait...'>Save</a> -->
               <button class='button grey' id='back-button' tabindex='2'>Back</button>
               <button class='button' id='save-button' tabindex='1'>Save</button>
             </div>
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 4da731a20..12b67d756 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2015,7 +2015,9 @@
         );
         const ourNumber = textsecure.storage.user.getNumber();
         return !stillUnread.some(
-          m => m.propsForMessage.text && m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1
+          m =>
+            m.propsForMessage.text &&
+            m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1
         );
       })();
 
diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index c0670aedd..cd4352e59 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -942,7 +942,16 @@ class LokiPublicChannelAPI {
   }
 
   static getAnnotationFromAttachment(attachment) {
-    const type = attachment.contentType.match(/^image/) ? 'photo' : 'video';
+    let type;
+    if (attachment.contentType.match(/^image/)) {
+      type = 'photo';
+    } else if (attachment.contentType.match(/^video/)) {
+      type = 'video';
+    } else if (attachment.contentType.match(/^audio/)) {
+      type = 'audio';
+    } else {
+      type = 'other';
+    }
     const annotation = {
       type: ATTACHMENT_TYPE,
       value: {
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index b643b4a43..cd7d14cf7 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -636,10 +636,6 @@
     },
 
     toggleMicrophone() {
-      // ALWAYS HIDE until we support audio
-      this.$('.capture-audio').hide();
-
-      /*
       if (
         this.$('.send-message').val().length > 0 ||
         this.fileInput.hasFiles()
@@ -648,7 +644,6 @@
       } else {
         this.$('.capture-audio').show();
       }
-      */
     },
     captureAudio(e) {
       e.preventDefault();
diff --git a/js/views/nickname_dialog_view.js b/js/views/nickname_dialog_view.js
index 9d33a730e..3890c342f 100644
--- a/js/views/nickname_dialog_view.js
+++ b/js/views/nickname_dialog_view.js
@@ -57,10 +57,9 @@
       if (_.isEmpty(nickname)) {
         this.$('.ok').attr('disabled', 'disabled');
         return false;
-      } else {
-        this.$('.ok').removeAttr('disabled');
-        return true;
       }
+      this.$('.ok').removeAttr('disabled');
+      return true;
     },
     render_attributes() {
       return {
diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js
index 7d863ac18..b621c204d 100644
--- a/js/views/standalone_registration_view.js
+++ b/js/views/standalone_registration_view.js
@@ -90,10 +90,9 @@
       if (_.isEmpty(newVal)) {
         this.$('#save-button').attr('disabled', 'disabled');
         return false;
-      } else {
-        this.$('#save-button').removeAttr('disabled');
-        return true;
       }
+      this.$('#save-button').removeAttr('disabled');
+      return true;
     },
     async showPage(pageIndex) {
       // eslint-disable-next-line func-names