arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-04-30 05:59:06 +00:00
Code Issues Releases Wiki Activity

Rename DavResourceFinder.

Browse Source
This commit is contained in:
Tom Hacohen 2017-02-08 11:37:53 +00:00
parent dcb3429884
commit d62d7049f2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java
View File

@ -27,7 +27,7 @@ public class DavResourceFinderTest {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
DavResourceFinder finder; BaseConfigurationFinder finder;
OkHttpClient client; OkHttpClient client;
LoginCredentials credentials; LoginCredentials credentials;
@ -48,7 +48,7 @@ public class DavResourceFinderTest {
server.start(); server.start();
credentials = new LoginCredentials(URI.create("/"), "mock", "12345"); credentials = new LoginCredentials(URI.create("/"), "mock", "12345");
finder = new DavResourceFinder(getTargetContext(), credentials); finder = new BaseConfigurationFinder(getTargetContext(), credentials);
client = HttpClient.create(null); client = HttpClient.create(null);
} }

6
app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.java → app/src/main/java/at/bitfire/davdroid/ui/setup/BaseConfigurationFinder.java
View File

@ -28,7 +28,7 @@ import lombok.ToString;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
public class DavResourceFinder { public class BaseConfigurationFinder {
protected final Context context; protected final Context context;
protected final LoginCredentials credentials; protected final LoginCredentials credentials;
@ -36,11 +36,11 @@ public class DavResourceFinder {
protected final StringHandler logBuffer = new StringHandler(); protected final StringHandler logBuffer = new StringHandler();
protected OkHttpClient httpClient; protected OkHttpClient httpClient;
public DavResourceFinder(@NonNull Context context, @NonNull LoginCredentials credentials) { public BaseConfigurationFinder(@NonNull Context context, @NonNull LoginCredentials credentials) {
this.context = context; this.context = context;
this.credentials = credentials; this.credentials = credentials;
log = Logger.getLogger("davdroid.DavResourceFinder"); log = Logger.getLogger("davdroid.BaseConfigurationFinder");
log.setLevel(Level.FINEST); log.setLevel(Level.FINEST);
log.addHandler(logBuffer); log.addHandler(logBuffer);

4
app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java
View File

@ -24,7 +24,7 @@ import android.support.v7.app.AlertDialog;
import at.bitfire.davdroid.App; import at.bitfire.davdroid.App;
import at.bitfire.davdroid.R; import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.DebugInfoActivity; import at.bitfire.davdroid.ui.DebugInfoActivity;
import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration; import at.bitfire.davdroid.ui.setup.BaseConfigurationFinder.Configuration;
public class DetectConfigurationFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> { public class DetectConfigurationFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> {
protected static final String ARG_LOGIN_CREDENTIALS = "credentials"; protected static final String ARG_LOGIN_CREDENTIALS = "credentials";
@ -139,7 +139,7 @@ public class DetectConfigurationFragment extends DialogFragment implements Loade
@Override @Override
public Configuration loadInBackground() { public Configuration loadInBackground() {
return new DavResourceFinder(context, credentials).findInitialConfiguration(); return new BaseConfigurationFinder(context, credentials).findInitialConfiguration();
} }
} }
} }

6
app/src/main/java/at/bitfire/davdroid/ui/setup/EncryptionDetailsFragment.java
View File

@ -25,7 +25,7 @@ public class EncryptionDetailsFragment extends Fragment {
EditPassword editPassword = null; EditPassword editPassword = null;
public static EncryptionDetailsFragment newInstance(DavResourceFinder.Configuration config) { public static EncryptionDetailsFragment newInstance(BaseConfigurationFinder.Configuration config) {
EncryptionDetailsFragment frag = new EncryptionDetailsFragment(); EncryptionDetailsFragment frag = new EncryptionDetailsFragment();
Bundle args = new Bundle(1); Bundle args = new Bundle(1);
args.putSerializable(KEY_CONFIG, config); args.putSerializable(KEY_CONFIG, config);
@ -46,7 +46,7 @@ public class EncryptionDetailsFragment extends Fragment {
} }
}); });
final DavResourceFinder.Configuration config = (DavResourceFinder.Configuration)getArguments().getSerializable(KEY_CONFIG); final BaseConfigurationFinder.Configuration config = (BaseConfigurationFinder.Configuration)getArguments().getSerializable(KEY_CONFIG);
TextView accountName = (TextView)v.findViewById(R.id.account_name); TextView accountName = (TextView)v.findViewById(R.id.account_name);
accountName.setText(getString(R.string.login_encryption_account_label) + " " + config.userName); accountName.setText(getString(R.string.login_encryption_account_label) + " " + config.userName);
@ -68,7 +68,7 @@ public class EncryptionDetailsFragment extends Fragment {
return v; return v;
} }
private DavResourceFinder.Configuration validateEncryptionData(DavResourceFinder.Configuration config) { private BaseConfigurationFinder.Configuration validateEncryptionData(BaseConfigurationFinder.Configuration config) {
boolean valid = true; boolean valid = true;
String password = editPassword.getText().toString(); String password = editPassword.getText().toString();
if (password.isEmpty()) { if (password.isEmpty()) {

8
app/src/main/java/at/bitfire/davdroid/ui/setup/SetupEncryptionFragment.java
View File

@ -37,14 +37,14 @@ import at.bitfire.davdroid.journalmanager.Helpers;
import at.bitfire.davdroid.model.CollectionInfo; import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB; import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.resource.LocalTaskList; import at.bitfire.davdroid.resource.LocalTaskList;
import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration; import at.bitfire.davdroid.ui.setup.BaseConfigurationFinder.Configuration;
import at.bitfire.ical4android.TaskProvider; import at.bitfire.ical4android.TaskProvider;
import lombok.Cleanup; import lombok.Cleanup;
public class SetupEncryptionFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> { public class SetupEncryptionFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> {
private static final String KEY_CONFIG = "config"; private static final String KEY_CONFIG = "config";
public static SetupEncryptionFragment newInstance(DavResourceFinder.Configuration config) { public static SetupEncryptionFragment newInstance(BaseConfigurationFinder.Configuration config) {
SetupEncryptionFragment frag = new SetupEncryptionFragment(); SetupEncryptionFragment frag = new SetupEncryptionFragment();
Bundle args = new Bundle(1); Bundle args = new Bundle(1);
args.putSerializable(KEY_CONFIG, config); args.putSerializable(KEY_CONFIG, config);
@ -115,7 +115,7 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
} }
protected boolean createAccount(String accountName, DavResourceFinder.Configuration config) { protected boolean createAccount(String accountName, BaseConfigurationFinder.Configuration config) {
Account account = new Account(accountName, Constants.ACCOUNT_TYPE); Account account = new Account(accountName, Constants.ACCOUNT_TYPE);
// create Android account // create Android account
@ -167,7 +167,7 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
return true; return true;
} }
protected long insertService(SQLiteDatabase db, String accountName, String service, DavResourceFinder.Configuration.ServiceInfo info) { protected long insertService(SQLiteDatabase db, String accountName, String service, BaseConfigurationFinder.Configuration.ServiceInfo info) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
// insert service // insert service