diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java index ac9dd859b..885c62297 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java @@ -29,7 +29,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.view.ActionMode; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.FragmentManager; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; @@ -111,7 +111,7 @@ public class MainActivity extends InjectingAppCompatActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - TaskListViewModel viewModel = ViewModelProviders.of(this).get(TaskListViewModel.class); + TaskListViewModel viewModel = new ViewModelProvider(this).get(TaskListViewModel.class); getComponent().inject(viewModel); currentNightMode = getNightMode(); diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 831526c23..9ced83834 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -42,7 +42,7 @@ import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.util.Pair; import androidx.fragment.app.FragmentManager; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -282,7 +282,7 @@ public final class TaskListFragment extends InjectingFragment // set up list adapters taskAdapter = taskAdapterProvider.createTaskAdapter(filter); - taskListViewModel = ViewModelProviders.of(getActivity()).get(TaskListViewModel.class); + taskListViewModel = new ViewModelProvider(getActivity()).get(TaskListViewModel.class); if (savedInstanceState != null) { searchQuery = savedInstanceState.getString(EXTRA_SEARCH); diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java index 5ecb1f39f..a95d3a5b4 100644 --- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java @@ -9,7 +9,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.ProgressBar; import android.widget.Toast; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import butterknife.BindView; import com.google.android.material.textfield.TextInputEditText; import com.google.api.services.tasks.model.TaskList; @@ -57,9 +57,10 @@ public class GoogleTaskListSettingsActivity extends BaseListSettingsActivity { super.onCreate(savedInstanceState); - createListViewModel = ViewModelProviders.of(this).get(CreateListViewModel.class); - renameListViewModel = ViewModelProviders.of(this).get(RenameListViewModel.class); - deleteListViewModel = ViewModelProviders.of(this).get(DeleteListViewModel.class); + ViewModelProvider provider = new ViewModelProvider(this); + createListViewModel = provider.get(CreateListViewModel.class); + renameListViewModel = provider.get(RenameListViewModel.class); + deleteListViewModel = provider.get(DeleteListViewModel.class); if (gtasksList == null) { isNewList = true; diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java index f4e10183d..85651b809 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java @@ -3,7 +3,7 @@ package org.tasks.caldav; import android.content.Context; import android.os.Bundle; import androidx.appcompat.widget.Toolbar; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import com.todoroo.astrid.helper.UUIDHelper; import javax.inject.Inject; import org.tasks.R; @@ -27,9 +27,9 @@ public class CaldavAccountSettingsActivity extends BaseCaldavAccountSettingsActi protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addCaldavAccountViewModel = ViewModelProviders.of(this).get(AddCaldavAccountViewModel.class); - updateCaldavAccountViewModel = - ViewModelProviders.of(this).get(UpdateCaldavAccountViewModel.class); + ViewModelProvider provider = new ViewModelProvider(this); + addCaldavAccountViewModel = provider.get(AddCaldavAccountViewModel.class); + updateCaldavAccountViewModel = provider.get(UpdateCaldavAccountViewModel.class); addCaldavAccountViewModel.observe(this, this::addAccount, this::requestFailed); updateCaldavAccountViewModel.observe(this, this::updateAccount, this::requestFailed); diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java index a5f9ff761..e0cb6f43d 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java @@ -1,7 +1,7 @@ package org.tasks.caldav; import android.os.Bundle; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import javax.inject.Inject; import org.tasks.R; import org.tasks.data.CaldavAccount; @@ -25,9 +25,10 @@ public class CaldavCalendarSettingsActivity extends BaseCaldavCalendarSettingsAc protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - createCalendarViewModel = ViewModelProviders.of(this).get(CreateCalendarViewModel.class); - deleteCalendarViewModel = ViewModelProviders.of(this).get(DeleteCalendarViewModel.class); - updateCalendarViewModel = ViewModelProviders.of(this).get(UpdateCalendarViewModel.class); + ViewModelProvider provider = new ViewModelProvider(this); + createCalendarViewModel = provider.get(CreateCalendarViewModel.class); + deleteCalendarViewModel = provider.get(DeleteCalendarViewModel.class); + updateCalendarViewModel = provider.get(UpdateCalendarViewModel.class); createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed); deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed); diff --git a/app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java b/app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java index 323be5fb5..076771dc2 100644 --- a/app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java +++ b/app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java @@ -13,7 +13,7 @@ import android.view.View; import android.widget.Chronometer; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -57,7 +57,7 @@ public class RecordAudioDialog extends InjectingDialogFragment View view = layoutInflater.inflate(R.layout.aac_record_activity, null); ButterKnife.bind(this, view); - recorder = ViewModelProviders.of(this).get(AACRecorder.class); + recorder = new ViewModelProvider(this).get(AACRecorder.class); recorder.init(this, preferences); if (permissionChecker.canAccessMic()) { diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java index 8b71652b7..980bc3a20 100644 --- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java @@ -10,7 +10,7 @@ import android.view.View; import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.core.content.ContextCompat; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import at.bitfire.dav4jvm.exception.HttpException; import butterknife.ButterKnife; import butterknife.OnTextChanged; @@ -51,7 +51,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - createUserInfoViewModel = ViewModelProviders.of(this).get(CreateUserInfoViewModel.class); + createUserInfoViewModel = new ViewModelProvider(this).get(CreateUserInfoViewModel.class); binding = ActivityEtesyncEncryptionSettingsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); diff --git a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java index ff364527f..607aef5f1 100644 --- a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java @@ -9,7 +9,7 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.core.util.Pair; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import butterknife.OnCheckedChanged; import com.etesync.journalmanager.Crypto.CryptoManager; import com.etesync.journalmanager.Exceptions.IntegrityException; @@ -48,8 +48,9 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct binding.showAdvanced.setVisibility(View.VISIBLE); updateUrlVisibility(); - addAccountViewModel = ViewModelProviders.of(this).get(AddEteSyncAccountViewModel.class); - updateAccountViewModel = ViewModelProviders.of(this).get(UpdateEteSyncAccountViewModel.class); + ViewModelProvider provider = new ViewModelProvider(this); + addAccountViewModel = provider.get(AddEteSyncAccountViewModel.class); + updateAccountViewModel = provider.get(UpdateEteSyncAccountViewModel.class); } @Override diff --git a/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.java index a3c510834..aa8f7b209 100644 --- a/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.java @@ -1,7 +1,7 @@ package org.tasks.etesync; import android.os.Bundle; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import javax.inject.Inject; import org.tasks.caldav.BaseCaldavCalendarSettingsActivity; import org.tasks.data.CaldavAccount; @@ -19,9 +19,10 @@ public class EteSyncCalendarSettingsActivity extends BaseCaldavCalendarSettingsA protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - createCalendarViewModel = ViewModelProviders.of(this).get(CreateCalendarViewModel.class); - deleteCalendarViewModel = ViewModelProviders.of(this).get(DeleteCalendarViewModel.class); - updateCalendarViewModel = ViewModelProviders.of(this).get(UpdateCalendarViewModel.class); + ViewModelProvider provider = new ViewModelProvider(this); + createCalendarViewModel = provider.get(CreateCalendarViewModel.class); + deleteCalendarViewModel = provider.get(DeleteCalendarViewModel.class); + updateCalendarViewModel = provider.get(UpdateCalendarViewModel.class); createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed); deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed); diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.java b/app/src/main/java/org/tasks/location/LocationPickerActivity.java index 7e5dac87c..26d91a8cd 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerActivity.java +++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.java @@ -24,7 +24,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.widget.ContentLoadingProgressBar; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -134,7 +134,7 @@ public class LocationPickerActivity extends InjectingAppCompatActivity setContentView(R.layout.activity_location_picker); ButterKnife.bind(this); - viewModel = ViewModelProviders.of(this).get(PlaceSearchViewModel.class); + viewModel = new ViewModelProvider(this).get(PlaceSearchViewModel.class); viewModel.setSearchProvider(searchProvider); Configuration configuration = getResources().getConfiguration(); diff --git a/app/src/main/java/org/tasks/preferences/AttributionActivity.java b/app/src/main/java/org/tasks/preferences/AttributionActivity.java index 57a35975e..b06a18798 100644 --- a/app/src/main/java/org/tasks/preferences/AttributionActivity.java +++ b/app/src/main/java/org/tasks/preferences/AttributionActivity.java @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -59,7 +59,7 @@ public class AttributionActivity extends ThemedInjectingAppCompatActivity { protected void onResume() { super.onResume(); - ViewModelProviders.of(this).get(ViewModel.class).observe(this, this::updateAttributions); + new ViewModelProvider(this).get(ViewModel.class).observe(this, this::updateAttributions); } private void updateAttributions(List libraryAttributions) { diff --git a/app/src/main/java/org/tasks/tags/TagPickerActivity.java b/app/src/main/java/org/tasks/tags/TagPickerActivity.java index 47ef4a134..4c193ba21 100644 --- a/app/src/main/java/org/tasks/tags/TagPickerActivity.java +++ b/app/src/main/java/org/tasks/tags/TagPickerActivity.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.os.Bundle; import android.widget.EditText; import androidx.appcompat.widget.Toolbar; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -117,7 +117,7 @@ public class TagPickerActivity extends ThemedInjectingAppCompatActivity { @Override public void inject(ActivityComponent component) { component.inject(this); - viewModel = ViewModelProviders.of(this).get(TagPickerViewModel.class); + viewModel = new ViewModelProvider(this).get(TagPickerViewModel.class); component.inject(viewModel); } } diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 5acb88cf8..7ee00b13a 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -21,7 +21,7 @@ import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener; import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.todoroo.astrid.adapter.NavigationDrawerAdapter; @@ -125,7 +125,7 @@ public class NavigationDrawerFragment extends InjectingFragment { } }); if (item instanceof Filter) { - ViewModelProviders.of(getActivity()).get(TaskListViewModel.class).setFilter((Filter) item); + new ViewModelProvider(this).get(TaskListViewModel.class).setFilter((Filter) item); } close(); } diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.java b/app/src/main/java/org/tasks/ui/SubtaskControlSet.java index b4a536cb2..8e15d86c5 100644 --- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.java +++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.java @@ -17,7 +17,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -84,7 +84,7 @@ public class SubtaskControlSet extends TaskEditControlFragment implements Callba @Override protected void inject(FragmentComponent component) { component.inject(this); - viewModel = ViewModelProviders.of(this).get(TaskListViewModel.class); + viewModel = new ViewModelProvider(this).get(TaskListViewModel.class); component.inject(viewModel); }