android: Switch to Loaders from the support library

They are officially deprecated as of API 28 (recommended replacement is
a combination of ViewModels and LiveData, maybe something to look into
later).

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsListFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsListFragment.java
index 38c7494d51d2966a90d247d3bb5a561c86dbb72a..1f0b693e42a71d6b2a3e6c597dd7ff0a96cf8a8a 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsListFragment.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsListFragment.java
@@ -74,7 +74,7 @@ public class SelectedApplicationsListFragment extends ListFragment implements Lo
                }
                mSelection = new TreeSet<>(selection);
 
-               getLoaderManager().initLoader(0, null, this);
+               LoaderManager.getInstance(this).initLoader(0, null, this);
        }
 
        @Override

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java
index ae48ba2ba0ec3daf8e2f27aac203dc284aef5743..4d4beafa85f62b7ccc78f4bbeb95ccbbb5e396a0 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java
@@ -18,6 +18,7 @@ package org.strongswan.android.ui;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
+import android.support.v4.app.LoaderManager;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
@@ -79,7 +80,7 @@ public class TrustedCertificateListFragment extends ListFragment implements Load
                        mSource = (TrustedCertificateSource)arguments.getSerializable(EXTRA_CERTIFICATE_SOURCE);
                }
 
-               getLoaderManager().initLoader(0, null, this);
+               LoaderManager.getInstance(this).initLoader(0, null, this);
        }
 
        @Override

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
index 221840be8ced7e97998f0f25b198ce99c24950ae..eda51a006e9c53391a7351f709feb581ea8286f4 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
@@ -16,19 +16,19 @@
 package org.strongswan.android.ui;
 
 import android.app.Activity;
-import android.app.LoaderManager;
 import android.content.ActivityNotFoundException;
-import android.content.AsyncTaskLoader;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.Loader;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.security.KeyChain;
 import android.security.KeyChainAliasCallback;
 import android.security.KeyChainException;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.AsyncTaskLoader;
+import android.support.v4.content.Loader;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
@@ -229,7 +229,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
                        mUserCertLoading = savedInstanceState.getString(VpnProfileDataSource.KEY_USER_CERTIFICATE);
                        if (mUserCertLoading != null)
                        {
-                               getLoaderManager().initLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
+                               LoaderManager.getInstance(this).initLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
                        }
                        mImportUserCert.setEnabled(!savedInstanceState.getBoolean(PKCS12_INSTALLED));
                }
@@ -312,7 +312,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 
                Bundle args = new Bundle();
                args.putParcelable(PROFILE_URI, uri);
-               getLoaderManager().initLoader(PROFILE_LOADER, args, mProfileLoaderCallbacks);
+               LoaderManager.getInstance(this).initLoader(PROFILE_LOADER, args, mProfileLoaderCallbacks);
        }
 
        public void handleProfile(ProfileLoadResult data)
@@ -400,7 +400,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
                        if (mUserCertLoading == null)
                        {
                                mUserCertLoading = getString(R.string.profile_cert_alias, mProfile.getName());
-                               getLoaderManager().initLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
+                               LoaderManager.getInstance(this).initLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
                        }
                        updateUserCertView();
                }
@@ -902,7 +902,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
                                        updateUserCertView();
                                        if (alias != null)
                                        {       /* otherwise the dialog was canceled, the request denied */
-                                               getLoaderManager().restartLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
+                                               LoaderManager.getInstance(VpnProfileImportActivity.this).restartLoader(USER_CERT_LOADER, null, mUserCertificateLoaderCallbacks);
                                        }
                                }
                        });