show instruction tooltip on audio short tap

shared/actions/chat2/index.tsx

@@ -2136,16 +2136,13 @@ const sendAudioRecording = async (
   logger: Saga.SagaLogger
 ) => {
   // sit here for 400ms for animations
-  await Saga.delay(400)
-
+  if (!action.payload.fromStaged) {
+    await Saga.delay(400)
+  }
   const conversationIDKey = action.payload.conversationIDKey
-  const audioRecording = state.chat2.audioRecording.get(conversationIDKey)
+  const audioRecording = action.payload.info
   const clientPrev = Constants.getClientPrev(state, conversationIDKey)
   const ephemeralLifetime = Constants.getConversationExplodingMode(state, conversationIDKey)
-  if (!audioRecording) {
-    logger.info('sendAudioRecording: no audio info for send')
-    return
-  }
   const meta = state.chat2.metaMap.get(conversationIDKey)
   if (!meta) {
     logger.warn('sendAudioRecording: no meta for send')
@@ -2161,21 +2158,25 @@ const sendAudioRecording = async (
     })
   }
   const ephemeralData = ephemeralLifetime !== 0 ? {ephemeralLifetime} : {}
-  await RPCChatTypes.localPostFileAttachmentLocalNonblockRpcPromise({
-    arg: {
-      ...ephemeralData,
-      callerPreview,
-      conversationID: Types.keyToConversationID(conversationIDKey),
-      filename: audioRecording.path,
-      identifyBehavior: RPCTypes.TLFIdentifyBehavior.chatGui,
-      metadata: Buffer.from([]),
-      outboxID: audioRecording.outboxID,
-      title: '',
-      tlfName: meta.tlfname,
-      visibility: RPCTypes.TLFVisibility.private,
-    },
-    clientPrev,
-  })
+  try {
+    await RPCChatTypes.localPostFileAttachmentLocalNonblockRpcPromise({
+      arg: {
+        ...ephemeralData,
+        callerPreview,
+        conversationID: Types.keyToConversationID(conversationIDKey),
+        filename: audioRecording.path,
+        identifyBehavior: RPCTypes.TLFIdentifyBehavior.chatGui,
+        metadata: Buffer.from([]),
+        outboxID: audioRecording.outboxID,
+        title: '',
+        tlfName: meta.tlfname,
+        visibility: RPCTypes.TLFVisibility.private,
+      },
+      clientPrev,
+    })
+  } catch (e) {
+    logger.warn('sendAudioRecording: failed to send attachment: ' + JSON.stringify(e))
+  }
 }
 
 // Upload an attachment

shared/actions/json/chat2.json

@@ -775,9 +775,6 @@
       "text": "string"
     },
     "enableAudioRecording": {
-      "conversationIDKey": "Types.ConversationIDKey"
-    },
-    "startAudioRecording": {
       "conversationIDKey": "Types.ConversationIDKey",
       "meteringCb": "(amp: number) => void"
     },
@@ -790,7 +787,9 @@
       "conversationIDKey": "Types.ConversationIDKey"
     },
     "sendAudioRecording": {
-      "conversationIDKey": "Types.ConversationIDKey"
+      "conversationIDKey": "Types.ConversationIDKey",
+      "fromStaged": "boolean",
+      "info": "Types.AudioRecordingInfo"
     },
     "setAudioRecordingPostInfo": {
       "conversationIDKey": "Types.ConversationIDKey",

shared/actions/platform-specific/index.native.tsx

@@ -711,39 +711,6 @@ const configureFileAttachmentDownloadForAndroid = () =>
     downloadDirOverride: require('rn-fetch-blob').default.fs.dirs.DownloadDir,
   })
 
