srctree

Robin Linden parent 52cad153 efef2c0b
Fix ktlint violations in atox/

inline split

atox/src/androidTest/kotlin/IntegrationTest.kt added: 56, removed: 19, total 37

@@ -4,10 +4,14 @@ import android.app.Activity

import android.content.Context

import androidx.room.Room

import androidx.test.espresso.Espresso.onView

import androidx.test.espresso.action.ViewActions.*

import androidx.test.espresso.action.ViewActions.click

import androidx.test.espresso.action.ViewActions.closeSoftKeyboard

import androidx.test.espresso.action.ViewActions.typeText

import androidx.test.espresso.assertion.ViewAssertions.matches

import androidx.test.espresso.contrib.DrawerActions

import androidx.test.espresso.matcher.ViewMatchers.*

import androidx.test.espresso.matcher.ViewMatchers.isDisplayed

import androidx.test.espresso.matcher.ViewMatchers.withId

import androidx.test.espresso.matcher.ViewMatchers.withText

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.rule.ActivityTestRule

atox/src/main/kotlin/tox/EventListenerCallbacks.kt added: 56, removed: 19, total 37

@@ -1,7 +1,7 @@

package ltd.evilcorp.atox.tox

import android.util.Log

import java.util.*

import java.util.Date

import javax.inject.Inject

import javax.inject.Singleton

import kotlinx.coroutines.CoroutineScope

@@ -12,10 +12,20 @@ import ltd.evilcorp.core.repository.ContactRepository

import ltd.evilcorp.core.repository.FriendRequestRepository

import ltd.evilcorp.core.repository.MessageRepository

import ltd.evilcorp.core.repository.UserRepository

import ltd.evilcorp.core.vo.*

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.FileKind

import ltd.evilcorp.core.vo.FileTransfer

import ltd.evilcorp.core.vo.FriendRequest

import ltd.evilcorp.core.vo.Message

import ltd.evilcorp.core.vo.Sender

import ltd.evilcorp.domain.feature.ChatManager

import ltd.evilcorp.domain.feature.FileTransferManager

import ltd.evilcorp.domain.tox.*

import ltd.evilcorp.domain.tox.PublicKey

import ltd.evilcorp.domain.tox.Tox

import ltd.evilcorp.domain.tox.ToxAvEventListener

import ltd.evilcorp.domain.tox.ToxEventListener

import ltd.evilcorp.domain.tox.toMessageType

private const val TAG = "EventListenerCallbacks"

atox/src/main/kotlin/tox/ToxStarter.kt added: 56, removed: 19, total 37

@@ -9,7 +9,12 @@ import im.tox.tox4j.core.exceptions.ToxNewException

import javax.inject.Inject

import ltd.evilcorp.atox.ToxService

import ltd.evilcorp.domain.feature.UserManager

import ltd.evilcorp.domain.tox.*

import ltd.evilcorp.domain.tox.PublicKey

import ltd.evilcorp.domain.tox.SaveManager

import ltd.evilcorp.domain.tox.SaveOptions

import ltd.evilcorp.domain.tox.Tox

import ltd.evilcorp.domain.tox.ToxAvEventListener

import ltd.evilcorp.domain.tox.ToxEventListener

private const val TAG = "ToxStarter"

atox/src/main/kotlin/ui/chat/ChatAdapter.kt added: 56, removed: 19, total 37

@@ -64,7 +64,8 @@ class ChatAdapter(

override fun getView(position: Int, convertView: View?, parent: ViewGroup): View =

when (val type = types[getItemViewType(position)]) {

ChatItemType.ReceivedMessage, ChatItemType.SentMessage, ChatItemType.ReceivedAction, ChatItemType.SentAction -> {

ChatItemType.ReceivedMessage, ChatItemType.SentMessage,

ChatItemType.ReceivedAction, ChatItemType.SentAction -> {

val message = messages[position]

val view: View

val vh: MessageViewHolder

atox/src/main/kotlin/ui/chat/ChatFragment.kt added: 56, removed: 19, total 37

@@ -5,7 +5,11 @@ import android.content.ClipData

import android.content.ClipboardManager

import android.os.Build

import android.os.Bundle

import android.view.*

import android.view.ContextMenu

import android.view.LayoutInflater

import android.view.MenuItem

import android.view.View

import android.view.ViewGroup

import android.widget.AdapterView

import android.widget.Toast

import androidx.core.content.getSystemService

@@ -17,7 +21,7 @@ import androidx.fragment.app.viewModels

import androidx.lifecycle.Observer

import androidx.navigation.fragment.findNavController

import java.text.DateFormat

import java.util.*

import java.util.Locale

import kotlinx.android.synthetic.main.fragment_chat.*

import kotlinx.android.synthetic.main.fragment_chat.view.*

import kotlinx.android.synthetic.main.profile_image_layout.*

atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt added: 56, removed: 19, total 37

@@ -5,7 +5,12 @@ import android.content.Intent

import android.net.Uri

import android.os.Build

import android.os.Bundle

import android.view.*

import android.view.ContextMenu

import android.view.LayoutInflater

import android.view.MenuInflater

import android.view.MenuItem

import android.view.View

import android.view.ViewGroup

import android.view.inputmethod.InputMethodManager

import android.widget.AdapterView

import androidx.activity.addCallback

@@ -28,7 +33,11 @@ import ltd.evilcorp.atox.R

import ltd.evilcorp.atox.setUpFullScreenUi

import ltd.evilcorp.atox.ui.chat.CONTACT_PUBLIC_KEY

import ltd.evilcorp.atox.vmFactory

import ltd.evilcorp.core.vo.*

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.FriendRequest

import ltd.evilcorp.core.vo.User

import ltd.evilcorp.core.vo.UserStatus

import ltd.evilcorp.domain.tox.PublicKey

private const val REQUEST_CODE_BACKUP_TOX = 9202

atox/src/main/kotlin/ui/contactlist/ContactListViewModel.kt added: 56, removed: 19, total 37

@@ -8,7 +8,11 @@ import androidx.lifecycle.LiveData

import androidx.lifecycle.ViewModel

import java.io.FileOutputStream

import javax.inject.Inject

import kotlinx.coroutines.*

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.GlobalScope

import kotlinx.coroutines.launch

import kotlinx.coroutines.withContext

import ltd.evilcorp.atox.R

import ltd.evilcorp.atox.tox.ToxStarter

import ltd.evilcorp.core.vo.FriendRequest