Skip to content

feat(diagnosis): add "Share diagnosis report" to Diagnosis and Logs menus #6638

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

Merged
mahibi merged 1 commit into from
Sep 3, 2026
Merged

feat(diagnosis): add "Share diagnosis report" to Diagnosis and Logs menus #6638

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
148 changes: 98 additions & 50 deletions app/src/main/java/com/nextcloud/talk/diagnosis/DiagnosisActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,26 @@ import android.content.ClipboardManager
import android.os.Bundle
import android.widget.Toast
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.displayCutoutPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import autodagger.AutoInjector
import com.nextcloud.talk.R
import com.nextcloud.talk.activities.BaseActivity
Expand All @@ -35,11 +40,14 @@ import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
import com.nextcloud.talk.components.ColoredStatusBar
import com.nextcloud.talk.components.StandardAppBar
import com.nextcloud.talk.data.network.NetworkMonitor
import com.nextcloud.talk.errorhandling.saveLogsAsZip
import com.nextcloud.talk.logger.LogsRepository
import com.nextcloud.talk.users.UserManager
import com.nextcloud.talk.utils.ClosedInterfaceImpl
import com.nextcloud.talk.utils.UnifiedPushUtils
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import javax.inject.Inject

@AutoInjector(NextcloudTalkApplication::class)
Expand Down Expand Up @@ -69,6 +77,18 @@ class DiagnosisActivity : BaseActivity() {
private val diagnosisData = mutableListOf<DiagnosisElement>()
private val diagnosisDataState = mutableStateOf(emptyList<DiagnosisElement>())

private val saveZipLauncher =
registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
if (uri != null) {
val diagnosisText = buildDiagnosisReportText(this, userManager, appPreferences, logsRepository)
lifecycleScope.launch(Dispatchers.IO) {
contentResolver.openOutputStream(uri)?.use { os ->
saveLogsAsZip(this@DiagnosisActivity, os, diagnosisText)
}
}
}
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
Expand All @@ -81,59 +101,19 @@ class DiagnosisActivity : BaseActivity() {
val isGooglePlayServicesAvailable = ClosedInterfaceImpl().isGooglePlayServicesAvailable
val useUnifiedPush = appPreferences.useUnifiedPush
val useEmbeddedDistrib = UnifiedPushUtils.hasEmbeddedDistributor(context) && !useUnifiedPush
val showTestPushButton = isGooglePlayServicesAvailable || useUnifiedPush || useEmbeddedDistrib

setContent {
val backgroundColor = colorResource(id = R.color.bg_default)

val menuItems = listOf(
stringResource(R.string.nc_common_copy) to { copyToClipboard(diagnosisData.toMarkdown()) }
DiagnosisScreen(
colorScheme = colorScheme,
networkMonitor = networkMonitor,
diagnosisData = diagnosisData,
diagnosisDataState = diagnosisDataState,
diagnosisViewModel = diagnosisViewModel,
showTestPushButton = showTestPushButton,
onCopyClick = ::copyToClipboard,
onShareReportClick = ::openShareReportDialog
)

MaterialTheme(
colorScheme = colorScheme
) {
val isOnline = networkMonitor.isOnline.collectAsState().value
ColoredStatusBar()
Scaffold(
modifier = Modifier
.statusBarsPadding()
.displayCutoutPadding(),
topBar = {
StandardAppBar(
title = stringResource(R.string.nc_settings_diagnosis_title),
menuItems
)
},
content = { paddingValues ->
val viewState = diagnosisViewModel.notificationViewState.collectAsState().value

Column(
Modifier
.background(backgroundColor)
.padding(
0.dp,
paddingValues.calculateTopPadding(),
0.dp,
paddingValues.calculateBottomPadding()
)
.fillMaxSize()
) {
DiagnosisContentComposable(
diagnosisDataState,
isLoading = diagnosisViewModel.isLoading.value,
showDialog = diagnosisViewModel.showDialog.value,
viewState = viewState,
onTestPushClick = { diagnosisViewModel.fetchTestPushResult() },
onDismissDialog = { diagnosisViewModel.dismissDialog() },
showTestPushButton = isGooglePlayServicesAvailable ||
useUnifiedPush ||
useEmbeddedDistrib,
isOnline = isOnline
)
}
}
)
}
}
}

Expand All @@ -154,6 +134,10 @@ class DiagnosisActivity : BaseActivity() {
diagnosisDataState.value = diagnosisData.toList()
}

private fun openShareReportDialog() {
showShareReportDialog(this, userManager, appPreferences, logsRepository, saveZipLauncher)
}

private fun copyToClipboard(text: String) {
val clipboardManager =
getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
Expand All @@ -174,3 +158,67 @@ class DiagnosisActivity : BaseActivity() {
val TAG = DiagnosisActivity::class.java.simpleName
}
}

@Suppress("LongParameterList")
@Composable
private fun DiagnosisScreen(
colorScheme: ColorScheme,
networkMonitor: NetworkMonitor,
diagnosisData: List<DiagnosisElement>,
diagnosisDataState: MutableState<List<DiagnosisElement>>,
diagnosisViewModel: DiagnosisViewModel,
showTestPushButton: Boolean,
onCopyClick: (String) -> Unit,
onShareReportClick: () -> Unit
) {
val backgroundColor = colorResource(id = R.color.bg_default)

val menuItems = listOf(
stringResource(R.string.nc_common_copy) to { onCopyClick(diagnosisData.toMarkdown()) },
stringResource(R.string.nc_settings_share_report_title) to onShareReportClick
)

MaterialTheme(
colorScheme = colorScheme
) {
val isOnline = networkMonitor.isOnline.collectAsState().value
ColoredStatusBar()
Scaffold(
modifier = Modifier
.statusBarsPadding()
.displayCutoutPadding(),
topBar = {
StandardAppBar(
title = stringResource(R.string.nc_settings_diagnosis_title),
menuItems
)
},
content = { paddingValues ->
val viewState = diagnosisViewModel.notificationViewState.collectAsState().value

Column(
Modifier
.background(backgroundColor)
.padding(
0.dp,
paddingValues.calculateTopPadding(),
0.dp,
paddingValues.calculateBottomPadding()
)
.fillMaxSize()
) {
DiagnosisContentComposable(
diagnosisDataState,
isLoading = diagnosisViewModel.isLoading.value,
showDialog = diagnosisViewModel.showDialog.value,
viewState = viewState,
onTestPushClick = { diagnosisViewModel.fetchTestPushResult() },
onDismissDialog = { diagnosisViewModel.dismissDialog() },
showTestPushButton = showTestPushButton,
isOnline = isOnline
)
}
}
)
}
}
177 changes: 177 additions & 0 deletions app/src/main/java/com/nextcloud/talk/diagnosis/ShareDiagnosisReportDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
/*
* Nextcloud Talk - Android Client
*
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package com.nextcloud.talk.diagnosis

import android.app.Activity
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context.CLIPBOARD_SERVICE
import android.content.Intent
import android.util.TypedValue
import android.view.View
import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.TextView
import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher
import androidx.appcompat.app.AlertDialog
import androidx.core.net.toUri
import com.google.android.material.color.MaterialColors
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.nextcloud.talk.R
import com.nextcloud.talk.errorhandling.shareLogsAndDiagnosis
import com.nextcloud.talk.logger.LogsRepository
import com.nextcloud.talk.users.UserManager
import com.nextcloud.talk.utils.BrandingUtils
import com.nextcloud.talk.utils.preferences.AppPreferences

private const val DIALOG_PADDING_H_DP = 24
private const val DIALOG_PADDING_V_DP = 16
private const val DIALOG_SPACING_DP = 8

fun showShareReportDialog(
activity: Activity,
userManager: UserManager,
appPreferences: AppPreferences,
logsRepository: LogsRepository,
saveZipLauncher: ActivityResultLauncher<String>
) {
val options = buildShareReportOptions(activity, userManager, appPreferences, logsRepository, saveZipLauncher)
var dialog: AlertDialog? = null
val view = buildShareDialogContentView(activity, options) { dialog?.dismiss() }
dialog = MaterialAlertDialogBuilder(activity)
.setTitle(R.string.nc_settings_share_report_title)
.setView(view)
.show()
}

private fun buildShareReportOptions(
activity: Activity,
userManager: UserManager,
appPreferences: AppPreferences,
logsRepository: LogsRepository,
saveZipLauncher: ActivityResultLauncher<String>
): List<Pair<String, () -> Unit>> {
val options = mutableListOf(
activity.getString(R.string.nc_logs_share) to {
val diagnosisText = buildDiagnosisReportText(activity, userManager, appPreferences, logsRepository)
shareLogsAndDiagnosis(
context = activity,
subject = activity.getString(
R.string.nc_logs_share_subject,
activity.getString(R.string.nc_app_product_name)
),
diagnosisText = diagnosisText
)
},
activity.getString(R.string.nc_logs_download_zip) to {
saveZipLauncher.launch("nc_talk_logs.zip")
}
)
if (BrandingUtils.isOriginalNextcloudClient(activity.applicationContext)) {
options.add(
activity.getString(R.string.create_issue) to {
val diagnosisText = buildDiagnosisReportText(activity, userManager, appPreferences, logsRepository)
val clipboard = activity.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
clipboard.setPrimaryClip(
ClipData.newPlainText(activity.getString(R.string.nc_app_product_name), diagnosisText)
)
Toast.makeText(
activity,
activity.getString(R.string.nc_common_copy_success),
Toast.LENGTH_LONG
).show()
activity.startActivity(
Intent(Intent.ACTION_VIEW, activity.getString(R.string.nc_talk_android_issues_url).toUri())
)
}
)
}
return options
}

@Suppress("Detekt.LongMethod")
fun buildDiagnosisReportText(
activity: Activity,
userManager: UserManager,
appPreferences: AppPreferences,
logsRepository: LogsRepository
): String =
buildDiagnosisElements(
context = activity,
userManager = userManager,
appPreferences = appPreferences,
logsRepository = logsRepository
).toMarkdown()

@Suppress("LongMethod")
private fun buildShareDialogContentView(
activity: Activity,
options: List<Pair<String, () -> Unit>>,
onDismiss: () -> Unit
): ScrollView {
val density = activity.resources.displayMetrics.density
fun dp(value: Int) = (value * density).toInt()
val selectableBackground = with(TypedValue()) {
activity.theme.resolveAttribute(android.R.attr.selectableItemBackground, this, true)
resourceId
}
val list = LinearLayout(activity).apply {
orientation = LinearLayout.VERTICAL
addView(
TextView(activity).apply {
text = activity.getString(R.string.nc_logs_advanced_logging_privacy_warning)
val h = dp(DIALOG_PADDING_H_DP)
val v = dp(DIALOG_PADDING_V_DP)
setPadding(h, v, h, v)
setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyMedium)
}
)
addView(
View(activity).apply {
layoutParams = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(1)
).also { it.setMargins(0, 0, 0, dp(DIALOG_SPACING_DP)) }
setBackgroundColor(
MaterialColors.getColor(
activity,
com.google.android.material.R.attr.colorOutlineVariant,
0
)
)
}
)
options.forEach { (label, action) ->
addView(
TextView(activity).apply {
text = label
val h = dp(DIALOG_PADDING_H_DP)
val v = dp(DIALOG_PADDING_V_DP)
setPadding(h, v, h, v)
setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyLarge)
setBackgroundResource(selectableBackground)
isClickable = true
isFocusable = true
setOnClickListener {
onDismiss()
action()
}
}
)
}
addView(
View(activity).apply {
layoutParams = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(DIALOG_SPACING_DP)
)
}
)
}
return ScrollView(activity).apply { addView(list) }
}
Loading
Loading