diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc9668f8..bd38ae9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 019212f5..7f19cf11 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -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 diff --git a/app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java b/app/src/androidTest/java/com/etesync/syncadapter/SSLSocketFactoryCompatTest.java similarity index 98% rename from app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java rename to app/src/androidTest/java/com/etesync/syncadapter/SSLSocketFactoryCompatTest.java index d6c412cb..1f41665b 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java +++ b/app/src/androidTest/java/com/etesync/syncadapter/SSLSocketFactoryCompatTest.java @@ -6,7 +6,7 @@ * http://www.gnu.org/licenses/gpl.html */ -package at.bitfire.davdroid; +package com.etesync.syncadapter; import android.os.Build; diff --git a/app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java b/app/src/androidTest/java/com/etesync/syncadapter/model/CollectionInfoTest.java similarity index 94% rename from app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java rename to app/src/androidTest/java/com/etesync/syncadapter/model/CollectionInfoTest.java index 00d41faa..0edcaaa9 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java +++ b/app/src/androidTest/java/com/etesync/syncadapter/model/CollectionInfoTest.java @@ -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; diff --git a/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java b/app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java similarity index 97% rename from app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java rename to app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java index 60e740f2..afadcd79 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java +++ b/app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java @@ -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; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7f0422df..a0060ca5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ ~ which accompanies this distribution, and is available at ~ http://www.gnu.org/licenses/gpl.html --> - @@ -57,7 +57,7 @@ android:exported="false" android:process=":sync"> - + - + diff --git a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java b/app/src/main/java/com/etesync/syncadapter/AccountSettings.java similarity index 99% rename from app/src/main/java/at/bitfire/davdroid/AccountSettings.java rename to app/src/main/java/com/etesync/syncadapter/AccountSettings.java index 552b3e17..fba43edf 100644 --- a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java +++ b/app/src/main/java/com/etesync/syncadapter/AccountSettings.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java b/app/src/main/java/com/etesync/syncadapter/AccountUpdateService.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java rename to app/src/main/java/com/etesync/syncadapter/AccountUpdateService.java index a79c571f..95e94571 100644 --- a/app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java +++ b/app/src/main/java/com/etesync/syncadapter/AccountUpdateService.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java b/app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.java similarity index 97% rename from app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java rename to app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.java index e48ee36c..ad8684d2 100644 --- a/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java +++ b/app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/App.java b/app/src/main/java/com/etesync/syncadapter/App.java similarity index 95% rename from app/src/main/java/at/bitfire/davdroid/App.java rename to app/src/main/java/com/etesync/syncadapter/App.java index dd9a5f8e..f140efbd 100644 --- a/app/src/main/java/at/bitfire/davdroid/App.java +++ b/app/src/main/java/com/etesync/syncadapter/App.java @@ -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 diff --git a/app/src/main/java/at/bitfire/davdroid/Constants.java b/app/src/main/java/com/etesync/syncadapter/Constants.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/Constants.java rename to app/src/main/java/com/etesync/syncadapter/Constants.java index be1bbde6..cb477737 100644 --- a/app/src/main/java/at/bitfire/davdroid/Constants.java +++ b/app/src/main/java/com/etesync/syncadapter/Constants.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/GsonHelper.java b/app/src/main/java/com/etesync/syncadapter/GsonHelper.java similarity index 97% rename from app/src/main/java/at/bitfire/davdroid/GsonHelper.java rename to app/src/main/java/com/etesync/syncadapter/GsonHelper.java index 094652c3..d4e4124d 100644 --- a/app/src/main/java/at/bitfire/davdroid/GsonHelper.java +++ b/app/src/main/java/com/etesync/syncadapter/GsonHelper.java @@ -1,4 +1,4 @@ -package at.bitfire.davdroid; +package com.etesync.syncadapter; import android.util.Base64; diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.java b/app/src/main/java/com/etesync/syncadapter/HttpClient.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/HttpClient.java rename to app/src/main/java/com/etesync/syncadapter/HttpClient.java index 26c66405..236e6a35 100644 --- a/app/src/main/java/at/bitfire/davdroid/HttpClient.java +++ b/app/src/main/java/com/etesync/syncadapter/HttpClient.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/InvalidAccountException.java b/app/src/main/java/com/etesync/syncadapter/InvalidAccountException.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/InvalidAccountException.java rename to app/src/main/java/com/etesync/syncadapter/InvalidAccountException.java index ebc8531f..2e3d1e77 100644 --- a/app/src/main/java/at/bitfire/davdroid/InvalidAccountException.java +++ b/app/src/main/java/com/etesync/syncadapter/InvalidAccountException.java @@ -6,7 +6,7 @@ * http://www.gnu.org/licenses/gpl.html */ -package at.bitfire.davdroid; +package com.etesync.syncadapter; import android.accounts.Account; diff --git a/app/src/main/java/at/bitfire/davdroid/NotificationHelper.java b/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/NotificationHelper.java rename to app/src/main/java/com/etesync/syncadapter/NotificationHelper.java index ee07d2ca..736f1f5c 100644 --- a/app/src/main/java/at/bitfire/davdroid/NotificationHelper.java +++ b/app/src/main/java/com/etesync/syncadapter/NotificationHelper.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.java b/app/src/main/java/com/etesync/syncadapter/PackageChangedReceiver.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.java rename to app/src/main/java/com/etesync/syncadapter/PackageChangedReceiver.java index a6389a91..f0ffce08 100644 --- a/app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.java +++ b/app/src/main/java/com/etesync/syncadapter/PackageChangedReceiver.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java b/app/src/main/java/com/etesync/syncadapter/SSLSocketFactoryCompat.java similarity index 99% rename from app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java rename to app/src/main/java/com/etesync/syncadapter/SSLSocketFactoryCompat.java index 4dbd224f..95a56e0c 100644 --- a/app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java +++ b/app/src/main/java/com/etesync/syncadapter/SSLSocketFactoryCompat.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/BaseManager.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/BaseManager.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java index b2053b1d..85269db5 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/BaseManager.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java @@ -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"); diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/Exceptions.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/Exceptions.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.java index cf8429a8..9a14d563 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/Exceptions.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/Helpers.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/Helpers.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/Helpers.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/Helpers.java index e94c5b52..647f8cb3 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/Helpers.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/Helpers.java @@ -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 diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalAuthenticator.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalAuthenticator.java similarity index 91% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/JournalAuthenticator.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/JournalAuthenticator.java index cf31f970..81643cab 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalAuthenticator.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalAuthenticator.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalEntryManager.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalEntryManager.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/JournalEntryManager.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/JournalEntryManager.java index e346ceae..b6acf929 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalEntryManager.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalEntryManager.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalManager.java b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalManager.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/journalmanager/JournalManager.java rename to app/src/main/java/com/etesync/syncadapter/journalmanager/JournalManager.java index 5b1874ca..c4905356 100644 --- a/app/src/main/java/at/bitfire/davdroid/journalmanager/JournalManager.java +++ b/app/src/main/java/com/etesync/syncadapter/journalmanager/JournalManager.java @@ -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>() { diff --git a/app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.java b/app/src/main/java/com/etesync/syncadapter/log/LogcatHandler.java similarity index 97% rename from app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.java rename to app/src/main/java/com/etesync/syncadapter/log/LogcatHandler.java index 5e90e717..5f682a6c 100644 --- a/app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.java +++ b/app/src/main/java/com/etesync/syncadapter/log/LogcatHandler.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.java b/app/src/main/java/com/etesync/syncadapter/log/PlainTextFormatter.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.java rename to app/src/main/java/com/etesync/syncadapter/log/PlainTextFormatter.java index ea23a0ad..5b7def8a 100644 --- a/app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.java +++ b/app/src/main/java/com/etesync/syncadapter/log/PlainTextFormatter.java @@ -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.", ""); } diff --git a/app/src/main/java/at/bitfire/davdroid/log/StringHandler.java b/app/src/main/java/com/etesync/syncadapter/log/StringHandler.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/log/StringHandler.java rename to app/src/main/java/com/etesync/syncadapter/log/StringHandler.java index 96095311..839d599b 100644 --- a/app/src/main/java/at/bitfire/davdroid/log/StringHandler.java +++ b/app/src/main/java/com/etesync/syncadapter/log/StringHandler.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.java b/app/src/main/java/com/etesync/syncadapter/model/CollectionInfo.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.java rename to app/src/main/java/com/etesync/syncadapter/model/CollectionInfo.java index ae9b29fa..105c2065 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.java +++ b/app/src/main/java/com/etesync/syncadapter/model/CollectionInfo.java @@ -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 diff --git a/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java b/app/src/main/java/com/etesync/syncadapter/model/ServiceDB.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java rename to app/src/main/java/com/etesync/syncadapter/model/ServiceDB.java index 447f5cdd..56923a25 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java +++ b/app/src/main/java/com/etesync/syncadapter/model/ServiceDB.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/model/Settings.java b/app/src/main/java/com/etesync/syncadapter/model/Settings.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/model/Settings.java rename to app/src/main/java/com/etesync/syncadapter/model/Settings.java index 858a715e..637c8869 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/Settings.java +++ b/app/src/main/java/com/etesync/syncadapter/model/Settings.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.java b/app/src/main/java/com/etesync/syncadapter/model/UnknownProperties.java similarity index 82% rename from app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.java rename to app/src/main/java/com/etesync/syncadapter/model/UnknownProperties.java index 9c1fb060..f2ceb212 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.java +++ b/app/src/main/java/com/etesync/syncadapter/model/UnknownProperties.java @@ -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, diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.java index 1ea59cc8..2d02bab3 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.java index d645508d..4d91c1a5 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalCollection.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalCollection.java index 1a73e98c..0ac24d0f 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalCollection.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalContact.java index 353cb329..f9e3dc35 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.java index b2f52c98..0c230f2b 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.java similarity index 99% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.java index 7e0d8c8e..bf104516 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalResource.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalResource.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalResource.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalResource.java index 3989299c..cf033d67 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalResource.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalResource.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.java similarity index 99% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalTask.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalTask.java index 6c4d0ec3..0c28d9da 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTask.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java b/app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.java similarity index 98% rename from app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java rename to app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.java index 382505cd..c8d78ad1 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.java index 5190489e..180b69ad 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java similarity index 87% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java index 18d6a0c8..74c289ea 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.java similarity index 91% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.java index c087cf6b..77edac1d 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.java similarity index 87% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.java index e87da668..e8532170 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java index 32ba1a7c..182ac4bb 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.java index 23fa12c6..cea34946 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java similarity index 95% rename from app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java rename to app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java index 6320f62d..31132ce4 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java index 4906c3c1..6cd33770 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.java @@ -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( diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.java similarity index 97% rename from app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.java index 892f23e4..7b7c4506 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.java index ebf7882c..7a403687 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.java @@ -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, AdapterView.OnItemClickListener { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.java index 7b715736..c972ea37 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java similarity index 92% rename from app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java index cd3c69d3..5b1f4404 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java index 7269cf90..a0061f02 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java @@ -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")); } } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/CreateAddressBookActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/CreateAddressBookActivity.java similarity index 95% rename from app/src/main/java/at/bitfire/davdroid/ui/CreateAddressBookActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/CreateAddressBookActivity.java index 3aa6d26f..e7c80af2 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/CreateAddressBookActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/CreateAddressBookActivity.java @@ -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"; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/CreateCalendarActivity.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/CreateCalendarActivity.java index 03733665..45238c4e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/CreateCalendarActivity.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.java index 8034a087..14e473fa 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.java index aa8772f2..347eab1c 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.java @@ -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 { 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") diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.java index 3c7574db..fe5945a3 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.java index c42b5d67..d1bb05ac 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.java @@ -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 diff --git a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.java index 76294585..407b236e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java index 14f791bc..6ad9c74a 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/BaseConfigurationFinder.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java similarity index 89% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/BaseConfigurationFinder.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java index 38846b9b..33200efe 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/BaseConfigurationFinder.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.java @@ -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); diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.java similarity index 95% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.java index 6510c3a1..3b69d691 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.java @@ -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 { protected static final String ARG_LOGIN_CREDENTIALS = "credentials"; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/EncryptionDetailsFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java similarity index 95% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/EncryptionDetailsFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java index 3d76d79c..b043fd6f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/EncryptionDetailsFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java @@ -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 { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java index 48691790..c955b283 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginActivity.java @@ -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. diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java similarity index 93% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java index b504e8a1..ad15b1d5 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentials.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.java @@ -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 diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsChangeFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsChangeFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.java index 8c256163..0f5825d6 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsChangeFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.java @@ -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 { protected static final String ARG_LOGIN_CREDENTIALS = "credentials", diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java similarity index 94% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java index 7edd9f29..59ddf743 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginCredentialsFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/SetupEncryptionFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java similarity index 92% rename from app/src/main/java/at/bitfire/davdroid/ui/setup/SetupEncryptionFragment.java rename to app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java index 4f534156..784ef20e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/SetupEncryptionFragment.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java @@ -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; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/widget/EditPassword.java b/app/src/main/java/com/etesync/syncadapter/ui/widget/EditPassword.java similarity index 96% rename from app/src/main/java/at/bitfire/davdroid/ui/widget/EditPassword.java rename to app/src/main/java/com/etesync/syncadapter/ui/widget/EditPassword.java index cab44f7f..44c32bf8 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/widget/EditPassword.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/widget/EditPassword.java @@ -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"; diff --git a/app/src/main/java/at/bitfire/davdroid/ui/widget/MaximizedListView.java b/app/src/main/java/com/etesync/syncadapter/ui/widget/MaximizedListView.java similarity index 97% rename from app/src/main/java/at/bitfire/davdroid/ui/widget/MaximizedListView.java rename to app/src/main/java/com/etesync/syncadapter/ui/widget/MaximizedListView.java index f0203245..f73f07ff 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/widget/MaximizedListView.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/widget/MaximizedListView.java @@ -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; diff --git a/app/src/main/res/layout/accounts_content.xml b/app/src/main/res/layout/accounts_content.xml index f8e5c9b6..597ff1ba 100644 --- a/app/src/main/res/layout/accounts_content.xml +++ b/app/src/main/res/layout/accounts_content.xml @@ -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"> - - - - Show details - at.bitfire.davdroid.log + com.etesync.syncadapter.log Debug info EteSync permissions Additional permissions required diff --git a/app/src/main/res/xml/settings_app.xml b/app/src/main/res/xml/settings_app.xml index 7b344d7d..31cfd3c8 100644 --- a/app/src/main/res/xml/settings_app.xml +++ b/app/src/main/res/xml/settings_app.xml @@ -68,7 +68,7 @@ android:summary="@string/app_settings_show_debug_info_details"> + android:targetClass="com.etesync.syncadapter.ui.DebugInfoActivity"/> diff --git a/app/src/main/res/xml/sync_prefs.xml b/app/src/main/res/xml/sync_prefs.xml index 19f8fafb..05347df5 100644 --- a/app/src/main/res/xml/sync_prefs.xml +++ b/app/src/main/res/xml/sync_prefs.xml @@ -12,7 +12,7 @@ diff --git a/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java b/app/src/test/java/com/etesync/syncadapter/HttpClientTest.java similarity index 98% rename from app/src/test/java/at/bitfire/davdroid/HttpClientTest.java rename to app/src/test/java/com/etesync/syncadapter/HttpClientTest.java index 587fb7f0..1a5a363b 100644 --- a/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java +++ b/app/src/test/java/com/etesync/syncadapter/HttpClientTest.java @@ -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;