Reformat code as per ktlint (17d2848e) · Commits · e / os / Mail

app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.kt

+69 −75

Original line number	Diff line number	Diff line
		@@ -7,13 +7,11 @@ import com.fsck.k9.K9RobolectricTest
		import com.fsck.k9.controller.MessageReference
		import com.fsck.k9.mailstore.LocalMessage
		import org.junit.Test
		import org.mockito.ArgumentMatchers.anyBoolean
		import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.Mockito.never
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.stubbing
		import org.mockito.kotlin.whenever
		@@ -228,11 +226,7 @@ class NewMailNotificationsTest : K9RobolectricTest() {
		whenAddingContentReturn(content, AddNotificationResult.newNotification(holder))
		newMailNotifications.addNewMailNotification(account, message, 3, silent = false)

		newMailNotifications.clearNewMa
		}
		}
		ilNotifications(account)

		newMailNotifications.clearNewMailNotifications(account)
		verify(notificationManager).cancel(notificationId)
		verify(notificationManager).cancel(NotificationIds.getNewMailSummaryNotificationId(account))
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -390,7 +390,6 @@ open class MessageList :
		noThreading = launchData.noThreading
		messageReference = launchData.messageReference


		return true
		}

		@@ -1165,7 +1164,6 @@ open class MessageList :
		}
		}


		fun setActionBarTitle(title: String, subtitle: String? = null) {
		actionBar.title = title
		actionBar.subtitle = subtitle

+0 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,6 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang
		fun setRecipientExpanderVisibility(visible: Boolean) {
		val childToDisplay = if (visible) VIEW_INDEX_BCC_EXPANDER_VISIBLE else VIEW_INDEX_BCC_EXPANDER_HIDDEN


		if (recipientExpanderContainer.displayedChild != childToDisplay) {
		recipientExpanderContainer.displayedChild = childToDisplay
		}
		@@ -399,7 +398,6 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang
		ERROR(R.id.crypto_status_error);
		}


		enum class CryptoSpecialModeDisplayType(val childIdToDisplay: Int) {
		NONE(VIEW_INDEX_HIDDEN),
		PGP_INLINE(R.id.crypto_special_inline),

+1 −5

Original line number	Diff line number	Diff line
		@@ -256,7 +256,6 @@ class RecipientPresenter(
		this.alwaysBccAddresses = alwaysBccAddresses
		if (alwaysBccAddresses.isEmpty()) return


		object : RecipientLoader(context, account.openPgpProvider, *alwaysBccAddresses) {
		override fun deliverResult(result: List<Recipient>?) {
		val recipientArray = result!!.toTypedArray()
		@@ -564,7 +563,6 @@ class RecipientPresenter(
		return
		}


		if (currentCryptoMode == CryptoMode.SIGN_ONLY) {
		recipientMvpView.showErrorIsSignOnly()
		return
		@@ -584,7 +582,7 @@ class RecipientPresenter(
		} else {
		onCryptoModeChanged(CryptoMode.CHOICE_ENABLED)
		if (showGotIt) {
		recipientMvpView.showOpenPgpEncryptExplanationDialog();
		recipientMvpView.showOpenPgpEncryptExplanationDialog()
		recipientMvpView.showOpenPgpEncryptExplanationDialog()
		}
		}
		@@ -692,8 +690,6 @@ class RecipientPresenter(
		return true
		}



		return false
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ import com.fsck.k9.Identity
		import com.fsck.k9.mail.Address
		import com.fsck.k9.mail.Message


		private const val STATE_KEY_REPLY_TO_SHOWN = "com.fsck.k9.activity.compose.ReplyToPresenter.replyToShown"

		class ReplyToPresenter(private val view: ReplyToView) {
		@@ -20,7 +19,6 @@ class ReplyToPresenter(private val view: ReplyToView) {
		}
		}


		fun getAddresses(): Array<Address> {
		return view.getAddresses()
		}