@@ -8,12 +8,12 @@ import android.app.NotificationManager
8
8
import android.content.ClipData
9
9
import android.content.ClipboardManager
10
10
import android.graphics.Bitmap
11
+ import android.os.Build
11
12
import android.util.Log
12
13
import android.view.View
13
14
import android.view.animation.AlphaAnimation
14
15
import android.view.animation.Animation
15
16
import android.view.animation.LinearInterpolator
16
- import android.widget.FrameLayout
17
17
import androidx.camera.core.CameraSelector
18
18
import androidx.camera.core.ImageCapture
19
19
import androidx.camera.core.ImageCaptureException
@@ -22,6 +22,7 @@ import app.grapheneos.camera.CapturedItem
22
22
import app.grapheneos.camera.R
23
23
import app.grapheneos.camera.ui.activities.MainActivity
24
24
import app.grapheneos.camera.ui.activities.SecureMainActivity
25
+ import app.grapheneos.camera.util.printStackTraceToString
25
26
26
27
private const val imageFileFormat = " .jpg"
27
28
var isTakingPicture: Boolean = false
@@ -198,12 +199,16 @@ class ImageCapturer(val mActivity: MainActivity) {
198
199
AlertDialog .Builder (ctx).apply {
199
200
setMessage(message)
200
201
setPositiveButton(R .string.show_details) { _, _ ->
201
- val list = exception.asStringList()
202
+ val pkgName = ctx.packageName
203
+ val pkgVersion = ctx.packageManager.getPackageInfo(pkgName, 0 ).longVersionCode
204
+ val text = " osVersion: ${Build .FINGERPRINT } " +
205
+ " \n package: $pkgName :$pkgVersion " +
206
+ " \n\n ${exception.printStackTraceToString()} "
202
207
203
208
AlertDialog .Builder (ctx).apply {
204
- setItems(list .toTypedArray(), null )
209
+ setItems(text.lines() .toTypedArray(), null )
205
210
setNeutralButton(R .string.copy_to_clipboard) { _, _ ->
206
- val clipData = ClipData .newPlainText(exception.javaClass.name, list.joinToString( " \n " ) )
211
+ val clipData = ClipData .newPlainText(exception.javaClass.name, text )
207
212
val cm = mActivity.getSystemService(ClipboardManager ::class .java)
208
213
cm.setPrimaryClip(clipData)
209
214
ctx.showMessage(R .string.copied_text_to_clipboard)
0 commit comments