Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

synched conversation and forum input

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-06-15 22:53:48 +02:00
parent 192ee41600
commit ac8c1c0eee
5 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -18,7 +18,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -108,7 +107,7 @@ public class ConversationActivity extends BriarActivity
private TextView toolbarTitle;
private BriarRecyclerView list;
private EditText content;
private ImageButton sendButton;
private View sendButton;
// Fields that are accessed from background threads must be volatile
@Inject
@@ -169,8 +168,8 @@ public class ConversationActivity extends BriarActivity
list.setAdapter(adapter);
list.setEmptyText(getString(R.string.no_private_messages));
content = (EditText) findViewById(R.id.contentView);
sendButton = (ImageButton) findViewById(R.id.sendButton);
content = (EditText) findViewById(R.id.input_text);
sendButton = findViewById(R.id.btn_send);
if (sendButton != null) {
// Enabled after loading the conversation
sendButton.setEnabled(false);