Skip to content

Refactor MoreFragment logic into MoreViewModel #1462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor MoreFragment logic into MoreViewModel #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 67 additions & 56 deletions app/src/main/java/org/torproject/android/ui/more/MoreFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
Expand All @@ -13,8 +12,11 @@ import android.view.animation.BounceInterpolator
import android.widget.ImageView
import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kotlinx.coroutines.launch
import org.torproject.android.OrbotActivity
import org.torproject.android.R
import org.torproject.android.service.util.sendIntentToService
Expand All @@ -26,6 +28,8 @@ import org.torproject.android.ui.v3onionservice.OnionServiceActivity
import org.torproject.android.ui.v3onionservice.clientauth.ClientAuthActivity

class MoreFragment : Fragment() {
private val viewModel: MoreViewModel by activityViewModels()

private var httpPort = -1
private var socksPort = -1

Expand All @@ -36,30 +40,6 @@ class MoreFragment : Fragment() {

httpPort = (context as OrbotActivity).portHttp
socksPort = context.portSocks

if (view != null) updateStatus()
}

private fun updateStatus() {
val sb = StringBuilder()

sb.append(getString(R.string.proxy_ports)).append(" ")

if (httpPort != -1 && socksPort != -1) {
sb.append("\nHTTP: ").append(httpPort).append(" - SOCKS: ").append(socksPort)
} else {
sb.append(": " + getString(R.string.ports_not_set))
}

sb.append("\n\n")

val manager = requireActivity().packageManager
val info =
manager.getPackageInfo(requireActivity().packageName, PackageManager.GET_ACTIVITIES)
sb.append(getString(R.string.app_name)).append(" ${info.versionName}\n")
sb.append("Tor v${getTorVersion()}")

tvStatus.text = sb.toString()
}

override fun onCreateView(
Expand All @@ -70,47 +50,83 @@ class MoreFragment : Fragment() {
val view = inflater.inflate(R.layout.fragment_more, container, false)
tvStatus = view.findViewById(R.id.tvVersion)

updateStatus()

val rvMore = view.findViewById<RecyclerView>(R.id.rvMoreActions)
val ivMascot = view.findViewById<ImageView>(R.id.ivMascot)

lifecycleScope.launch {
viewModel.statusText.collect { text ->
tvStatus.text = text
}
}

lifecycleScope.launch {
viewModel.events.collect { event ->
when (event) {
MoreEvent.OpenSettings -> {
activity?.startActivityForResult(
Intent(context, SettingsActivity::class.java),
OrbotActivity.REQUEST_CODE_SETTINGS
)
}
MoreEvent.OpenVpnSettings -> {
activity?.startActivity(
Intent("android.net.vpn.SETTINGS").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
)
}
MoreEvent.ChooseApps -> {
activity?.startActivityForResult(
Intent(requireActivity(), AppManagerActivity::class.java),
OrbotActivity.REQUEST_VPN_APP_SELECT
)
}
MoreEvent.OpenLog -> showLog()
MoreEvent.OpenOnionServices -> {
startActivity(Intent(requireActivity(), OnionServiceActivity::class.java))
}
MoreEvent.OpenClientAuth -> {
startActivity(Intent(requireActivity(), ClientAuthActivity::class.java))
}
MoreEvent.OpenAbout -> {
AboutDialogFragment().show(
requireActivity().supportFragmentManager,
AboutDialogFragment.TAG
)
}
MoreEvent.ExitApp -> doExit()
}
}
}

viewModel.updateStatus(requireContext(), httpPort, socksPort)

val listItems = listOf(
OrbotMenuAction(R.string.menu_settings, R.drawable.ic_settings_gear) {
activity?.startActivityForResult(
Intent(context, SettingsActivity::class.java),
OrbotActivity.Companion.REQUEST_CODE_SETTINGS
)
viewModel.triggerEvent(MoreEvent.OpenSettings)
},
OrbotMenuAction(R.string.system_vpn_settings, R.drawable.ic_vpn_key) {
activity?.startActivity(
Intent("android.net.vpn.SETTINGS")
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
)
viewModel.triggerEvent(MoreEvent.OpenVpnSettings)
},
OrbotMenuAction(R.string.btn_choose_apps, R.drawable.ic_choose_apps) {
activity?.startActivityForResult(
Intent(requireActivity(), AppManagerActivity::class.java),
OrbotActivity.Companion.REQUEST_VPN_APP_SELECT
)
viewModel.triggerEvent(MoreEvent.ChooseApps)
},
OrbotMenuAction(R.string.menu_log, R.drawable.ic_log) {
viewModel.triggerEvent(MoreEvent.OpenLog)
},
OrbotMenuAction(R.string.menu_log, R.drawable.ic_log) { showLog() },
OrbotMenuAction(R.string.v3_hosted_services, R.drawable.ic_menu_onion) {
startActivity(Intent(requireActivity(), OnionServiceActivity::class.java))
viewModel.triggerEvent(MoreEvent.OpenOnionServices)
},
OrbotMenuAction(R.string.v3_client_auth_activity_title, R.drawable.ic_shield) {
startActivity(Intent(requireActivity(), ClientAuthActivity::class.java))
viewModel.triggerEvent(MoreEvent.OpenClientAuth)
},
OrbotMenuAction(R.string.menu_about, R.drawable.ic_about) {
AboutDialogFragment().show(
requireActivity().supportFragmentManager,
AboutDialogFragment.Companion.TAG
)
viewModel.triggerEvent(MoreEvent.OpenAbout)
},
OrbotMenuAction(R.string.menu_exit, R.drawable.ic_exit) { doExit() }
OrbotMenuAction(R.string.menu_exit, R.drawable.ic_exit) {
viewModel.triggerEvent(MoreEvent.ExitApp)
}
)
rvMore.adapter = MoreActionAdapter(listItems)

rvMore.adapter = MoreActionAdapter(listItems)
val spanCount = if (resources.configuration.screenWidthDp < 600) 2 else 4
rvMore.layoutManager = GridLayoutManager(requireContext(), spanCount)

Expand All @@ -121,7 +137,7 @@ class MoreFragment : Fragment() {

AnimatorSet().apply {
playTogether(scaleX, scaleY, rotate)
setDuration(500)
duration = 500
interpolator = BounceInterpolator()
start()
}
Expand All @@ -130,14 +146,9 @@ class MoreFragment : Fragment() {
return view
}

private fun getTorVersion(): String {
return OrbotService.BINARY_TOR_VERSION.split("-").toTypedArray()[0]
}

private fun doExit() {
val killIntent = Intent(
requireActivity(), OrbotService::class.java
).setAction(OrbotConstants.ACTION_STOP)
val killIntent = Intent(requireActivity(), OrbotService::class.java)
.setAction(OrbotConstants.ACTION_STOP)
.putExtra(OrbotConstants.ACTION_STOP_FOREGROUND_TASK, true)
requireContext().sendIntentToService(killIntent)
requireActivity().finish()
Expand Down
71 changes: 71 additions & 0 deletions app/src/main/java/org/torproject/android/ui/more/MoreViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package org.torproject.android.ui.more

import android.content.Context
import android.content.pm.PackageManager

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope

import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.launch

import org.torproject.android.R
import org.torproject.android.service.OrbotService

class MoreViewModel : ViewModel() {
private val _statusText = MutableStateFlow("")
val statusText: StateFlow<String> = _statusText

private val _eventChannel = Channel<MoreEvent>(Channel.BUFFERED)
val events = _eventChannel.receiveAsFlow()

fun updateStatus(context: Context, httpPort: Int, socksPort: Int) {
val status = buildStatusString(context, httpPort, socksPort)
_statusText.value = status
}

fun triggerEvent(event: MoreEvent) {
viewModelScope.launch {
_eventChannel.send(event)
}
}

private fun buildStatusString(context: Context, httpPort: Int, socksPort: Int): String {
val sb = StringBuilder()
sb.append(context.getString(R.string.proxy_ports)).append(" ")

if (httpPort != -1 && socksPort != -1) {
sb.append("\nHTTP: $httpPort - SOCKS: $socksPort")
} else {
sb.append(": ").append(context.getString(R.string.ports_not_set))
}

sb.append("\n\n")

val pm = context.packageManager
val info = pm.getPackageInfo(context.packageName, PackageManager.GET_ACTIVITIES)

sb.append("${context.getString(R.string.app_name)} ${info.versionName}\n")
sb.append("Tor v${getTorVersion()}")

return sb.toString()
}

private fun getTorVersion(): String {
return OrbotService.BINARY_TOR_VERSION.split("-").toTypedArray()[0]
}
}

enum class MoreEvent {
OpenSettings,
OpenVpnSettings,
ChooseApps,
OpenLog,
OpenOnionServices,
OpenClientAuth,
OpenAbout,
ExitApp
}