Compare commits

...

5 Commits

Author SHA1 Message Date
Alex Hart
d342f7ae18 Bump version to 6.10.8 2023-02-07 12:26:30 -04:00
Alex Hart
9c3711d757 Bump version to 6.10.7 2023-02-07 12:15:30 -04:00
Cody Henthorne
37e64ff819 Fix backup scheduling looping bug. 2023-02-07 11:12:59 -05:00
Alex Hart
53a6eec82a Bump version to 6.10.6 2023-02-06 13:12:17 -04:00
Nicholas Tinsley
ff131087db Catch new audio recording error states. 2023-02-06 13:02:04 -04:00
3 changed files with 21 additions and 16 deletions

View File

@@ -53,14 +53,14 @@ ktlint {
}
def canonicalVersionCode = 1205
def canonicalVersionName = "6.10.5"
def canonicalVersionName = "6.10.8"
def postFixSize = 100
def abiPostFix = ['universal' : 0,
'armeabi-v7a' : 1,
'arm64-v8a' : 2,
'x86' : 3,
'x86_64' : 4]
def abiPostFix = ['universal' : 15,
'armeabi-v7a' : 16,
'arm64-v8a' : 17,
'x86' : 18,
'x86_64' : 19]
def keystores = [ 'debug' : loadKeystoreProperties('keystore.debug.properties') ]

View File

@@ -3375,9 +3375,13 @@ public class ConversationParentFragment extends Fragment
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
voiceNoteMediaController.pausePlayback();
recordingSession = new RecordingSession(audioRecorder.startRecording());
disposables.add(recordingSession);
try {
recordingSession = new RecordingSession(audioRecorder.startRecording());
disposables.add(recordingSession);
} catch (AssertionError err) {
Log.e(TAG, "Could not start audio recording.", err);
Toast.makeText(requireContext(), R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_SHORT).show();
}
}
@Override
@@ -3396,8 +3400,9 @@ public class ConversationParentFragment extends Fragment
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
recordingSession.completeRecording();
if (recordingSession != null) {
recordingSession.completeRecording();
}
}
@Override

View File

@@ -49,11 +49,11 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
if (Build.VERSION.SDK_INT < 31) {
nextTime = System.currentTimeMillis() + INTERVAL;
} else {
LocalDateTime now = LocalDateTime.now();
int hour = SignalStore.settings().getBackupHour();
int minute = SignalStore.settings().getBackupMinute();
LocalDateTime next = now.withHour(hour).withMinute(minute).withSecond(0);
if (now.getHour() >= 2) {
LocalDateTime now = LocalDateTime.now();
int hour = SignalStore.settings().getBackupHour();
int minute = SignalStore.settings().getBackupMinute();
LocalDateTime next = now.withHour(hour).withMinute(minute).withSecond(0);
if (now.isAfter(next)) {
next = next.plusDays(1);
}