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

Fix crash with moveToLastSeen()

Browse Source
This commit is contained in:
Greyson Parrelli 2018-08-02 11:57:10 -04:00
parent 8ca11756be
commit 5a1ef31b49
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,9 +301,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
if (result != null && result) { if (result != null && result) {
Log.i(TAG, "Finished loading draft");
Util.runOnMain(() -> { Util.runOnMain(() -> {
if (fragment != null && fragment.isResumed()) { if (fragment != null && fragment.isResumed()) {
fragment.moveToLastSeen(); fragment.moveToLastSeen();
} else {
Log.w(TAG, "Wanted to move to the last seen position, but the fragment was in an invalid state");
} }
}); });
} }

12
src/org/thoughtcrime/securesms/ConversationFragment.java
View File

@ -191,11 +191,19 @@ public class ConversationFragment extends Fragment
} }
public void moveToLastSeen() { public void moveToLastSeen() {
if (lastSeen > 0) { if (lastSeen <= 0) {
Log.i(TAG, "No need to move to last seen.");
return;
}
if (list == null || getListAdapter() == null) {
Log.w(TAG, "Tried to move to last seen position, but we hadn't initialized the view yet.");
return;
}
int position = getListAdapter().findLastSeenPosition(lastSeen); int position = getListAdapter().findLastSeenPosition(lastSeen);
scrollToLastSeenPosition(position); scrollToLastSeenPosition(position);
} }
}
private void initializeResources() { private void initializeResources() {
this.recipient = Recipient.from(getActivity(), getActivity().getIntent().getParcelableExtra(ConversationActivity.ADDRESS_EXTRA), true); this.recipient = Recipient.from(getActivity(), getActivity().getIntent().getParcelableExtra(ConversationActivity.ADDRESS_EXTRA), true);