hardcoresushi
/
AIRA-android
2
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Don't show offline contacts when opened to share file

This commit is contained in:
Matéo Duparc 2021-05-04 20:52:24 +02:00
parent 490673052d
commit 58804bef67
Signed by: hardcoresushi
GPG Key ID: 007F84120107191E
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/sushi/hardcore/aira/MainActivity.kt
View File

@ -10,6 +10,7 @@ import android.os.IBinder
import android.provider.OpenableColumns
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.widget.AbsListView
import android.widget.AdapterView
import android.widget.Toast
@ -30,7 +31,7 @@ class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding
private lateinit var airaService: AIRAService
private lateinit var onlineSessionAdapter: SessionAdapter
private lateinit var offlineSessionAdapter: SessionAdapter
private var offlineSessionAdapter: SessionAdapter? = null
private val onSessionsItemClick = AdapterView.OnItemClickListener { adapter, _, position, _ ->
launchChatActivity(adapter.getItemAtPosition(position) as Session)
}
@ -55,7 +56,7 @@ class MainActivity : AppCompatActivity() {
runOnUiThread {
onlineSessionAdapter.remove(sessionId)?.let { session ->
if (session.isContact) {
offlineSessionAdapter.add(session)
offlineSessionAdapter?.add(session)
}
}
}
@ -100,15 +101,20 @@ class MainActivity : AppCompatActivity() {
}
setOnScrollListener(onSessionsScrollListener)
}
offlineSessionAdapter = SessionAdapter(this)
binding.offlineSessions.apply {
adapter = offlineSessionAdapter
onItemClickListener = if (openedToShareFile) {
if (openedToShareFile) {
binding.offlineSessions.visibility = View.GONE
binding.textOfflineSessions.visibility = View.GONE
} else {
offlineSessionAdapter = SessionAdapter(this)
binding.offlineSessions.apply {
adapter = offlineSessionAdapter
onItemClickListener = if (openedToShareFile) {
onSessionsItemClickSendFile
} else {
onSessionsItemClick
}
setOnScrollListener(onSessionsScrollListener)
setOnScrollListener(onSessionsScrollListener)
}
}
Intent(this, AIRAService::class.java).also { serviceIntent ->
bindService(serviceIntent, object : ServiceConnection {
@ -206,7 +212,7 @@ class MainActivity : AppCompatActivity() {
airaService.isAppInBackground = false
airaService.uiCallbacks = uiCallbacks //restoring callbacks
onlineSessionAdapter.reset()
offlineSessionAdapter.reset()
offlineSessionAdapter?.reset()
loadContacts()
loadSessions()
title = airaService.identityName
@ -217,8 +223,10 @@ class MainActivity : AppCompatActivity() {
}
private fun loadContacts() {
for ((sessionId, contact) in airaService.contacts) {
offlineSessionAdapter.add(Session(sessionId, true, contact.verified, contact.seen, null, contact.name))
if (offlineSessionAdapter != null) {
for ((sessionId, contact) in airaService.contacts) {
offlineSessionAdapter!!.add(Session(sessionId, true, contact.verified, contact.seen, null, contact.name))
}
}
}
@ -235,7 +243,7 @@ class MainActivity : AppCompatActivity() {
onlineSessionAdapter.add(Session(sessionId, false, false, seen, ip, airaService.savedNames[sessionId]))
} else {
onlineSessionAdapter.add(Session(sessionId, true, contact.verified, seen, ip, contact.name))
offlineSessionAdapter.remove(sessionId)
offlineSessionAdapter?.remove(sessionId)
}
}