oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Voice Note -> Voice Message 

Fixes #4628
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-11-20 10:25:08 -08:00
parent e41f34729e
commit dc1b420fef
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -132,7 +132,7 @@
<string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits for the type of message you\'re sending.</string>
<string name="ConversationActivity_quick_camera_unavailable">Camera unavailable</string>
<string name="ConversationActivity_unable_to_record_audio">Unable to record audio!</string>
<string name="ConversationActivity_error_sending_voice_note">Error sending voice note...</string>
<string name="ConversationActivity_error_sending_voice_message">Error sending voice message...</string>
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
@ -281,7 +281,7 @@
<string name="ImportFragment_restore_complete">Restore complete!</string>
<!-- InputPanel -->
<string name="InputPanel_tap_and_hold_to_record_a_voice_note_release_to_send">Tap and hold to record a voice note, release to send</string>
<string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tap and hold to record a voice message, release to send</string>
<!-- InviteActivity -->
<string name="InviteActivity_share">Share</string>

3
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -34,7 +34,6 @@ import android.os.Bundle;
import android.os.Vibrator;
import android.provider.ContactsContract;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.view.WindowCompat;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@ -1412,7 +1411,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
});
} catch (IOException | InvalidMessageException e) {
Log.w(TAG, e);
Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_error_sending_voice_note, Toast.LENGTH_LONG).show();
Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_error_sending_voice_message, Toast.LENGTH_LONG).show();
}
}

4
src/org/thoughtcrime/securesms/components/InputPanel.java
View File

@ -104,7 +104,7 @@ public class InputPanel extends LinearLayout implements MicrophoneRecorderView.L
if (elapsedTime > 1000) {
listener.onRecorderFinished();
} else {
Toast.makeText(getContext(), R.string.InputPanel_tap_and_hold_to_record_a_voice_note_release_to_send, Toast.LENGTH_LONG).show();
Toast.makeText(getContext(), R.string.InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send, Toast.LENGTH_LONG).show();
listener.onRecorderCanceled();
}
}
@ -239,7 +239,7 @@ public class InputPanel extends LinearLayout implements MicrophoneRecorderView.L
ViewUtil.fadeOut(this.recordTimeView, FADE_TIME, View.INVISIBLE);
return elapsedtime;
}
@Override
public void run() {
long localStartTime = startTime.get();