arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-02 19:01:06 +00:00
Code Issues Releases Wiki Activity

Many warning fixes.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-09 15:09:21 +00:00
parent 723790178c
commit 743c9e2de7
11 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
for (serviceEntity in data.select(ServiceEntity::class.java).where(ServiceEntity.ACCOUNT.eq(account.name)).get()) {
val id = serviceEntity.id.toLong()
val service = serviceEntity.type
val service = serviceEntity.type!!
when (service) {
CollectionInfo.Type.ADDRESS_BOOK -> {
info.carddav = AccountInfo.ServiceInfo()
@ -350,8 +350,8 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
class CollectionListAdapter(context: Context, private val account: Account) : ArrayAdapter<JournalEntity>(context, R.layout.account_collection_item) {
override fun getView(position: Int, v: View?, parent: ViewGroup): View {
var v = v
override fun getView(position: Int, _v: View?, parent: ViewGroup): View {
var v = _v
if (v == null)
v = LayoutInflater.from(context).inflate(R.layout.account_collection_item, parent, false)

4
app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
View File

@ -102,8 +102,8 @@ class AccountListFragment : ListFragment(), LoaderManager.LoaderCallbacks<Array<
internal class AccountListAdapter(context: Context) : ArrayAdapter<Account>(context, R.layout.account_list_item) {
override fun getView(position: Int, v: View?, parent: ViewGroup): View {
var v = v
override fun getView(position: Int, _v: View?, parent: ViewGroup): View {
var v = _v
if (v == null)
v = LayoutInflater.from(context).inflate(R.layout.account_list_item, parent, false)

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

@ -37,7 +37,7 @@ class AccountSettingsActivity : BaseActivity() {
super.onCreate(savedInstanceState)
account = intent.getParcelableExtra(KEY_ACCOUNT)
title = getString(R.string.settings_title, account!!.name)
title = getString(R.string.settings_title, account.name)
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
@ -67,7 +67,7 @@ class AccountSettingsActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
account = arguments!!.getParcelable(KEY_ACCOUNT)
account = arguments?.getParcelable(KEY_ACCOUNT)!!
loaderManager.initLoader(0, arguments, this)
}
@ -88,9 +88,9 @@ class AccountSettingsActivity : BaseActivity() {
// category: authentication
val prefPassword = findPreference("password") as EditTextPreference
prefPassword.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
val credentials = if (newValue != null) LoginCredentials(settings.uri, account!!.name, newValue as String) else null
LoginCredentialsChangeFragment.newInstance(account!!, credentials!!).show(fragmentManager!!, null)
prefPassword.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
val credentials = if (newValue != null) LoginCredentials(settings.uri, account.name, newValue as String) else null
LoginCredentialsChangeFragment.newInstance(account, credentials!!).show(fragmentManager!!, null)
loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
false
}
@ -104,7 +104,7 @@ class AccountSettingsActivity : BaseActivity() {
prefSyncContacts.setSummary(R.string.settings_sync_summary_manually)
else
prefSyncContacts.summary = getString(R.string.settings_sync_summary_periodically, prefSyncContacts.entry)
prefSyncContacts.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
prefSyncContacts.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
settings.setSyncInterval(App.addressBooksAuthority, java.lang.Long.parseLong(newValue as String))
loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
false
@ -122,7 +122,7 @@ class AccountSettingsActivity : BaseActivity() {
prefSyncCalendars.setSummary(R.string.settings_sync_summary_manually)
else
prefSyncCalendars.summary = getString(R.string.settings_sync_summary_periodically, prefSyncCalendars.entry)
prefSyncCalendars.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
prefSyncCalendars.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
settings.setSyncInterval(CalendarContract.AUTHORITY, java.lang.Long.parseLong(newValue as String))
loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
false
@ -147,7 +147,7 @@ class AccountSettingsActivity : BaseActivity() {
prefWifiOnlySSID.summary = getString(R.string.settings_sync_wifi_only_ssid_on, onlySSID)
else
prefWifiOnlySSID.setSummary(R.string.settings_sync_wifi_only_ssid_off)
prefWifiOnlySSID.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
prefWifiOnlySSID.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
val ssid = newValue as String
settings.syncWifiOnlySSID = if (!TextUtils.isEmpty(ssid)) ssid else null
loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)

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

@ -29,12 +29,12 @@ class AddMemberFragment : DialogFragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
account = arguments!!.getParcelable(Constants.KEY_ACCOUNT)
info = arguments!!.getSerializable(Constants.KEY_COLLECTION_INFO) as CollectionInfo
memberEmail = arguments!!.getString(KEY_MEMBER).toLowerCase()
account = arguments?.getParcelable(Constants.KEY_ACCOUNT)!!
info = arguments?.getSerializable(Constants.KEY_COLLECTION_INFO) as CollectionInfo
memberEmail = arguments?.getString(KEY_MEMBER)!!.toLowerCase()
ctx = context
try {
settings = AccountSettings(ctx!!, account!!)
settings = AccountSettings(ctx!!, account)
} catch (e: InvalidAccountException) {
e.printStackTrace()
}
@ -60,7 +60,7 @@ class AddMemberFragment : DialogFragment() {
val httpClient = HttpClient.create(ctx!!, settings!!)
val userInfoManager = UserInfoManager(httpClient, remote!!)
val userInfo = userInfoManager[memberEmail!!]
val userInfo = userInfoManager[memberEmail]
?: throw Exception(getString(R.string.collection_members_error_user_not_found, memberEmail))
memberPubKey = userInfo.pubkey!!
return AddResult(null)
@ -72,7 +72,7 @@ class AddMemberFragment : DialogFragment() {
override fun onPostExecute(result: AddResult) {
if (result.throwable == null) {
val fingerprint = Crypto.AsymmetricCryptoManager.getPrettyKeyFingerprint(memberPubKey!!)
val fingerprint = Crypto.AsymmetricCryptoManager.getPrettyKeyFingerprint(memberPubKey)
val view = LayoutInflater.from(context).inflate(R.layout.fingerprint_alertdialog, null)
(view.findViewById<View>(R.id.body) as TextView).text = getString(R.string.trust_fingerprint_body, memberEmail)
(view.findViewById<View>(R.id.fingerprint) as TextView).text = fingerprint
@ -80,14 +80,14 @@ class AddMemberFragment : DialogFragment() {
.setIcon(R.drawable.ic_fingerprint_dark)
.setTitle(R.string.trust_fingerprint_title)
.setView(view)
.setPositiveButton(android.R.string.ok) { dialog, which -> MemberAddSecond().execute() }
.setNegativeButton(android.R.string.cancel) { dialog, which -> dismiss() }.show()
.setPositiveButton(android.R.string.ok) { _, _ -> MemberAddSecond().execute() }
.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }.show()
} else {
AlertDialog.Builder(activity!!)
.setIcon(R.drawable.ic_error_dark)
.setTitle(R.string.collection_members_add_error)
.setMessage(result.throwable.message)
.setPositiveButton(android.R.string.yes) { dialog, which -> }.show()
.setPositiveButton(android.R.string.yes) { _, _ -> }.show()
dismiss()
}
}
@ -101,11 +101,11 @@ class AddMemberFragment : DialogFragment() {
val httpClient = HttpClient.create(ctx!!, settings!!)
val journalsManager = JournalManager(httpClient, remote!!)
val journal = JournalManager.Journal.fakeWithUid(info!!.uid!!)
val crypto = Crypto.CryptoManager(info!!.version, settings!!.password(), info!!.uid!!)
val journal = JournalManager.Journal.fakeWithUid(info.uid!!)
val crypto = Crypto.CryptoManager(info.version, settings!!.password(), info.uid!!)
val encryptedKey = crypto.getEncryptedKey(settings!!.keyPair!!, memberPubKey!!)
val member = JournalManager.Member(memberEmail!!, encryptedKey!!)
val encryptedKey = crypto.getEncryptedKey(settings!!.keyPair!!, memberPubKey)
val member = JournalManager.Member(memberEmail, encryptedKey!!)
journalsManager.addMember(journal, member)
return AddResultSecond(null)
} catch (e: Exception) {
@ -122,7 +122,7 @@ class AddMemberFragment : DialogFragment() {
.setIcon(R.drawable.ic_error_dark)
.setTitle(R.string.collection_members_add_error)
.setMessage(result.throwable.message)
.setPositiveButton(android.R.string.yes) { dialog, which -> }.show()
.setPositiveButton(android.R.string.yes) { _, _ -> }.show()
}
dismiss()
}

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

@ -76,10 +76,10 @@ class AppSettingsActivity : BaseActivity() {
val proxyHost = settings.getString(App.OVERRIDE_PROXY_HOST, App.OVERRIDE_PROXY_HOST_DEFAULT)
prefProxyHost.text = proxyHost
prefProxyHost.summary = proxyHost
prefProxyHost.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
prefProxyHost.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
val host = newValue as String
try {
val uri = URI(null, host, null, null)
URI(null, host, null, null)
} catch (e: URISyntaxException) {
Snackbar.make(view!!, e.localizedMessage, Snackbar.LENGTH_LONG).show()
return@OnPreferenceChangeListener false
@ -94,7 +94,7 @@ class AppSettingsActivity : BaseActivity() {
val proxyPort = settings.getString(App.OVERRIDE_PROXY_PORT, App.OVERRIDE_PROXY_PORT_DEFAULT.toString())
prefProxyPort.text = proxyPort
prefProxyPort.summary = proxyPort
prefProxyPort.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
prefProxyPort.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
var port: Int
try {
port = Integer.parseInt(newValue as String)

4
app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt
View File

@ -81,11 +81,11 @@ class CollectionMembersActivity : BaseActivity(), Refreshable {
val dialog = AlertDialog.Builder(this)
.setTitle(R.string.collection_members_add)
.setIcon(R.drawable.ic_account_add_dark)
.setPositiveButton(android.R.string.yes) { dialog, which ->
.setPositiveButton(android.R.string.yes) { _, _ ->
val frag = AddMemberFragment.newInstance(account, info, input.text.toString())
frag.show(supportFragmentManager, null)
}
.setNegativeButton(android.R.string.no) { dialog, which -> }
.setNegativeButton(android.R.string.no) { _, _ -> }
dialog.setView(input)
dialog.show()
}

10
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt
View File

@ -17,11 +17,11 @@ import com.etesync.syncadapter.Constants
import java.net.URI
import java.net.URISyntaxException
class LoginCredentials(uri: URI?, val userName: String, val password: String) : Parcelable {
class LoginCredentials(_uri: URI?, val userName: String, val password: String) : Parcelable {
val uri: URI?
init {
var uri = uri
var uri = _uri
if (uri == null) {
try {
@ -50,12 +50,12 @@ class LoginCredentials(uri: URI?, val userName: String, val password: String) :
override fun createFromParcel(source: Parcel): LoginCredentials {
return LoginCredentials(
source.readSerializable() as URI,
source.readString(), source.readString()
source.readString()!!, source.readString()!!
)
}
override fun newArray(size: Int): Array<LoginCredentials> {
return arrayOfNulls<LoginCredentials>(size) as Array<LoginCredentials>
override fun newArray(size: Int): Array<LoginCredentials?> {
return arrayOfNulls(size)
}
}
}

4
app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt
View File

@ -44,7 +44,7 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
super.onCreate(savedInstanceState)
loaderManager.initLoader(0, arguments, this)
account = arguments!!.getParcelable(ARG_ACCOUNT)
account = arguments!!.getParcelable(ARG_ACCOUNT)!!
}
override fun onCreateLoader(id: Int, args: Bundle?): Loader<Configuration> {
@ -62,7 +62,7 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
val settings: AccountSettings
try {
settings = AccountSettings(activity!!, account!!)
settings = AccountSettings(activity!!, account)
} catch (e: InvalidAccountException) {
App.log.log(Level.INFO, "Account is invalid or doesn't exist (anymore)", e)
activity!!.finish()

4
app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt
View File

@ -61,7 +61,7 @@ class SetupEncryptionFragment : DialogFragment() {
.setTitle(R.string.wrong_encryption_password)
.setIcon(R.drawable.ic_error_dark)
.setMessage(getString(R.string.wrong_encryption_password_content, config.error!!.localizedMessage))
.setPositiveButton(android.R.string.ok) { dialog, which ->
.setPositiveButton(android.R.string.ok) { _, _ ->
// dismiss
}.show()
} else {
@ -76,7 +76,7 @@ class SetupEncryptionFragment : DialogFragment() {
.setTitle(R.string.account_creation_failed)
.setIcon(R.drawable.ic_error_dark)
.setMessage(e.localizedMessage)
.setPositiveButton(android.R.string.ok) { dialog, which ->
.setPositiveButton(android.R.string.ok) { _, _ ->
// dismiss
}.show()
}

4
app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt
View File

@ -49,7 +49,7 @@ class SetupUserInfoFragment : DialogFragment() {
val cryptoManager: Crypto.CryptoManager
val httpClient = HttpClient.create(context, settings)
val userInfoManager = UserInfoManager(httpClient, HttpUrl.get(settings.uri)!!)
val userInfoManager = UserInfoManager(httpClient, HttpUrl.get(settings.uri!!)!!)
var userInfo: UserInfoManager.UserInfo? = userInfoManager[account.name]
if (userInfo == null) {
@ -81,7 +81,7 @@ class SetupUserInfoFragment : DialogFragment() {
.setTitle(R.string.login_user_info_error_title)
.setIcon(R.drawable.ic_error_dark)
.setMessage(result.exception.localizedMessage)
.setPositiveButton(android.R.string.ok) { dialog, which ->
.setPositiveButton(android.R.string.ok) { _, _ ->
// dismiss
}
.create()

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

@ -75,7 +75,7 @@ class EventEmailInvitation constructor(val context: Context, val account: Accoun
val startDate = event.dtStart?.date
val endDate = event.getEndDate(true)!!.date
val tzName = timezone?.getDisplayName(timezone?.inDaylightTime(startDate)!!, TimeZone.SHORT)
val tzName = timezone?.getDisplayName(timezone.inDaylightTime(startDate), TimeZone.SHORT)
val cal1 = Calendar.getInstance()
val cal2 = Calendar.getInstance()