1
0
mirror of https://github.com/etesync/android synced 2025-02-13 08:02:03 +00:00

Setup Encryption: use the more reliable AsyncTask over AsyncTaskLoader.

I had issues with not being able to add accounts in some cases.
This commit is contained in:
Tom Hacohen 2017-05-12 12:38:08 +01:00
parent 660d5b94ba
commit b33e5003d4

View File

@ -16,16 +16,11 @@ import android.app.ProgressDialog;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.os.AsyncTask;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle; import android.os.Bundle;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.provider.ContactsContract;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import com.etesync.syncadapter.AccountSettings; import com.etesync.syncadapter.AccountSettings;
@ -39,10 +34,8 @@ import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.UserInfoManager; import com.etesync.syncadapter.journalmanager.UserInfoManager;
import com.etesync.syncadapter.model.CollectionInfo; import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.JournalEntity; import com.etesync.syncadapter.model.JournalEntity;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.ServiceEntity; import com.etesync.syncadapter.model.ServiceEntity;
import com.etesync.syncadapter.resource.LocalTaskList; import com.etesync.syncadapter.resource.LocalTaskList;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration; import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration;
import com.etesync.syncadapter.utils.AndroidCompat; import com.etesync.syncadapter.utils.AndroidCompat;
@ -51,11 +44,10 @@ import java.util.logging.Level;
import at.bitfire.ical4android.TaskProvider; import at.bitfire.ical4android.TaskProvider;
import io.requery.Persistable; import io.requery.Persistable;
import io.requery.sql.EntityDataStore; import io.requery.sql.EntityDataStore;
import lombok.Cleanup;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
public class SetupEncryptionFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> { public class SetupEncryptionFragment extends DialogFragment {
private static final String KEY_CONFIG = "config"; private static final String KEY_CONFIG = "config";
public static SetupEncryptionFragment newInstance(BaseConfigurationFinder.Configuration config) { public static SetupEncryptionFragment newInstance(BaseConfigurationFinder.Configuration config) {
@ -82,16 +74,21 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getLoaderManager().initLoader(0, getArguments(), this); new SetupEncryptionLoader(getContext(), (Configuration) getArguments().getSerializable(KEY_CONFIG)).execute();
}
private class SetupEncryptionLoader extends AsyncTask<Void, Void, Configuration> {
final Context context;
final Configuration config;
public SetupEncryptionLoader(Context context, Configuration config) {
super();
this.context = context;
this.config = config;
} }
@Override @Override
public Loader<Configuration> onCreateLoader(int id, Bundle args) { protected void onPostExecute(Configuration result) {
return new SetupEncryptionLoader(getContext(), (Configuration)args.getSerializable(KEY_CONFIG));
}
@Override
public void onLoadFinished(Loader<Configuration> loader, Configuration config) {
try { try {
if (createAccount(config.userName, config)) { if (createAccount(config.userName, config)) {
getActivity().setResult(Activity.RESULT_OK); getActivity().setResult(Activity.RESULT_OK);
@ -115,27 +112,10 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
} }
@Override @Override
public void onLoaderReset(Loader<Configuration> loader) { protected Configuration doInBackground(Void... aVoids) {
} App.log.info("Started deriving key");
static class SetupEncryptionLoader extends AsyncTaskLoader<Configuration> {
final Context context;
final Configuration config;
public SetupEncryptionLoader(Context context, Configuration config) {
super(context);
this.context = context;
this.config = config;
}
@Override
protected void onStartLoading() {
forceLoad();
}
@Override
public Configuration loadInBackground() {
config.password = Crypto.deriveKey(config.userName, config.rawPassword); config.password = Crypto.deriveKey(config.userName, config.rawPassword);
App.log.info("Finished deriving key");
try { try {
Crypto.CryptoManager cryptoManager; Crypto.CryptoManager cryptoManager;