mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move to ViewModelProvider

This commit is contained in:
M66B 2019-10-12 17:20:34 +02:00
parent c32fe99e81
commit e61413900f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -89,7 +89,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProvider;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.paging.PagedList; import androidx.paging.PagedList;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -919,7 +919,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
fabError.hide(); fabError.hide();
if (viewType == AdapterMessage.ViewType.THREAD) { if (viewType == AdapterMessage.ViewType.THREAD) {
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); ViewModelMessages model = new ViewModelProvider(getActivity()).get(ViewModelMessages.class);
model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() { model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() {
@Override @Override
public void onPrevious(boolean exists, Long id) { public void onPrevious(boolean exists, Long id) {
@ -2864,7 +2864,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
private void onMenuSelectAll() { private void onMenuSelectAll() {
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); ViewModelMessages model = new ViewModelProvider(getActivity()).get(ViewModelMessages.class);
model.getIds(getContext(), getViewLifecycleOwner(), new Observer<List<Long>>() { model.getIds(getContext(), getViewLifecycleOwner(), new Observer<List<Long>>() {
@Override @Override
public void onChanged(List<Long> ids) { public void onChanged(List<Long> ids) {
@ -2952,7 +2952,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private void loadMessages(final boolean top) { private void loadMessages(final boolean top) {
if (viewType == AdapterMessage.ViewType.THREAD && onclose != null) { if (viewType == AdapterMessage.ViewType.THREAD && onclose != null) {
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); ViewModelMessages model = new ViewModelProvider(getActivity()).get(ViewModelMessages.class);
model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() { model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() {
boolean once = false; boolean once = false;
@ -3009,7 +3009,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (top) if (top)
adapter.gotoTop(); adapter.gotoTop();
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); ViewModelMessages model = new ViewModelProvider(getActivity()).get(ViewModelMessages.class);
ViewModelMessages.Model vmodel = model.getModel( ViewModelMessages.Model vmodel = model.getModel(
getContext(), getViewLifecycleOwner(), getContext(), getViewLifecycleOwner(),