arno
/
etesync-android
mirror of https://github.com/etesync/android
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename the Android package to EteSync

Browse Source 
I was trying to avoid it, and keep it as davdroid both for attribution,
and making it easy to cherry-pick fixes from DAVdroid.
However, it seems to be causing clashes with the davdroid app, although
every piece of documentation claims otherwise.[1]

At least it seems like cherry-picks can still be achieved using:

git cherry-pick -s recursive -X find-renames=30 COMMIT

1. https://developer.android.com/studio/build/application-id.html
(one such doc)
pull/2/head
Tom Hacohen 7 years ago
parent 49ec35b137
commit abc15f01d8
78 changed files with 313 additions and 323 deletions
Show Stats Download Patch File Download Diff File

2
.gitlab-ci.yml
Unescape View File

@ -1,4 +1,4 @@
image: registry.gitlab.com/bitfireat/davdroid:latest
image: registry.gitlab.com/bitfireat/syncadapter:latest
before_script:
- git submodule update --init --recursive

2
app/proguard-rules.txt
Unescape View File

@ -35,7 +35,7 @@
-dontnote sun.security.ssl.SSLContextImpl
# DAVdroid + libs
-keep,includedescriptorclasses class at.bitfire.davdroid.** { *; } # all DAVdroid code and deps are required
-keep,includedescriptorclasses class syncadapter.** { *; } # all DAVdroid code and deps are required
# gson
-dontnote sun.misc.Unsafe # not available on Android

2
app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java → app/src/androidTest/java/com/etesync/syncadapter/SSLSocketFactoryCompatTest.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.os.Build;

4
app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java → app/src/androidTest/java/com/etesync/syncadapter/model/CollectionInfoTest.java
Unescape View File

@ -6,13 +6,13 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.model;
package com.etesync.syncadapter.model;
import android.content.ContentValues;
import org.junit.Test;
import at.bitfire.davdroid.model.ServiceDB.Collections;
import com.etesync.syncadapter.model.ServiceDB.Collections;
import okhttp3.mockwebserver.MockWebServer;
import static org.junit.Assert.assertEquals;

6
app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java → app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java
Unescape View File

@ -6,15 +6,15 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import org.junit.After;
import org.junit.Before;
import java.net.URI;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.HttpClient;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.HttpClient;
import okhttp3.OkHttpClient;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;

6
app/src/main/AndroidManifest.xml
Unescape View File

@ -6,7 +6,7 @@
~ which accompanies this distribution, and is available at
~ http://www.gnu.org/licenses/gpl.html
-->
<manifest package="at.bitfire.davdroid"
<manifest package="com.etesync.syncadapter"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="internalOnly">
@ -57,7 +57,7 @@
android:exported="false"
android:process=":sync">
<intent-filter>
<action android:name="at.bitfire.davdroid.REINIT_LOGGER"/>
<action android:name="com.etesync.syncadapter.REINIT_LOGGER"/>
</intent-filter>
</receiver>
<receiver
@ -65,7 +65,7 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REPLACED" />
<data android:scheme="package" android:path="at.bitfire.davdroid" />
<data android:scheme="package" android:path="com.etesync.syncadapter" />
</intent-filter>
</receiver>

2
app/src/main/java/at/bitfire/davdroid/AccountSettings.java → app/src/main/java/com/etesync/syncadapter/AccountSettings.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.Account;
import android.accounts.AccountManager;

