Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix composer voice memo cancellation due to focus loss.

Browse Source
This commit is contained in:
Nicholas
2023-02-02 16:11:59 -05:00
committed by Nicholas Tinsley
parent 63a153571d
commit d33aa247db
5 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
View File

@@ -33,6 +33,7 @@ import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
import org.thoughtcrime.securesms.audio.AudioRecordingHandler;
import org.thoughtcrime.securesms.components.emoji.EmojiEventListener;
import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
@@ -63,7 +64,7 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
public class InputPanel extends LinearLayout
implements MicrophoneRecorderView.Listener,
implements AudioRecordingHandler,
KeyboardAwareLinearLayout.OnKeyboardShownListener,
EmojiEventListener,
ConversationStickerSuggestionAdapter.EventListener
@@ -137,7 +138,7 @@ public class InputPanel extends LinearLayout
this.voiceNoteDraftView = findViewById(R.id.voice_note_draft_view);
this.slideToCancel = new SlideToCancel(findViewById(R.id.slide_to_cancel));
this.microphoneRecorderView = findViewById(R.id.recorder_view);
this.microphoneRecorderView.setListener(this);
this.microphoneRecorderView.setHandler(this);
this.recordTime = new RecordTime(findViewById(R.id.record_time),
findViewById(R.id.microphone),
TimeUnit.HOURS.toSeconds(1),

38
app/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
View File

@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.audio.AudioRecordingHandler;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.util.ViewUtil;
@@ -34,10 +35,10 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
public static final int ANIMATION_DURATION = 200;
private FloatingRecordButton floatingRecordButton;
private LockDropTarget lockDropTarget;
private @Nullable Listener listener;
private @NonNull State state = State.NOT_RUNNING;
private FloatingRecordButton floatingRecordButton;
private LockDropTarget lockDropTarget;
private @Nullable AudioRecordingHandler handler;
private @NonNull State state = State.NOT_RUNNING;
public MicrophoneRecorderView(Context context) {
super(context);
@@ -63,8 +64,8 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
state = State.NOT_RUNNING;
hideUi();
if (listener != null) {
listener.onRecordCanceled(byUser);
if (handler != null) {
handler.onRecordCanceled(byUser);
}
}
}
@@ -78,7 +79,7 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
state = State.RUNNING_LOCKED;
hideUi();
if (listener != null) listener.onRecordLocked();
if (handler != null) handler.onRecordLocked();
}
}
@@ -87,7 +88,7 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
state = State.NOT_RUNNING;
hideUi();
if (listener != null) listener.onRecordReleased();
if (handler != null) handler.onRecordReleased();
}
}
@@ -101,12 +102,12 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
if (!Permissions.hasAll(getContext(), Manifest.permission.RECORD_AUDIO)) {
if (listener != null) listener.onRecordPermissionRequired();
if (handler != null) handler.onRecordPermissionRequired();
} else if (state == State.NOT_RUNNING) {
state = State.RUNNING_HELD;
floatingRecordButton.display(event.getX(), event.getY());
lockDropTarget.display();
if (listener != null) listener.onRecordPressed();
if (handler != null) handler.onRecordPressed();
}
break;
case MotionEvent.ACTION_CANCEL:
@@ -114,13 +115,13 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
if (this.state == State.RUNNING_HELD) {
state = State.NOT_RUNNING;
hideUi();
if (listener != null) listener.onRecordReleased();
if (handler != null) handler.onRecordReleased();
}
break;
case MotionEvent.ACTION_MOVE:
if (this.state == State.RUNNING_HELD) {
this.floatingRecordButton.moveTo(event.getX(), event.getY());
if (listener != null) listener.onRecordMoved(floatingRecordButton.lastOffsetX, event.getRawX());
if (handler != null) handler.onRecordMoved(floatingRecordButton.lastOffsetX, event.getRawX());
int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.recording_voice_lock_target);
if (floatingRecordButton.lastOffsetY <= dimensionPixelSize) {
@@ -133,17 +134,8 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
return false;
}
public void setListener(@Nullable Listener listener) {
this.listener = listener;
}
public interface Listener {
void onRecordPressed();
void onRecordReleased();
void onRecordCanceled(boolean byUser);
void onRecordLocked();
void onRecordMoved(float offsetX, float absoluteX);
void onRecordPermissionRequired();
public void setHandler(@Nullable AudioRecordingHandler handler) {
this.handler = handler;
}
private static class FloatingRecordButton {