From 743c9e2de70e9a5ffe2b48b9e1ea7c20935ee0f2 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 9 Jan 2019 15:09:21 +0000 Subject: [PATCH] Many warning fixes. --- .../etesync/syncadapter/ui/AccountActivity.kt | 6 ++-- .../syncadapter/ui/AccountListFragment.kt | 4 +-- .../syncadapter/ui/AccountSettingsActivity.kt | 16 +++++------ .../syncadapter/ui/AddMemberFragment.kt | 28 +++++++++---------- .../syncadapter/ui/AppSettingsActivity.kt | 6 ++-- .../ui/CollectionMembersActivity.kt | 4 +-- .../syncadapter/ui/setup/LoginCredentials.kt | 10 +++---- .../setup/LoginCredentialsChangeFragment.kt | 4 +-- .../ui/setup/SetupEncryptionFragment.kt | 4 +-- .../ui/setup/SetupUserInfoFragment.kt | 4 +-- .../syncadapter/utils/EventEmailInvitation.kt | 2 +- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt index 06a7757f..667033bc 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt @@ -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(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) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt index 2d6cc98c..5065aa0f 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt @@ -102,8 +102,8 @@ class AccountListFragment : ListFragment(), LoaderManager.LoaderCallbacks(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) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt index 299b1c65..d3604ccb 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt @@ -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) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt index 58cec6a3..336ad510 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt @@ -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(R.id.body) as TextView).text = getString(R.string.trust_fingerprint_body, memberEmail) (view.findViewById(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() } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt index 6b9921b7..5e6d1cdc 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt @@ -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) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt index ed0c8b4b..261fc51d 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt @@ -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() } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt index 47d28552..d2b8da43 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentials.kt @@ -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 { - return arrayOfNulls(size) as Array + override fun newArray(size: Int): Array { + return arrayOfNulls(size) } } } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt index 40b8a236..ac11ee67 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt @@ -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 { @@ -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() diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt index a5efa1fc..7f13fa5b 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt @@ -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() } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt index 617be273..760561bd 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt @@ -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() diff --git a/app/src/main/java/com/etesync/syncadapter/utils/EventEmailInvitation.kt b/app/src/main/java/com/etesync/syncadapter/utils/EventEmailInvitation.kt index 48da96be..60beab79 100644 --- a/app/src/main/java/com/etesync/syncadapter/utils/EventEmailInvitation.kt +++ b/app/src/main/java/com/etesync/syncadapter/utils/EventEmailInvitation.kt @@ -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()