6
app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java → app/src/main/java/com/etesync/syncadapter/AccountUpdateService.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -27,8 +27,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import at.bitfire.davdroid.model.ServiceDB.OpenHelper;
import at.bitfire.davdroid.model.ServiceDB.Services;
import com.etesync.syncadapter.model.ServiceDB.OpenHelper;
import com.etesync.syncadapter.model.ServiceDB.Services;
public class AccountUpdateService extends Service {

2
app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java → app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdateListener;

14
app/src/main/java/at/bitfire/davdroid/App.java → app/src/main/java/com/etesync/syncadapter/App.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.annotation.TargetApi;
import android.app.Application;
@ -36,10 +36,10 @@ import java.util.logging.Logger;
import javax.net.ssl.HostnameVerifier;
import at.bitfire.cert4android.CustomCertManager;
import at.bitfire.davdroid.log.LogcatHandler;
import at.bitfire.davdroid.log.PlainTextFormatter;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.Settings;
import com.etesync.syncadapter.log.LogcatHandler;
import com.etesync.syncadapter.log.PlainTextFormatter;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings;
import lombok.Cleanup;
import lombok.Getter;
import okhttp3.internal.tls.OkHostnameVerifier;
@ -66,9 +66,9 @@ public class App extends Application {
@Getter
private static HostnameVerifier hostnameVerifier;
public final static Logger log = Logger.getLogger("davdroid");
public final static Logger log = Logger.getLogger("syncadapter");
static {
at.bitfire.cert4android.Constants.log = Logger.getLogger("davdroid.cert4android");
at.bitfire.cert4android.Constants.log = Logger.getLogger("syncadapter.cert4android");
}
@Override

4
app/src/main/java/at/bitfire/davdroid/Constants.java → app/src/main/java/com/etesync/syncadapter/Constants.java
Unescape View File

@ -5,11 +5,11 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.net.Uri;
import static at.bitfire.davdroid.BuildConfig.DEBUG_REMOTE_URL;
import static com.etesync.syncadapter.BuildConfig.DEBUG_REMOTE_URL;
public class Constants {

2
app/src/main/java/at/bitfire/davdroid/GsonHelper.java → app/src/main/java/com/etesync/syncadapter/GsonHelper.java
Unescape View File

@ -1,4 +1,4 @@
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.util.Base64;

6
app/src/main/java/at/bitfire/davdroid/HttpClient.java → app/src/main/java/com/etesync/syncadapter/HttpClient.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.Account;
import android.content.Context;
@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.Settings;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;

2
app/src/main/java/at/bitfire/davdroid/InvalidAccountException.java → app/src/main/java/com/etesync/syncadapter/InvalidAccountException.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.Account;

8
app/src/main/java/at/bitfire/davdroid/NotificationHelper.java → app/src/main/java/com/etesync/syncadapter/NotificationHelper.java
Unescape View File

@ -1,4 +1,4 @@
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.app.PendingIntent;
import android.content.Context;
@ -10,9 +10,9 @@ import android.support.v7.app.NotificationCompat;
import java.util.logging.Level;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.ui.AccountSettingsActivity;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.ui.AccountSettingsActivity;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import at.bitfire.ical4android.CalendarStorageException;
import at.bitfire.vcard4android.ContactsStorageException;
import lombok.Getter;

8
app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.java → app/src/main/java/com/etesync/syncadapter/PackageChangedReceiver.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.accounts.Account;
import android.annotation.SuppressLint;
@ -19,9 +19,9 @@ import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.support.annotation.NonNull;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.ServiceDB.Services;
import at.bitfire.davdroid.resource.LocalTaskList;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.ServiceDB.Services;
import com.etesync.syncadapter.resource.LocalTaskList;
import at.bitfire.ical4android.TaskProvider;
import lombok.Cleanup;

2
app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java → app/src/main/java/com/etesync/syncadapter/SSLSocketFactoryCompat.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import android.os.Build;
import android.support.annotation.NonNull;

8
app/src/main/java/at/bitfire/davdroid/journalmanager/BaseManager.java → app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java
Unescape View File

@ -1,4 +1,4 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import org.apache.commons.codec.Charsets;
@ -7,8 +7,8 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.GsonHelper;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.GsonHelper;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@ -18,7 +18,7 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import static at.bitfire.davdroid.journalmanager.Helpers.hmac;
import static com.etesync.syncadapter.journalmanager.Helpers.hmac;
abstract class BaseManager {
final static protected MediaType JSON = MediaType.parse("application/json; charset=utf-8");

3
app/src/main/java/at/bitfire/davdroid/journalmanager/Exceptions.java → app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.java
Unescape View File

@ -1,8 +1,7 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import java.io.IOException;
import java.io.Serializable;
import java.net.HttpURLConnection;
import at.bitfire.cert4android.Constants;
import okhttp3.Headers;

6
app/src/main/java/at/bitfire/davdroid/journalmanager/Helpers.java → app/src/main/java/com/etesync/syncadapter/journalmanager/Helpers.java
Unescape View File

@ -1,4 +1,4 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import android.util.Base64;
@ -16,14 +16,12 @@ import org.spongycastle.crypto.paddings.PKCS7Padding;
import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
import org.spongycastle.crypto.params.KeyParameter;
import org.spongycastle.crypto.params.ParametersWithIV;
import org.spongycastle.jcajce.provider.digest.SHA256;
import org.spongycastle.util.encoders.Hex;
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.Arrays;
import at.bitfire.davdroid.App;
import com.etesync.syncadapter.App;
public class Helpers {
// FIXME: This should be somewhere else

6
app/src/main/java/at/bitfire/davdroid/journalmanager/JournalAuthenticator.java → app/src/main/java/com/etesync/syncadapter/journalmanager/JournalAuthenticator.java
Unescape View File

@ -1,11 +1,9 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.GsonHelper;
import com.etesync.syncadapter.GsonHelper;
import okhttp3.FormBody;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;

6
app/src/main/java/at/bitfire/davdroid/journalmanager/JournalEntryManager.java → app/src/main/java/com/etesync/syncadapter/journalmanager/JournalEntryManager.java
Unescape View File

@ -1,12 +1,12 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.List;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.GsonHelper;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.GsonHelper;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;

10
app/src/main/java/at/bitfire/davdroid/journalmanager/JournalManager.java → app/src/main/java/com/etesync/syncadapter/journalmanager/JournalManager.java
Unescape View File

@ -1,4 +1,4 @@
package at.bitfire.davdroid.journalmanager;
package com.etesync.syncadapter.journalmanager;
import com.google.gson.reflect.TypeToken;
@ -8,8 +8,8 @@ import java.lang.reflect.Type;
import java.util.List;
import java.util.UUID;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.GsonHelper;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.GsonHelper;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@ -17,8 +17,8 @@ import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
import static at.bitfire.davdroid.journalmanager.Helpers.sha256;
import static at.bitfire.davdroid.journalmanager.Helpers.toHex;
import static com.etesync.syncadapter.journalmanager.Helpers.sha256;
import static com.etesync.syncadapter.journalmanager.Helpers.toHex;
public class JournalManager extends BaseManager {
final static private Type journalType = new TypeToken<List<Journal>>() {

2
app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.java → app/src/main/java/com/etesync/syncadapter/log/LogcatHandler.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.log;
package com.etesync.syncadapter.log;
import android.util.Log;

4
app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.java → app/src/main/java/com/etesync/syncadapter/log/PlainTextFormatter.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.log;
package com.etesync.syncadapter.log;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
@ -57,7 +57,7 @@ public class PlainTextFormatter extends Formatter {
}
private String shortClassName(String className) {
String s = StringUtils.replace(className, "at.bitfire.davdroid.", "");
String s = StringUtils.replace(className, "com.etesync.syncadapter.", "");
return StringUtils.replace(s, "at.bitfire.", "");
}

2
app/src/main/java/at/bitfire/davdroid/log/StringHandler.java → app/src/main/java/com/etesync/syncadapter/log/StringHandler.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.log;
package com.etesync.syncadapter.log;
import java.util.logging.Handler;
import java.util.logging.LogRecord;

6
app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.java → app/src/main/java/com/etesync/syncadapter/model/CollectionInfo.java
Unescape View File

@ -6,14 +6,14 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.model;
package com.etesync.syncadapter.model;
import android.content.ContentValues;
import java.io.Serializable;
import at.bitfire.davdroid.GsonHelper;
import at.bitfire.davdroid.model.ServiceDB.Collections;
import com.etesync.syncadapter.GsonHelper;
import com.etesync.syncadapter.model.ServiceDB.Collections;
import lombok.ToString;
@ToString

6
app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java → app/src/main/java/com/etesync/syncadapter/model/ServiceDB.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.model;
package com.etesync.syncadapter.model;
import android.accounts.Account;
import android.content.ContentValues;
@ -20,8 +20,8 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import lombok.Cleanup;
public class ServiceDB {

2
app/src/main/java/at/bitfire/davdroid/model/Settings.java → app/src/main/java/com/etesync/syncadapter/model/Settings.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.model;
package com.etesync.syncadapter.model;
import android.content.ContentValues;
import android.database.Cursor;

4
app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.java → app/src/main/java/com/etesync/syncadapter/model/UnknownProperties.java
Unescape View File

@ -6,13 +6,13 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.model;
package com.etesync.syncadapter.model;
import android.provider.ContactsContract.RawContacts;
public class UnknownProperties {
public static final String CONTENT_ITEM_TYPE = "x.davdroid/unknown-properties";
public static final String CONTENT_ITEM_TYPE = "x.syncadapter/unknown-properties";
public static final String
MIMETYPE = RawContacts.Data.MIMETYPE,

7
app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java → app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.accounts.Account;
import android.content.ContentProviderClient;
@ -18,7 +18,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.RemoteException;
import android.provider.CalendarContract;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Groups;
import android.provider.ContactsContract.RawContacts;
@ -30,8 +29,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import at.bitfire.ical4android.CalendarStorageException;
import com.etesync.syncadapter.App;
import at.bitfire.vcard4android.AndroidAddressBook;
import at.bitfire.vcard4android.AndroidContact;
import at.bitfire.vcard4android.AndroidGroup;

6
app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java → app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.accounts.Account;
import android.content.ContentProviderClient;
@ -31,8 +31,8 @@ import java.io.FileNotFoundException;
import java.util.LinkedList;
import java.util.List;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.model.CollectionInfo;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.model.CollectionInfo;
import at.bitfire.ical4android.AndroidCalendar;
import at.bitfire.ical4android.AndroidCalendarFactory;
import at.bitfire.ical4android.BatchOperation;

2
app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java → app/src/main/java/com/etesync/syncadapter/resource/LocalCollection.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import java.io.FileNotFoundException;

6
app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java → app/src/main/java/com/etesync/syncadapter/resource/LocalContact.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.content.ContentProviderOperation;
import android.content.ContentValues;
@ -27,8 +27,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.model.UnknownProperties;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.model.UnknownProperties;
import at.bitfire.vcard4android.AndroidAddressBook;
import at.bitfire.vcard4android.AndroidContact;
import at.bitfire.vcard4android.AndroidContactFactory;

4
app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java → app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.annotation.TargetApi;
import android.content.ContentProviderOperation;
@ -22,7 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import com.etesync.syncadapter.App;
import at.bitfire.ical4android.AndroidCalendar;
import at.bitfire.ical4android.AndroidEvent;
import at.bitfire.ical4android.AndroidEventFactory;

4
app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.java → app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.content.ContentProviderOperation;
import android.content.ContentUris;
@ -28,7 +28,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import com.etesync.syncadapter.App;
import at.bitfire.vcard4android.AndroidAddressBook;
import at.bitfire.vcard4android.AndroidGroup;
import at.bitfire.vcard4android.AndroidGroupFactory;

2
app/src/main/java/at/bitfire/davdroid/resource/LocalResource.java → app/src/main/java/com/etesync/syncadapter/resource/LocalResource.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import java.io.IOException;

2
app/src/main/java/at/bitfire/davdroid/resource/LocalTask.java → app/src/main/java/com/etesync/syncadapter/resource/LocalTask.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.content.ContentProviderOperation;
import android.content.ContentValues;

5
app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java → app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.resource;
package com.etesync.syncadapter.resource;
import android.accounts.Account;
import android.content.ContentProviderClient;
@ -17,7 +17,6 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.RemoteException;
import android.provider.CalendarContract;
import android.support.annotation.NonNull;
import org.dmfs.provider.tasks.TaskContract.TaskLists;
@ -25,7 +24,7 @@ import org.dmfs.provider.tasks.TaskContract.Tasks;
import java.io.FileNotFoundException;
import at.bitfire.davdroid.model.CollectionInfo;
import com.etesync.syncadapter.model.CollectionInfo;
import at.bitfire.ical4android.AndroidTaskList;
import at.bitfire.ical4android.AndroidTaskListFactory;
import at.bitfire.ical4android.CalendarStorageException;

4
app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java → app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.AbstractAccountAuthenticator;
import android.accounts.Account;
@ -18,7 +18,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.IBinder;
import at.bitfire.davdroid.ui.setup.LoginActivity;
import com.etesync.syncadapter.ui.setup.LoginActivity;
public class AccountAuthenticatorService extends Service {

23
app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java → app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.content.Context;
@ -19,17 +19,16 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalEntryManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.resource.LocalCalendar;
import at.bitfire.davdroid.resource.LocalEvent;
import at.bitfire.davdroid.resource.LocalResource;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.JournalEntryManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.resource.LocalCalendar;
import com.etesync.syncadapter.resource.LocalEvent;
import com.etesync.syncadapter.resource.LocalResource;
import at.bitfire.ical4android.CalendarStorageException;
import at.bitfire.ical4android.Event;
import at.bitfire.ical4android.InvalidCalendarException;

28
app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java → app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.content.AbstractThreadedSyncAdapter;
@ -27,23 +27,23 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.NotificationHelper;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.ServiceDB.Collections;
import at.bitfire.davdroid.model.ServiceDB.Services;
import at.bitfire.davdroid.resource.LocalCalendar;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.NotificationHelper;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.ServiceDB.Collections;
import com.etesync.syncadapter.model.ServiceDB.Services;
import com.etesync.syncadapter.resource.LocalCalendar;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import at.bitfire.ical4android.CalendarStorageException;
import lombok.Cleanup;
import okhttp3.HttpUrl;
import static at.bitfire.davdroid.Constants.KEY_ACCOUNT;
import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
public class CalendarsSyncAdapterService extends SyncAdapterService {

26
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java → app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.content.AbstractThreadedSyncAdapter;
@ -24,21 +24,21 @@ import android.support.annotation.Nullable;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.NotificationHelper;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.ServiceDB.Collections;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.NotificationHelper;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.ServiceDB.Collections;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import lombok.Cleanup;
import okhttp3.HttpUrl;
import static at.bitfire.davdroid.Constants.KEY_ACCOUNT;
import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
public class ContactsSyncAdapterService extends SyncAdapterService {

26
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java → app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.content.ContentProviderClient;
@ -26,18 +26,18 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.JournalEntryManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.resource.LocalAddressBook;
import at.bitfire.davdroid.resource.LocalContact;
import at.bitfire.davdroid.resource.LocalGroup;
import at.bitfire.davdroid.resource.LocalResource;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.JournalEntryManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.resource.LocalAddressBook;
import com.etesync.syncadapter.resource.LocalContact;
import com.etesync.syncadapter.resource.LocalGroup;
import com.etesync.syncadapter.resource.LocalResource;
import at.bitfire.ical4android.CalendarStorageException;
import at.bitfire.vcard4android.Contact;
import at.bitfire.vcard4android.ContactsStorageException;

24
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.java → app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.app.Notification;
@ -38,17 +38,17 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.ui.PermissionsActivity;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.JournalManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.ui.PermissionsActivity;
import lombok.Cleanup;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;

32
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java → app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.syncadapter;
package com.etesync.syncadapter.syncadapter;
import android.accounts.Account;
import android.annotation.TargetApi;
@ -24,27 +24,27 @@ import java.util.List;
import java.util.UUID;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.GsonHelper;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.NotificationHelper;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalEntryManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.resource.LocalCollection;
import at.bitfire.davdroid.resource.LocalResource;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.GsonHelper;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.NotificationHelper;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.JournalEntryManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.resource.LocalCollection;
import com.etesync.syncadapter.resource.LocalResource;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import at.bitfire.ical4android.CalendarStorageException;
import at.bitfire.ical4android.InvalidCalendarException;
import at.bitfire.vcard4android.ContactsStorageException;
import lombok.Getter;
import okhttp3.OkHttpClient;
import static at.bitfire.davdroid.Constants.KEY_ACCOUNT;
import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
abstract public class SyncManager {
protected final NotificationHelper notificationManager;

12
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java → app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.annotation.SuppressLint;
import android.content.Context;
@ -37,10 +37,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.logging.Level;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.BuildConfig;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.BuildConfig;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import ezvcard.Ezvcard;
import lombok.Cleanup;
import lombok.RequiredArgsConstructor;
@ -76,7 +76,7 @@ public class AboutActivity extends AppCompatActivity {
DateFormatUtils.format(BuildConfig.buildTime, "yyyy") + " Tom Hacohen",
R.string.about_license_info_no_warranty, "gpl-3.0-standalone.html"
), new ComponentInfo(
"DAVdroid", "(forked from)", "https://davdroid.bitfire.at",
"DAVdroid", "(forked from)", "https://syncadapter.bitfire.at",
"Ricki Hirner, Bernhard Stockmann (bitfire web engineering)",
R.string.about_license_info_no_warranty, "gpl-3.0-standalone.html"
), new ComponentInfo(

20
app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java → app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -60,15 +60,15 @@ import java.util.List;
import java.util.logging.Level;
import at.bitfire.cert4android.CustomCertManager;
import at.bitfire.davdroid.AccountUpdateService;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB.Collections;
import at.bitfire.davdroid.model.ServiceDB.OpenHelper;
import at.bitfire.davdroid.model.ServiceDB.Services;
import at.bitfire.davdroid.resource.LocalCalendar;
import com.etesync.syncadapter.AccountUpdateService;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB.Collections;
import com.etesync.syncadapter.model.ServiceDB.OpenHelper;
import com.etesync.syncadapter.model.ServiceDB.Services;
import com.etesync.syncadapter.resource.LocalCalendar;
import at.bitfire.ical4android.TaskProvider;
import lombok.Cleanup;

8
app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java → app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -28,9 +28,9 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import at.bitfire.davdroid.AccountsChangedReceiver;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import com.etesync.syncadapter.AccountsChangedReceiver;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
public class AccountListFragment extends ListFragment implements LoaderManager.LoaderCallbacks<Account[]>, AdapterView.OnItemClickListener {

14
app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java → app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.content.ContentResolver;
@ -29,13 +29,13 @@ import android.support.v7.preference.SwitchPreferenceCompat;
import android.text.TextUtils;
import android.view.MenuItem;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.setup.LoginCredentials;
import at.bitfire.davdroid.ui.setup.LoginCredentialsChangeFragment;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.setup.LoginCredentials;
import com.etesync.syncadapter.ui.setup.LoginCredentialsChangeFragment;
import static at.bitfire.davdroid.Constants.KEY_ACCOUNT;
import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
public class AccountSettingsActivity extends AppCompatActivity {
private Account account;

14
app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java → app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java
Unescape View File

@ -6,14 +6,12 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.NavigationView;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
@ -24,12 +22,12 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.setup.LoginActivity;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.setup.LoginActivity;
import static at.bitfire.davdroid.BuildConfig.DEBUG;
import static at.bitfire.davdroid.Constants.serviceUrl;
import static com.etesync.syncadapter.BuildConfig.DEBUG;
import static com.etesync.syncadapter.Constants.serviceUrl;
public class AccountsActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {

12
app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java → app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.content.Intent;
import android.os.Bundle;
@ -20,10 +20,10 @@ import android.support.v7.preference.SwitchPreferenceCompat;
import java.net.URI;
import java.net.URISyntaxException;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.Settings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings;
public class AppSettingsActivity extends AppCompatActivity {
@ -175,7 +175,7 @@ public class AppSettingsActivity extends AppCompatActivity {
app.reinitLogger();
// reinitialize logger of :sync process
getContext().sendBroadcast(new Intent("at.bitfire.davdroid.REINIT_LOGGER"));
getContext().sendBroadcast(new Intent("com.etesync.syncadapter.REINIT_LOGGER"));
}
}

6
app/src/main/java/at/bitfire/davdroid/ui/CreateAddressBookActivity.java → app/src/main/java/com/etesync/syncadapter/ui/CreateAddressBookActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.content.Intent;
@ -20,8 +20,8 @@ import android.widget.EditText;
import org.apache.commons.lang3.StringUtils;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.CollectionInfo;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.CollectionInfo;
public class CreateAddressBookActivity extends AppCompatActivity {
public static final String EXTRA_ACCOUNT = "account";

6
app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java → app/src/main/java/com/etesync/syncadapter/ui/CreateCalendarActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.content.Intent;
@ -22,8 +22,8 @@ import android.widget.EditText;
import org.apache.commons.lang3.StringUtils;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.CollectionInfo;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.CollectionInfo;
import yuku.ambilwarna.AmbilWarnaDialog;
public class CreateCalendarActivity extends AppCompatActivity {

18
app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.java → app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.app.Activity;
@ -26,14 +26,14 @@ import android.support.v4.app.LoaderManager;
import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.JournalManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import lombok.Cleanup;
import okhttp3.HttpUrl;

22
app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java → app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -38,17 +38,17 @@ import java.io.IOException;
import java.util.Date;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.BuildConfig;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions.HttpException;
import at.bitfire.davdroid.model.ServiceDB;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.BuildConfig;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions.HttpException;
import com.etesync.syncadapter.model.ServiceDB;
import lombok.Cleanup;
import static at.bitfire.davdroid.Constants.KEY_ACCOUNT;
import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
public class DebugInfoActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<String> {
public static final String
@ -203,7 +203,7 @@ public class DebugInfoActivity extends AppCompatActivity implements LoaderManage
installedFrom = "APK (directly)";
boolean workaroundInstalled = false;
try {
workaroundInstalled = pm.getPackageInfo("at.bitfire.davdroid.jbworkaround", 0) != null;
workaroundInstalled = pm.getPackageInfo("com.etesync.syncadapter.jbworkaround", 0) != null;
} catch(PackageManager.NameNotFoundException ignored) {}
report.append("\nSOFTWARE INFORMATION\n" +
"EteSync version: ").append(BuildConfig.VERSION_NAME).append(" (").append(BuildConfig.VERSION_CODE).append(") ").append(new Date(BuildConfig.buildTime)).append("\n")

18
app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.java → app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.app.Activity;
@ -24,14 +24,14 @@ import android.support.v4.content.Loader;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalManager;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.JournalManager;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import okhttp3.HttpUrl;
public class DeleteCollectionFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Exception> {

8
app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.java → app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.accounts.Account;
import android.app.Dialog;
@ -19,9 +19,9 @@ import android.support.v7.app.AlertDialog;
import java.io.IOException;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Exceptions.HttpException;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Exceptions.HttpException;
public class ExceptionInfoFragment extends DialogFragment {
protected static final String

8
app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java → app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.Manifest;
import android.app.Activity;
@ -19,9 +19,9 @@ import android.support.v4.app.NotificationManagerCompat;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.resource.LocalTaskList;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.resource.LocalTaskList;
public class PermissionsActivity extends AppCompatActivity {
final static private int REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS = 124;

12
app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java → app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui;
package com.etesync.syncadapter.ui;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
@ -26,11 +26,11 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import at.bitfire.davdroid.BuildConfig;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.model.Settings;
import com.etesync.syncadapter.BuildConfig;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings;
import lombok.Cleanup;
public class StartupDialogFragment extends DialogFragment {

14
app/src/main/java/at/bitfire/davdroid/ui/setup/BaseConfigurationFinder.java → app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java
Unescape View File

@ -5,7 +5,7 @@
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.content.Context;
import android.support.annotation.NonNull;
@ -18,11 +18,11 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import at.bitfire.davdroid.HttpClient;
import at.bitfire.davdroid.journalmanager.Exceptions;
import at.bitfire.davdroid.journalmanager.JournalAuthenticator;
import at.bitfire.davdroid.log.StringHandler;
import at.bitfire.davdroid.model.CollectionInfo;
import com.etesync.syncadapter.HttpClient;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.journalmanager.JournalAuthenticator;
import com.etesync.syncadapter.log.StringHandler;
import com.etesync.syncadapter.model.CollectionInfo;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
@ -41,7 +41,7 @@ public class BaseConfigurationFinder {
this.context = context;
this.credentials = credentials;
log = Logger.getLogger("davdroid.BaseConfigurationFinder");
log = Logger.getLogger("syncadapter.BaseConfigurationFinder");
log.setLevel(Level.FINEST);
log.addHandler(logBuffer);

10
app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java → app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.app.Dialog;
import android.app.ProgressDialog;
@ -21,10 +21,10 @@ import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
import android.support.v7.app.AlertDialog;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import at.bitfire.davdroid.ui.setup.BaseConfigurationFinder.Configuration;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration;
public class DetectConfigurationFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> {
protected static final String ARG_LOGIN_CREDENTIALS = "credentials";

6
app/src/main/java/at/bitfire/davdroid/ui/setup/EncryptionDetailsFragment.java → app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@ -16,8 +16,8 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.widget.EditPassword;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.widget.EditPassword;
public class EncryptionDetailsFragment extends Fragment {

8
app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java → app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.content.Intent;
import android.os.Bundle;
@ -14,9 +14,9 @@ import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
/**
* Activity to initially connect to a server and create an account.

6
app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java → app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.os.Parcel;
import android.os.Parcelable;
@ -14,8 +14,8 @@ import android.os.Parcelable;
import java.net.URI;
import java.net.URISyntaxException;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor

14
app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsChangeFragment.java → app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.accounts.Account;
import android.app.Dialog;
@ -24,12 +24,12 @@ import android.support.v7.app.AlertDialog;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.DebugInfoActivity;
import at.bitfire.davdroid.ui.setup.BaseConfigurationFinder.Configuration;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration;
public class LoginCredentialsChangeFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Configuration> {
protected static final String ARG_LOGIN_CREDENTIALS = "credentials",

8
app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java → app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.app.Activity;
import android.content.Intent;
@ -19,9 +19,9 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.ui.widget.EditPassword;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.widget.EditPassword;
public class LoginCredentialsFragment extends Fragment {
EditText editUserName;

22
app/src/main/java/at/bitfire/davdroid/ui/setup/SetupEncryptionFragment.java → app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.setup;
package com.etesync.syncadapter.ui.setup;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -28,16 +28,16 @@ import android.support.v4.content.Loader;
import java.util.logging.Level;
import at.bitfire.davdroid.AccountSettings;
import at.bitfire.davdroid.App;
import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.InvalidAccountException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.journalmanager.Helpers;
import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.davdroid.model.ServiceDB;
import at.bitfire.davdroid.resource.LocalTaskList;
import at.bitfire.davdroid.ui.setup.BaseConfigurationFinder.Configuration;
import com.etesync.syncadapter.AccountSettings;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Helpers;
import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.resource.LocalTaskList;
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration;
import at.bitfire.ical4android.TaskProvider;
import lombok.Cleanup;

4
app/src/main/java/at/bitfire/davdroid/ui/widget/EditPassword.java → app/src/main/java/com/etesync/syncadapter/ui/widget/EditPassword.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.widget;
package com.etesync.syncadapter.ui.widget;
import android.content.Context;
import android.text.Editable;
@ -17,7 +17,7 @@ import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import at.bitfire.davdroid.R;
import com.etesync.syncadapter.R;
public class EditPassword extends LinearLayout {
private static final String NS_ANDROID = "http://schemas.android.com/apk/res/android";

2
app/src/main/java/at/bitfire/davdroid/ui/widget/MaximizedListView.java → app/src/main/java/com/etesync/syncadapter/ui/widget/MaximizedListView.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid.ui.widget;
package com.etesync.syncadapter.ui.widget;
import android.content.Context;
import android.util.AttributeSet;

4
app/src/main/res/layout/accounts_content.xml
Unescape View File

@ -13,7 +13,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="at.bitfire.davdroid.ui.AccountsActivity">
tools:context="com.etesync.syncadapter.ui.AccountsActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
@ -29,7 +29,7 @@
</android.support.design.widget.AppBarLayout>
<fragment
class="at.bitfire.davdroid.ui.AccountListFragment"
class="com.etesync.syncadapter.ui.AccountListFragment"
android:id="@+id/account_list"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
app/src/main/res/layout/activity_account.xml
Unescape View File

@ -50,7 +50,7 @@
android:visibility="gone"
android:indeterminate="true"/>
<at.bitfire.davdroid.ui.widget.MaximizedListView
<com.etesync.syncadapter.ui.widget.MaximizedListView
android:id="@+id/address_books"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -90,7 +90,7 @@
android:visibility="gone"
android:indeterminate="true"/>
<at.bitfire.davdroid.ui.widget.MaximizedListView
<com.etesync.syncadapter.ui.widget.MaximizedListView
android:id="@+id/calendars"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/login_credentials_fragment.xml
Unescape View File

@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:hint="@string/login_user_name"
android:inputType="textEmailAddress"/>
<at.bitfire.davdroid.ui.widget.EditPassword
<com.etesync.syncadapter.ui.widget.EditPassword
android:id="@+id/url_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/login_encryption_details.xml
Unescape View File

@ -35,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<at.bitfire.davdroid.ui.widget.EditPassword
<com.etesync.syncadapter.ui.widget.EditPassword
android:id="@+id/encryption_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/values/strings.xml
Unescape View File

@ -257,7 +257,7 @@
<string name="exception_show_details">Show details</string>
<!-- sync errors and DebugInfoActivity -->
<string name="authority_log_provider">at.bitfire.davdroid.log</string>
<string name="authority_log_provider">com.etesync.syncadapter.log</string>
<string name="debug_info_title">Debug info</string>
<string name="sync_error_permissions">EteSync permissions</string>
<string name="sync_error_permissions_text">Additional permissions required</string>

2
app/src/main/res/xml/settings_app.xml
Unescape View File

@ -68,7 +68,7 @@
android:summary="@string/app_settings_show_debug_info_details">
<intent
android:targetPackage="com.etesync.syncadapter"
android:targetClass="at.bitfire.davdroid.ui.DebugInfoActivity"/>
android:targetClass="com.etesync.syncadapter.ui.DebugInfoActivity"/>
</Preference>
</PreferenceCategory>

2
app/src/main/res/xml/sync_prefs.xml
Unescape View File

@ -12,7 +12,7 @@
<PreferenceScreen android:title="@string/manage_accounts">
<intent
android:targetPackage="com.etesync.syncadapter"
android:targetClass="at.bitfire.davdroid.ui.AccountsActivity"
android:targetClass="com.etesync.syncadapter.ui.AccountsActivity"
android:action="ACTION_VIEW" />
</PreferenceScreen>

2
app/src/test/java/at/bitfire/davdroid/HttpClientTest.java → app/src/test/java/com/etesync/syncadapter/HttpClientTest.java
Unescape View File

@ -6,7 +6,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
package at.bitfire.davdroid;
package com.etesync.syncadapter;
import org.junit.After;
import org.junit.Before;
Write Preview
Loading…
Cancel
Save