Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TunnelListFragment: do not assume binding always exists

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-09-20 18:05:43 +02:00
parent 847da23300
commit 655a853857
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
View File

@ -224,8 +224,8 @@ class TunnelListFragment : BaseFragment() {
binding ?: return binding ?: return
lifecycleScope.launch { lifecycleScope.launch {
val tunnels = Application.getTunnelManager().getTunnels() val tunnels = Application.getTunnelManager().getTunnels()
if (newTunnel != null) viewForTunnel(newTunnel, tunnels).setSingleSelected(true) if (newTunnel != null) viewForTunnel(newTunnel, tunnels)?.setSingleSelected(true)
if (oldTunnel != null) viewForTunnel(oldTunnel, tunnels).setSingleSelected(false) if (oldTunnel != null) viewForTunnel(oldTunnel, tunnels)?.setSingleSelected(false)
} }
} }
@ -296,8 +296,8 @@ class TunnelListFragment : BaseFragment() {
} }
} }
private fun viewForTunnel(tunnel: ObservableTunnel, tunnels: List<*>): MultiselectableRelativeLayout { private fun viewForTunnel(tunnel: ObservableTunnel, tunnels: List<*>): MultiselectableRelativeLayout? {
return binding!!.tunnelList.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel))!!.itemView as MultiselectableRelativeLayout return binding?.tunnelList?.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel))?.itemView as? MultiselectableRelativeLayout
} }
private inner class ActionModeListener : ActionMode.Callback { private inner class ActionModeListener : ActionMode.Callback {