fix for a crash, #137

Author: or-else

app/src/main/java/co/tinode/tindroid/AttachmentHandler.java

@@ -553,7 +553,7 @@ private ListenableWorker.Result uploadMessageAttachment(final Context context, f
                                 break;
                             case ARG_OPERATION_AUDIO:
                                 content = draftyAudio(uploadDetails.mimeType, args.getByteArray(ARG_AUDIO_PREVIEW),
-                                        null, ref, uploadDetails.duration, fname, uploadDetails.fileSize);
+                                        null, url, uploadDetails.duration, fname, uploadDetails.fileSize);
                                 break;
                         }
                     }

app/src/main/java/co/tinode/tindroid/MessagesAdapter.java

@@ -21,7 +21,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -1004,25 +1003,25 @@ static class ViewHolder extends RecyclerView.ViewHolder {
             mGestureDetector = new GestureDetector(itemView.getContext(),
                     new GestureDetector.SimpleOnGestureListener() {
                         @Override
-                        public void onLongPress(MotionEvent ev) {
+                        public void onLongPress(@NonNull MotionEvent ev) {
                             itemView.performLongClick();
                         }
 
                         @Override
-                        public boolean onSingleTapConfirmed(MotionEvent ev) {
+                        public boolean onSingleTapConfirmed(@NonNull MotionEvent ev) {
                             itemView.performClick();
                             return super.onSingleTapConfirmed(ev);
                         }
 
                         @Override
-                        public void onShowPress(MotionEvent ev) {
+                        public void onShowPress(@NonNull MotionEvent ev) {
                             if (mRippleOverlay != null) {
                                 mRippleOverlay.setPressed(true);
                                 mRippleOverlay.postDelayed(() -> mRippleOverlay.setPressed(false), 250);
                             }
                         }
                         @Override
-                        public boolean onDown(MotionEvent ev) {
+                        public boolean onDown(@NonNull MotionEvent ev) {
                             // Convert click coordinates in itemView to TexView.
                             int[] item = new int[2];
                             int[] text = new int[2];
@@ -1151,13 +1150,15 @@ private boolean clickAudio(Map<String, Object> data, Object params) {
             try {
                 FullFormatter.AudioClickAction aca = (FullFormatter.AudioClickAction) params;
                 if (aca.action == FullFormatter.AudioClickAction.Action.PLAY) {
-                    mMediaControl.ensurePlayerReady(mSeqId, data, aca.control);
-                    mMediaControl.playWhenReady();
+                    if (mMediaControl.ensurePlayerReady(mSeqId, data, aca.control)) {
+                        mMediaControl.playWhenReady();
+                    }
                 } else if (aca.action == FullFormatter.AudioClickAction.Action.PAUSE) {
                     mMediaControl.pause();
                 } else if (aca.seekTo != null) {
-                    mMediaControl.ensurePlayerReady(mSeqId, data, aca.control);
-                    mMediaControl.seekToWhenReady(aca.seekTo);
+                    if (mMediaControl.ensurePlayerReady(mSeqId, data, aca.control)) {
+                        mMediaControl.seekToWhenReady(aca.seekTo);
+                    }
                 }
             } catch (IOException | ClassCastException ignored) {
                 Toast.makeText(mActivity, R.string.unable_to_play_audio, Toast.LENGTH_SHORT).show();
@@ -1305,11 +1306,11 @@ private class MediaControl {
         // Playback fraction to seek to when the player is ready.
         private float mSeekTo = -1f;
 
-        synchronized void ensurePlayerReady(int seq, Map<String, Object> data,
+        synchronized boolean ensurePlayerReady(int seq, Map<String, Object> data,
                                        FullFormatter.AudioControlCallback control) throws IOException {
             if (mAudioPlayer != null && mPlayingAudioSeq == seq) {
                 mAudioControlCallback = control;
-                return;
+                return true;
             }
 
             if (mPlayingAudioSeq > 0 && mAudioControlCallback != null) {
@@ -1383,15 +1384,24 @@ synchronized void ensurePlayerReady(int seq, Map<String, Object> data,
                                 .build();
                         mAudioPlayer.setDataSource(mActivity, uri);
                     }
+                } else {
+                    mAudioControlCallback.reset();
+                    Log.w(TAG, "Invalid ref URL " + val);
+                    Toast.makeText(mActivity, R.string.unable_to_play_audio, Toast.LENGTH_SHORT).show();
+                    return false;
                 }
             } else if ((val = data.get("val")) instanceof String) {
                 byte[] source = Base64.decode((String) val, Base64.DEFAULT);
                 mAudioPlayer.setDataSource(new MemoryAudioSource(source));
             } else {
+                mAudioControlCallback.reset();
                 Log.w(TAG, "Unable to play audio: missing data");
+                Toast.makeText(mActivity, R.string.unable_to_play_audio, Toast.LENGTH_SHORT).show();
+                return false;
             }
 
             mAudioPlayer.prepareAsync();
+            return true;
         }
 
         synchronized void releasePlayer(int seq) {

app/src/main/java/co/tinode/tindroid/MessagesFragment.java

@@ -36,6 +36,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -626,7 +627,7 @@ public boolean onZoneReached(int id) {
             }
         });
         GestureDetector gd = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
-            public void onLongPress(MotionEvent e) {
+            public void onLongPress(@NonNull MotionEvent e) {
                 if (!UiUtils.isPermissionGranted(activity, Manifest.permission.RECORD_AUDIO)) {
                     mAudioRecorderPermissionLauncher.launch(new String[] {
                             Manifest.permission.RECORD_AUDIO, Manifest.permission.MODIFY_AUDIO_SETTINGS
@@ -936,12 +937,14 @@ private void initAudioRecorder(Activity activity) {
             mGainControl = AutomaticGainControl.create(MediaRecorder.AudioSource.MIC);
         }
 
+        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         try {
             mAudioRecord = File.createTempFile("audio", ".m4a", activity.getCacheDir());
             mAudioRecorder.setOutputFile(mAudioRecord.getAbsolutePath());
             mAudioRecorder.prepare();
             mAudioSampler = new AudioSampler();
         } catch (IOException ex) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             Log.w(TAG, "Failed to initialize audio recording", ex);
             Toast.makeText(activity, R.string.audio_recording_failed, Toast.LENGTH_SHORT).show();
             mAudioRecorder.release();
@@ -995,6 +998,8 @@ private void releaseAudio(boolean keepRecord) {
             return;
         }
 
+        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         if (!keepRecord && mAudioRecord != null) {
             mAudioRecord.delete();
             mAudioRecord = null;