mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-25 17:27:00 +00:00
Updated selected message on navigating
This commit is contained in:
parent
233bd5dc48
commit
866213a891
1 changed files with 34 additions and 2 deletions
|
@ -100,6 +100,7 @@ import androidx.core.content.ContextCompat;
|
||||||
import androidx.core.graphics.ColorUtils;
|
import androidx.core.graphics.ColorUtils;
|
||||||
import androidx.fragment.app.FragmentActivity;
|
import androidx.fragment.app.FragmentActivity;
|
||||||
import androidx.fragment.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentResultListener;
|
||||||
import androidx.fragment.app.FragmentTransaction;
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
import androidx.lifecycle.Lifecycle;
|
import androidx.lifecycle.Lifecycle;
|
||||||
import androidx.lifecycle.LifecycleOwner;
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
@ -293,6 +294,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
private boolean loading = false;
|
private boolean loading = false;
|
||||||
private boolean swiping = false;
|
private boolean swiping = false;
|
||||||
private boolean scrolling = false;
|
private boolean scrolling = false;
|
||||||
|
private boolean navigating = false;
|
||||||
|
|
||||||
private AdapterMessage adapter;
|
private AdapterMessage adapter;
|
||||||
|
|
||||||
|
@ -424,6 +426,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
viewType = AdapterMessage.ViewType.SEARCH;
|
viewType = AdapterMessage.ViewType.SEARCH;
|
||||||
setTitle(server ? R.string.title_search_server : R.string.title_search_device);
|
setTitle(server ? R.string.title_search_server : R.string.title_search_device);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (viewType != AdapterMessage.ViewType.THREAD)
|
||||||
|
getParentFragmentManager().setFragmentResultListener("message.selected", this, new FragmentResultListener() {
|
||||||
|
@Override
|
||||||
|
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
|
||||||
|
long id = result.getLong("id", -1);
|
||||||
|
iProperties.setValue("selected", id, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1587,9 +1598,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
values.get(name).remove(id);
|
values.get(name).remove(id);
|
||||||
|
|
||||||
if ("selected".equals(name) && enabled) {
|
if ("selected".equals(name) && enabled) {
|
||||||
|
final List<Integer> changed = new ArrayList<>();
|
||||||
|
|
||||||
int pos = adapter.getPositionForKey(id);
|
int pos = adapter.getPositionForKey(id);
|
||||||
if (pos != NO_POSITION)
|
if (pos != NO_POSITION)
|
||||||
adapter.notifyItemChanged(pos);
|
changed.add(pos);
|
||||||
|
|
||||||
for (Long other : new ArrayList<>(values.get("selected")))
|
for (Long other : new ArrayList<>(values.get("selected")))
|
||||||
if (!other.equals(id)) {
|
if (!other.equals(id)) {
|
||||||
|
@ -1597,8 +1610,20 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
|
|
||||||
pos = adapter.getPositionForKey(other);
|
pos = adapter.getPositionForKey(other);
|
||||||
if (pos != NO_POSITION)
|
if (pos != NO_POSITION)
|
||||||
adapter.notifyItemChanged(pos);
|
changed.add(pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rvMessage.post(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
for (Integer pos : changed)
|
||||||
|
adapter.notifyItemChanged(pos);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.e(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4870,6 +4895,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
private void navigate(long id, final boolean left) {
|
private void navigate(long id, final boolean left) {
|
||||||
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
|
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
|
||||||
return;
|
return;
|
||||||
|
if (navigating)
|
||||||
|
return;
|
||||||
|
navigating = true;
|
||||||
|
|
||||||
|
Bundle result = new Bundle();
|
||||||
|
result.putLong("id", id);
|
||||||
|
getParentFragmentManager().setFragmentResult("message.selected", result);
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putLong("id", id);
|
args.putLong("id", id);
|
||||||
|
|
Loading…
Reference in a new issue