TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-02 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voice Note -> Voice Message

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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();