-const startAudioRecording = async (
-  state: Container.TypedState,
-  action: Chat2Gen.StartAudioRecordingPayload,
-  logger: Saga.SagaLogger
-) => {
-  const conversationIDKey = action.payload.conversationIDKey
-  const audio = state.chat2.audioRecording.get(conversationIDKey)
-  if (!audio || ChatConstants.isCancelledAudioRecording(audio)) {
-    logger.info('startAudioRecording: no recording info set, bailing')
-    return false
-  }
-  const outboxID = ChatConstants.generateOutboxID()
-  await requestAudioPermission()
-  const audioPath = await RPCChatTypes.localGetUploadTempFileRpcPromise({filename: 'audio.m4a', outboxID})
-  AudioRecorder.prepareRecordingAtPath(audioPath, {
-    AudioEncoding: 'aac',
-    AudioEncodingBitRate: 32000,
-    AudioQuality: 'Low',
-    Channels: 1,
-    MeteringEnabled: true,
-    SampleRate: 22050,
-  })
-  AudioRecorder.onProgress = data => {
-    action.payload.meteringCb(data.currentMetering)
-  }
-  AudioRecorder.onFinished = () => {
-    logger.info('startAudioRecording: recording finished')
-  }
-  logger.info('startAudioRecording: beginning recording')
-  await AudioRecorder.startRecording()
-  return Chat2Gen.createSetAudioRecordingPostInfo({conversationIDKey, outboxID, path: audioPath})
-}
-
 const stopAudioRecording = async (
   state: Container.TypedState,
   action: Chat2Gen.StopAudioRecordingPayload,
@@ -761,6 +728,7 @@ const stopAudioRecording = async (
   try {
     AudioRecorder.stopRecording()
   } catch (e) {}
+  AudioRecorder.onProgress = null
 
   if (!state.chat2.audioRecording) {
     return false
@@ -774,6 +742,11 @@ const stopAudioRecording = async (
     logger.info('stopAudioRecording: no audio record, not sending')
     return false
   }
+  logger.info('stopAudioRecording: info: ' + JSON.stringify(audio))
+  if (audio.status === Types.AudioRecordingStatus.CANCELLED) {
+    logger.info('stopAudioRecording: recording cancelled, bailing out')
+    return false
+  }
   if (ChatConstants.audioRecordingDuration(audio) < 500 || audio.path.length === 0) {
     logger.info('stopAudioRecording: recording too short, skipping')
     Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error)
@@ -784,15 +757,61 @@ const stopAudioRecording = async (
     logger.info('stopAudioRecording: in staged mode, not sending')
     return false
   }
-  return Chat2Gen.createSendAudioRecording({conversationIDKey})
+  return Chat2Gen.createSendAudioRecording({conversationIDKey, fromStaged: false, info: audio})
 }
 
-const onEnableAudioRecording = () => {
+const onEnableAudioRecording = async (
+  state: Container.TypedState,
+  action: Chat2Gen.EnableAudioRecordingPayload,
+  logger: Saga.SagaLogger
+) => {
+  const conversationIDKey = action.payload.conversationIDKey
+  const audio = state.chat2.audioRecording.get(conversationIDKey)
+  if (!audio || ChatConstants.isCancelledAudioRecording(audio)) {
+    logger.info('enableAudioRecording: no recording info set, bailing')
+    return false
+  }
+
   Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
+  const outboxID = ChatConstants.generateOutboxID()
+  await requestAudioPermission()
+  const audioPath = await RPCChatTypes.localGetUploadTempFileRpcPromise({filename: 'audio.m4a', outboxID})
+  AudioRecorder.prepareRecordingAtPath(audioPath, {
+    AudioEncoding: 'aac',
+    AudioEncodingBitRate: 32000,
+    AudioQuality: 'Low',
+    Channels: 1,
+    MeteringEnabled: true,
+    SampleRate: 22050,
+  })
+  AudioRecorder.onProgress = null
+  AudioRecorder.onFinished = () => {
+    logger.info('onEnableAudioRecording: recording finished')
+  }
+  AudioRecorder.onProgress = data => {
+    action.payload.meteringCb(data.currentMetering)
+  }
+  logger.info('onEnableAudioRecording: setting recording info')
+  return Chat2Gen.createSetAudioRecordingPostInfo({conversationIDKey, outboxID, path: audioPath})
+}
+
+const onSendAudioRecording = (_: Container.TypedState, action: Chat2Gen.SendAudioRecordingPayload) => {
+  if (!action.payload.fromStaged) {
+    Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success)
+  }
 }
 
-const onSendAudioRecording = () => {
-  Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success)
+const onSetAudioRecordingPostInfo = async (
+  state: Container.TypedState,
+  action: Chat2Gen.SetAudioRecordingPostInfoPayload,
+  logger: Saga.SagaLogger
+) => {
+  const audio = state.chat2.audioRecording.get(action.payload.conversationIDKey)
+  if (!audio || audio.status !== Types.AudioRecordingStatus.RECORDING) {
+    logger.info('onSetAudioRecordingPostInfo: not in recording mode anymore, bailing')
+    return
+  }
+  await AudioRecorder.startRecording()
 }
 
 export function* platformConfigSaga() {
@@ -838,10 +857,14 @@ export function* platformConfigSaga() {
   }
 
   // Audio
-  yield* Saga.chainAction2(Chat2Gen.startAudioRecording, startAudioRecording, 'startAudioRecording')
   yield* Saga.chainAction2(Chat2Gen.stopAudioRecording, stopAudioRecording, 'stopAudioRecording')
   yield* Saga.chainAction2(Chat2Gen.enableAudioRecording, onEnableAudioRecording, 'onEnableAudioRecording')
   yield* Saga.chainAction2(Chat2Gen.sendAudioRecording, onSendAudioRecording, 'onSendAudioRecording')
+  yield* Saga.chainAction2(
+    Chat2Gen.setAudioRecordingPostInfo,
+    onSetAudioRecordingPostInfo,
+    'onSetAudioRecordingPostInfo'
+  )
 
   // Start this immediately instead of waiting so we can do more things in parallel
   yield Saga.spawn(loadStartupDetails)

shared/chat/audio/audio-player.tsx

@@ -102,7 +102,7 @@ const AudioPlayer = (props: Props) => {
       } else {
         setTimeLeft(newTimeLeft)
       }
-    }, 200)
+    }, 100)
     return () => {
       clearTimeout(timer)
     }