arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-04-23 02:29:16 +00:00
Code Issues Releases Wiki Activity

Optimise imports.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-09 14:55:50 +00:00
parent e39e882c0a
commit 723790178c
43 changed files with 109 additions and 377 deletions

5
app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java
View File

@ -8,13 +8,14 @@
package com.etesync.syncadapter.ui.setup;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.HttpClient;
import org.junit.After;
import org.junit.Before;
import java.net.URI;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.HttpClient;
import okhttp3.OkHttpClient;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;

12
app/src/main/java/com/etesync/syncadapter/AccountUpdateService.kt
View File

@ -8,27 +8,19 @@
package com.etesync.syncadapter
import android.accounts.Account
import android.accounts.AccountManager
import android.annotation.SuppressLint
import android.app.Service
import android.content.Intent
import android.database.DatabaseUtils
import android.os.Binder
import android.os.IBinder
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.resource.LocalAddressBook
import java.lang.ref.WeakReference
import java.util.HashSet
import java.util.LinkedList
import java.util.*
import java.util.logging.Level
import at.bitfire.vcard4android.ContactsStorageException
import io.requery.Persistable
import io.requery.sql.EntityDataStore
class AccountUpdateService : Service() {
private val binder = InfoBinder()

3
app/src/main/java/com/etesync/syncadapter/AccountsChangedReceiver.kt
View File

@ -13,8 +13,7 @@ import android.accounts.OnAccountsUpdateListener
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import java.util.LinkedList
import java.util.*
class AccountsChangedReceiver : BroadcastReceiver() {

2
app/src/main/java/com/etesync/syncadapter/AcraConfiguration.java
View File

@ -1,11 +1,9 @@
package com.etesync.syncadapter;
import android.app.Application;
import android.content.Context;
import android.content.pm.PackageManager;
import android.widget.Toast;
import org.acra.annotation.AcraCore;
import org.acra.config.CoreConfigurationBuilder;
import org.acra.config.MailSenderConfigurationBuilder;
import org.acra.config.ToastConfigurationBuilder;

51
app/src/main/java/com/etesync/syncadapter/App.kt
View File

@ -8,7 +8,6 @@
package com.etesync.syncadapter
import android.accounts.Account
import android.accounts.AccountManager
import android.annotation.SuppressLint
import android.annotation.TargetApi
@ -17,14 +16,10 @@ import android.content.BroadcastReceiver
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.database.Cursor
import android.database.DatabaseUtils
import android.database.sqlite.SQLiteDatabase
import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Process
import android.os.StrictMode
@ -34,50 +29,32 @@ import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import android.support.v4.content.ContextCompat
import android.util.Log
import android.widget.Toast
import at.bitfire.cert4android.CustomCertManager
import at.bitfire.ical4android.AndroidCalendar
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.log.LogcatHandler
import com.etesync.syncadapter.log.PlainTextFormatter
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.Models
import com.etesync.syncadapter.model.ServiceDB
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.model.Settings
import com.etesync.syncadapter.model.*
import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.ui.AccountsActivity
import com.etesync.syncadapter.utils.HintManager
import com.etesync.syncadapter.utils.LanguageUtils
import org.acra.ACRA
import org.acra.annotation.AcraCore
import org.acra.annotation.AcraMailSender
import org.acra.annotation.AcraToast
import org.apache.commons.lang3.time.DateFormatUtils
import java.io.File
import java.io.IOException
import java.util.LinkedList
import java.util.Locale
import java.util.logging.FileHandler
import java.util.logging.Handler
import java.util.logging.Level
import java.util.logging.Logger
import javax.net.ssl.HostnameVerifier
import at.bitfire.cert4android.CustomCertManager
import at.bitfire.ical4android.AndroidCalendar
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.ContactsStorageException
import io.requery.Persistable
import io.requery.android.sqlite.DatabaseSource
import io.requery.meta.EntityModel
import io.requery.sql.Configuration
import io.requery.sql.EntityDataStore
import okhttp3.internal.tls.OkHostnameVerifier
import org.acra.config.CoreConfigurationBuilder
import org.acra.ACRA
import org.apache.commons.lang3.time.DateFormatUtils
import java.io.File
import java.io.IOException
import java.util.*
import java.util.logging.FileHandler
import java.util.logging.Level
import java.util.logging.Logger
import javax.net.ssl.HostnameVerifier
class App : Application() {

16
app/src/main/java/com/etesync/syncadapter/HttpClient.kt
View File

@ -9,29 +9,23 @@
package com.etesync.syncadapter
import android.content.Context
import android.database.sqlite.SQLiteOpenHelper
import android.os.Build
import com.etesync.syncadapter.model.ServiceDB
import com.etesync.syncadapter.model.Settings
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.Response
import okhttp3.logging.HttpLoggingInterceptor
import java.io.IOException
import java.net.InetSocketAddress
import java.net.Proxy
import java.net.URI
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import java.util.*
import java.util.concurrent.TimeUnit
import java.util.logging.Level
import java.util.logging.Logger
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okhttp3.logging.HttpLoggingInterceptor
object HttpClient {
private val client = OkHttpClient()
private val userAgentInterceptor = UserAgentInterceptor()

7
app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt
View File

@ -12,17 +12,14 @@ import android.os.Build
import android.os.Bundle
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.ui.AccountSettingsActivity
import com.etesync.syncadapter.ui.DebugInfoActivity
import com.etesync.syncadapter.ui.WebViewActivity
import java.util.logging.Level
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.ContactsStorageException
class NotificationHelper(internal val context: Context, internal val notificationTag: String, internal val notificationId: Int) {
internal val notificationManager: NotificationManagerCompat

1
app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.kt
View File

@ -3,7 +3,6 @@ package com.etesync.syncadapter.journalmanager
import com.etesync.syncadapter.App
import com.etesync.syncadapter.journalmanager.util.ByteUtil
import com.etesync.syncadapter.utils.Base64
import org.apache.commons.codec.Charsets
import org.apache.commons.lang3.ArrayUtils
import org.spongycastle.crypto.AsymmetricBlockCipher
import org.spongycastle.crypto.BufferedBlockCipher

5
app/src/main/java/com/etesync/syncadapter/model/CollectionInfo.kt
View File

@ -9,17 +9,14 @@
package com.etesync.syncadapter.model
import android.content.ContentValues
import com.etesync.syncadapter.journalmanager.Constants
import com.etesync.syncadapter.journalmanager.JournalManager
import com.etesync.syncadapter.model.ServiceDB.Collections
import com.google.gson.GsonBuilder
import com.google.gson.annotations.Expose
import java.io.Serializable
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import java.io.Serializable
class CollectionInfo : Serializable {
@Deprecated("")

1
app/src/main/java/com/etesync/syncadapter/model/JournalModel.java
View File

@ -1,6 +1,5 @@
package com.etesync.syncadapter.model;
import java.util.LinkedList;
import java.util.List;
import io.requery.Column;

28
app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
View File

@ -9,17 +9,8 @@ package com.etesync.syncadapter.resource
import android.accounts.Account
import android.accounts.AccountManager
import android.accounts.AccountManagerCallback
import android.accounts.AccountManagerFuture
import android.accounts.AuthenticatorException
import android.annotation.TargetApi
import android.content.ContentProviderClient
import android.content.ContentResolver
import android.content.ContentUris
import android.content.ContentValues
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.content.*
import android.os.Build
import android.os.Bundle
import android.os.RemoteException
@ -27,26 +18,13 @@ import android.provider.ContactsContract
import android.provider.ContactsContract.CommonDataKinds.GroupMembership
import android.provider.ContactsContract.Groups
import android.provider.ContactsContract.RawContacts
import android.support.v4.os.OperationCanceledException
import at.bitfire.vcard4android.*
import com.etesync.syncadapter.App
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.utils.AndroidCompat
import java.io.FileNotFoundException
import java.io.IOException
import java.util.Collections
import java.util.HashSet
import java.util.LinkedList
import java.util.*
import java.util.logging.Level
import at.bitfire.vcard4android.AndroidAddressBook
import at.bitfire.vcard4android.AndroidContact
import at.bitfire.vcard4android.AndroidGroup
import at.bitfire.vcard4android.CachedGroupMembership
import at.bitfire.vcard4android.ContactsStorageException
class LocalAddressBook(
private val context: Context,

1
app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt
View File

@ -21,7 +21,6 @@ import at.bitfire.ical4android.*
import com.etesync.syncadapter.App
import com.etesync.syncadapter.model.JournalEntity
import org.apache.commons.lang3.StringUtils
import java.io.FileNotFoundException
import java.util.*
import java.util.logging.Level

24
app/src/main/java/com/etesync/syncadapter/resource/LocalContact.kt
View File

@ -10,26 +10,12 @@ package com.etesync.syncadapter.resource
import android.content.ContentProviderOperation
import android.content.ContentValues
import android.database.Cursor
import android.net.Uri
import android.os.Build
import android.os.RemoteException
import android.provider.ContactsContract
import android.provider.ContactsContract.CommonDataKinds.GroupMembership
import android.provider.ContactsContract.RawContacts.Data
import android.text.TextUtils
import com.etesync.syncadapter.App
import com.etesync.syncadapter.Constants
import com.etesync.syncadapter.model.UnknownProperties
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException
import java.io.IOException
import java.util.HashSet
import java.util.UUID
import java.util.logging.Level
import at.bitfire.vcard4android.AndroidAddressBook
import at.bitfire.vcard4android.AndroidContact
import at.bitfire.vcard4android.AndroidContactFactory
@ -37,10 +23,16 @@ import at.bitfire.vcard4android.BatchOperation
import at.bitfire.vcard4android.CachedGroupMembership
import at.bitfire.vcard4android.Contact
import at.bitfire.vcard4android.ContactsStorageException
import at.bitfire.vcard4android.GroupMethod.GROUP_VCARDS
import com.etesync.syncadapter.App
import com.etesync.syncadapter.Constants
import com.etesync.syncadapter.model.UnknownProperties
import ezvcard.Ezvcard
import ezvcard.VCardVersion
import at.bitfire.vcard4android.GroupMethod.GROUP_VCARDS
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException
import java.util.*
import java.util.logging.Level
class LocalContact : AndroidContact, LocalAddress {
companion object {

3
app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.kt
View File

@ -11,18 +11,15 @@ package com.etesync.syncadapter.resource
import android.content.ContentProviderOperation
import android.content.ContentValues
import android.net.Uri
import android.os.RemoteException
import android.provider.CalendarContract
import android.provider.CalendarContract.Events
import android.text.TextUtils
import at.bitfire.ical4android.*
import at.bitfire.ical4android.Constants.ical4jVersion
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.App
import com.etesync.syncadapter.Constants
import net.fortuna.ical4j.model.property.ProdId
import java.io.ByteArrayOutputStream
import java.io.IOException
import java.util.*
import java.util.logging.Level

23
app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.kt
View File

@ -11,34 +11,21 @@ package com.etesync.syncadapter.resource
import android.content.ContentProviderOperation
import android.content.ContentUris
import android.content.ContentValues
import android.database.Cursor
import android.net.Uri
import android.os.Build
import android.os.Parcel
import android.os.RemoteException
import android.provider.ContactsContract
import android.provider.ContactsContract.CommonDataKinds.GroupMembership
import android.provider.ContactsContract.Groups
import android.provider.ContactsContract.RawContacts
import android.provider.ContactsContract.RawContacts.Data
import android.text.TextUtils
import at.bitfire.vcard4android.*
import com.etesync.syncadapter.App
import org.apache.commons.lang3.ArrayUtils
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException
import java.io.IOException
import java.util.HashSet
import java.util.LinkedList
import java.util.UUID
import java.util.logging.Level
import ezvcard.VCardVersion
import at.bitfire.vcard4android.GroupMethod.GROUP_VCARDS
import com.etesync.syncadapter.App
import ezvcard.VCardVersion
import java.io.ByteArrayOutputStream
import java.util.*
import java.util.logging.Level
class LocalGroup : AndroidGroup, LocalAddress {
companion object {

3
app/src/main/java/com/etesync/syncadapter/resource/LocalResource.kt
View File

@ -8,9 +8,6 @@
package com.etesync.syncadapter.resource
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.ContactsStorageException
interface LocalResource<in TData: Any> {
val uuid: String?

7
app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.kt
View File

@ -7,17 +7,12 @@
*/
package com.etesync.syncadapter.syncadapter
import android.accounts.AbstractAccountAuthenticator
import android.accounts.Account
import android.accounts.AccountAuthenticatorResponse
import android.accounts.AccountManager
import android.accounts.NetworkErrorException
import android.accounts.*
import android.app.Service
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.IBinder
import com.etesync.syncadapter.ui.setup.LoginActivity
class AccountAuthenticatorService : Service() {

26
app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt
View File

@ -11,39 +11,23 @@ import android.accounts.Account
import android.accounts.AccountManager
import android.accounts.AuthenticatorException
import android.accounts.OperationCanceledException
import android.content.AbstractThreadedSyncAdapter
import android.content.ContentProviderClient
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.content.*
import android.database.sqlite.SQLiteException
import android.os.Bundle
import android.provider.ContactsContract
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 at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.*
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.ui.DebugInfoActivity
import java.io.IOException
import java.util.HashMap
import java.util.*
import java.util.logging.Level
import at.bitfire.vcard4android.ContactsStorageException
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
class AddressBooksSyncAdapterService : SyncAdapterService() {
override fun syncAdapter(): AbstractThreadedSyncAdapter {

8
app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt
View File

@ -10,9 +10,7 @@ package com.etesync.syncadapter.syncadapter
import android.accounts.Account
import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.net.Uri
import android.os.Build
import android.os.Bundle
import at.bitfire.ical4android.CalendarStorageException
@ -27,15 +25,9 @@ import com.etesync.syncadapter.model.SyncEntry
import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalEvent
import com.etesync.syncadapter.utils.EventEmailInvitation
import net.fortuna.ical4j.model.property.Attendee
import okhttp3.HttpUrl
import org.acra.attachment.AcraContentProvider
import org.acra.util.IOUtils
import java.io.File
import java.io.IOException
import java.io.StringReader
import java.text.SimpleDateFormat
import java.util.*
/**
*

28
app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt
View File

@ -8,39 +8,23 @@
package com.etesync.syncadapter.syncadapter
import android.accounts.Account
import android.content.AbstractThreadedSyncAdapter
import android.content.ContentProviderClient
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.content.*
import android.database.sqlite.SQLiteException
import android.os.Bundle
import android.provider.CalendarContract
import at.bitfire.ical4android.AndroidCalendar
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 at.bitfire.ical4android.CalendarStorageException
import com.etesync.syncadapter.*
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.ui.DebugInfoActivity
import java.util.HashMap
import java.util.logging.Level
import at.bitfire.ical4android.CalendarStorageException
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import okhttp3.HttpUrl
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import java.util.*
import java.util.logging.Level
class CalendarsSyncAdapterService : SyncAdapterService() {

30
app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt
View File

@ -8,38 +8,16 @@
package com.etesync.syncadapter.syncadapter
import android.accounts.Account
import android.content.AbstractThreadedSyncAdapter
import android.content.ContentProviderClient
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.content.*
import android.os.Bundle
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 at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.*
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceDB
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.ui.DebugInfoActivity
import java.util.logging.Level
import at.bitfire.vcard4android.ContactsStorageException
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import okhttp3.HttpUrl
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
class ContactsSyncAdapterService : SyncAdapterService() {
override fun syncAdapter(): AbstractThreadedSyncAdapter {

42
app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt
View File

@ -9,43 +9,29 @@
package com.etesync.syncadapter.syncadapter
import android.accounts.Account
import android.content.ContentProviderClient
import android.content.ContentProviderOperation
import android.content.ContentResolver
import android.content.ContentUris
import android.content.ContentValues
import android.content.Context
import android.content.SyncResult
import android.os.Build
import android.content.*
import android.os.Bundle
import android.provider.ContactsContract
import com.etesync.syncadapter.AccountSettings
import com.etesync.syncadapter.App
import com.etesync.syncadapter.Constants
import com.etesync.syncadapter.HttpClient
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.model.SyncEntry
import org.apache.commons.codec.Charsets
import org.apache.commons.collections4.SetUtils
import java.io.ByteArrayInputStream
import java.io.FileNotFoundException
import java.io.IOException
import java.util.logging.Level
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.vcard4android.BatchOperation
import at.bitfire.vcard4android.Contact
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.resource.*
import com.etesync.syncadapter.*
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.journalmanager.JournalEntryManager
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.SyncEntry
import com.etesync.syncadapter.resource.LocalAddress
import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.resource.LocalContact
import com.etesync.syncadapter.resource.LocalGroup
import okhttp3.HttpUrl
import okhttp3.Request
import org.apache.commons.collections4.SetUtils
import java.io.FileNotFoundException
import java.io.IOException
import java.io.StringReader
import java.util.logging.Level
/**
*

7
app/src/main/java/com/etesync/syncadapter/syncadapter/NullAuthenticatorService.kt
View File

@ -8,17 +8,12 @@
package com.etesync.syncadapter.syncadapter
import android.accounts.AbstractAccountAuthenticator
import android.accounts.Account
import android.accounts.AccountAuthenticatorResponse
import android.accounts.AccountManager
import android.accounts.NetworkErrorException
import android.accounts.*
import android.app.Service
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.IBinder
import com.etesync.syncadapter.ui.AccountsActivity
class NullAuthenticatorService : Service() {

28
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
View File

@ -9,47 +9,27 @@
package com.etesync.syncadapter.syncadapter
import android.accounts.Account
import android.app.Notification
import android.app.PendingIntent
import android.app.Service
import android.content.AbstractThreadedSyncAdapter
import android.content.ContentProviderClient
import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.content.*
import android.net.ConnectivityManager
import android.net.NetworkInfo
import android.net.wifi.WifiInfo
import android.net.wifi.WifiManager
import android.os.Bundle
import android.os.IBinder
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import android.support.v4.util.Pair
import java.util.HashMap
import java.util.LinkedList
import java.util.logging.Level
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.*
import com.etesync.syncadapter.journalmanager.Crypto
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.journalmanager.JournalManager
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.ui.PermissionsActivity
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
import java.util.*
import java.util.logging.Level
//import com.android.vending.billing.IInAppBillingService;

40
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
View File

@ -12,45 +12,27 @@ import android.annotation.TargetApi
import android.content.Context
import android.content.SyncResult
import android.os.Bundle
import com.etesync.syncadapter.AccountSettings
import com.etesync.syncadapter.App
import com.etesync.syncadapter.Constants
import com.etesync.syncadapter.HttpClient
import com.etesync.syncadapter.NotificationHelper
import com.etesync.syncadapter.R
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.*
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.journalmanager.Crypto
import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.journalmanager.JournalEntryManager
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.EntryEntity
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceDB
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.model.Settings
import com.etesync.syncadapter.model.SyncEntry
import com.etesync.syncadapter.model.*
import com.etesync.syncadapter.model.SyncEntry.Actions.ADD
import com.etesync.syncadapter.resource.LocalCollection
import com.etesync.syncadapter.resource.LocalResource
import com.etesync.syncadapter.ui.DebugInfoActivity
import com.etesync.syncadapter.ui.ViewCollectionActivity
import java.io.FileNotFoundException
import java.io.IOException
import java.util.ArrayList
import java.util.LinkedList
import java.util.Locale
import java.util.logging.Level
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.vcard4android.ContactsStorageException
import io.requery.Persistable
import io.requery.sql.EntityDataStore
import okhttp3.OkHttpClient
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.model.SyncEntry.Actions.ADD
import java.io.FileNotFoundException
import java.io.IOException
import java.util.*
import java.util.logging.Level
abstract class SyncManager<T: LocalResource<*>> @Throws(Exceptions.IntegrityException::class, Exceptions.GenericCryptoException::class)
constructor(protected val context: Context, protected val account: Account, protected val settings: AccountSettings, protected val extras: Bundle, protected val authority: String, protected val syncResult: SyncResult, journalUid: String, protected val serviceType: CollectionInfo.Type, accountName: String) {

1
app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt
View File

@ -23,7 +23,6 @@ import com.etesync.syncadapter.journalmanager.Exceptions
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.model.JournalModel
import com.etesync.syncadapter.model.ServiceEntity
import com.etesync.syncadapter.resource.LocalTaskList
import com.etesync.syncadapter.ui.DebugInfoActivity
import okhttp3.HttpUrl

5
app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncManager.kt
View File

@ -12,8 +12,6 @@ import android.accounts.Account
import android.content.Context
import android.content.SyncResult
import android.os.Bundle
import at.bitfire.ical4android.Event
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.ical4android.Task
import com.etesync.syncadapter.AccountSettings
import com.etesync.syncadapter.App
@ -22,13 +20,10 @@ import com.etesync.syncadapter.R
import com.etesync.syncadapter.journalmanager.JournalEntryManager
import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.SyncEntry
import com.etesync.syncadapter.resource.LocalEvent
import com.etesync.syncadapter.resource.LocalTask
import com.etesync.syncadapter.resource.LocalTaskList
import okhttp3.HttpUrl
import java.io.Reader
import java.io.StringReader
import java.util.logging.Level
/**
* Synchronization manager for CalDAV collections; handles tasks (VTODO)

1
app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt
View File

@ -12,7 +12,6 @@ import com.etesync.syncadapter.journalmanager.JournalManager
import com.etesync.syncadapter.model.CollectionInfo
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
import org.apache.commons.codec.Charsets
class RemoveMemberFragment : DialogFragment() {
private var settings: AccountSettings? = null

3
app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt
View File

@ -22,7 +22,6 @@ import android.view.MenuItem
import android.view.View
import android.widget.TextView
import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.ical4android.TaskProvider
import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.App
import com.etesync.syncadapter.R
@ -31,12 +30,10 @@ import com.etesync.syncadapter.model.EntryEntity
import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalTaskList
import com.etesync.syncadapter.ui.importlocal.ImportActivity
import com.etesync.syncadapter.ui.journalviewer.ListEntriesFragment
import com.etesync.syncadapter.utils.HintManager
import com.etesync.syncadapter.utils.ShowcaseBuilder
import org.dmfs.tasks.contract.TaskContract
import tourguide.tourguide.ToolTip
import java.io.FileNotFoundException
import java.util.*

6
app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
View File

@ -31,8 +31,10 @@ import com.etesync.syncadapter.resource.LocalEvent
import com.etesync.syncadapter.syncadapter.ContactsSyncManager
import com.etesync.syncadapter.ui.Refreshable
import com.etesync.syncadapter.ui.importlocal.ResultFragment.ImportResult
import org.apache.commons.codec.Charsets
import java.io.*
import java.io.File
import java.io.FileNotFoundException
import java.io.FileReader
import java.io.IOException
class ImportFragment : DialogFragment() {

1
app/src/main/java/com/etesync/syncadapter/utils/EventEmailInvitation.kt
View File

@ -6,7 +6,6 @@ import android.content.Intent
import android.net.Uri
import at.bitfire.ical4android.Event
import com.etesync.syncadapter.App
import com.etesync.syncadapter.NotificationHelper
import com.etesync.syncadapter.R
import net.fortuna.ical4j.model.property.Attendee
import org.acra.attachment.AcraContentProvider

2
app/src/main/java/com/etesync/syncadapter/utils/HintManager.kt
View File

@ -4,8 +4,6 @@ package com.etesync.syncadapter.utils
import android.content.Context
import android.content.SharedPreferences
import java.util.LinkedList
object HintManager {
private val PREF_NAME = "hints"

6
app/src/main/java/com/etesync/syncadapter/utils/LanguageUtils.kt
View File

@ -3,13 +3,9 @@ package com.etesync.syncadapter.utils
import android.content.Context
import android.content.res.Configuration
import android.os.Build
import com.etesync.syncadapter.App
import com.etesync.syncadapter.R
import java.util.Arrays
import java.util.Comparator
import java.util.Locale
import java.util.*
/**
* Created by tal on 11/09/17.

2
app/src/main/java/com/etesync/syncadapter/utils/ShowcaseBuilder.kt
View File

@ -1,8 +1,6 @@
package com.etesync.syncadapter.utils
import android.app.Activity
import android.view.View
import tourguide.tourguide.Overlay
import tourguide.tourguide.Pointer
import tourguide.tourguide.TourGuide

1
app/src/main/res/layout/collection_members_list.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

1
app/src/main/res/layout/import_content_list_header.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"

1
app/src/main/res/layout/login_credentials_fragment.xml
View File

@ -8,7 +8,6 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"

7
app/src/main/res/layout/view_collection_activity.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/collection_header"

1
app/src/main/res/layout/view_collection_members.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

3
app/src/main/res/menu/activity_accounts_drawer.xml
View File

@ -7,8 +7,7 @@
~ http://www.gnu.org/licenses/gpl.html
-->
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/nav_about"

15
app/src/test/java/com/etesync/syncadapter/journalmanager/AuthenticatorTest.kt
View File

@ -9,20 +9,13 @@
package com.etesync.syncadapter.journalmanager
import com.etesync.syncadapter.HttpClient
import com.etesync.syncadapter.utils.Base64
import org.apache.commons.codec.Charsets
import org.junit.After
import org.junit.Before
import org.junit.Test
import java.io.IOException
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
import org.junit.Assert.assertEquals
import org.junit.After
import org.junit.Assert.assertNotEquals
import org.junit.Before
import org.junit.Test
import java.io.IOException
class AuthenticatorTest {
private var httpClient: OkHttpClient? = null

8
app/src/test/java/com/etesync/syncadapter/journalmanager/EncryptionTest.kt
View File

@ -9,18 +9,14 @@
package com.etesync.syncadapter.journalmanager
import com.etesync.syncadapter.utils.Base64
import org.apache.commons.codec.Charsets
import org.junit.After
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.spongycastle.util.encoders.Hex
import java.io.IOException
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
class EncryptionTest {
@Before
@Throws(IOException::class)

21
app/src/test/java/com/etesync/syncadapter/journalmanager/ServiceTest.kt
View File

@ -11,27 +11,14 @@ package com.etesync.syncadapter.journalmanager
import com.etesync.syncadapter.App
import com.etesync.syncadapter.HttpClient
import com.etesync.syncadapter.model.CollectionInfo
import org.apache.commons.codec.Charsets
import okhttp3.*
import okio.BufferedSink
import org.junit.After
import org.junit.Assert.*
import org.junit.Before
import org.junit.Test
import java.io.IOException
import java.util.LinkedList
import okhttp3.HttpUrl
import okhttp3.MediaType
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody
import okhttp3.Response
import okio.BufferedSink
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import java.util.*
class ServiceTest {
private var httpClient: OkHttpClient? = null