Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1028-lost-reply-id' into 'master'

Browse Source 
Keep the reply ID up to date in ThreadListActivity

Closes #1028

See merge request !587
This commit is contained in:
akwizgran
2017-09-18 15:10:38 +00:00
parent 79015bc5ae 0e4b8ca62e
commit 329a4c64f6
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
View File

@@ -191,7 +191,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
list.showData();
} else {
initList(items);
updateTextInput(replyId);
updateTextInput();
}
} else {
LOG.info("Concurrent update, reloading");
@@ -253,9 +253,8 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
ThreadItem replyItem = adapter.getHighlightedItem();
if (replyItem != null) {
outState.putByteArray(KEY_REPLY_ID, replyItem.getId().getBytes());
if (replyId != null) {
outState.putByteArray(KEY_REPLY_ID, replyId.getBytes());
}
}
@@ -273,7 +272,9 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
@Override
public void onBackPressed() {
if (adapter.getHighlightedItem() != null) {
updateTextInput(null);
textInput.setText("");
replyId = null;
updateTextInput();
} else {
super.onBackPressed();
}
@@ -289,7 +290,8 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
@Override
public void onReplyClick(final I item) {
updateTextInput(item.getId());
replyId = item.getId();
updateTextInput();
if (textInput.isKeyboardOpen()) {
scrollToItemAtTop(item);
} else {
@@ -339,15 +341,15 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
snackbar.show();
}
private void updateTextInput(@Nullable MessageId replyItemId) {
if (replyItemId != null) {
private void updateTextInput() {
if (replyId != null) {
textInput.setHint(R.string.forum_message_reply_hint);
textInput.requestFocus();
textInput.showSoftKeyboard();
} else {
textInput.setHint(R.string.forum_new_message_hint);
}
adapter.setHighlightedItem(replyItemId);
adapter.setHighlightedItem(replyId);
}
@Override
@@ -374,7 +376,8 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
getController().createAndStoreMessage(text, replyItem, handler);
textInput.hideSoftKeyboard();
textInput.setText("");
updateTextInput(null);
replyId = null;
updateTextInput();
}
protected abstract int getMaxBodyLength();