From 1a5db98c78ee926d2a0e5ae17e51de547ffe3ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 16 Mar 2024 18:02:59 +0100 Subject: [PATCH] remove old error reporter --- .../Services/ReportService.java | 364 ------------------ .../Settings/LoggingSettingsFragment.java | 41 -- .../res/layout/settings_fragment_logging.xml | 96 ----- app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values-zh-rCN/strings.xml | 6 +- app/src/main/res/values/strings.xml | 6 +- 6 files changed, 3 insertions(+), 515 deletions(-) delete mode 100644 app/src/main/java/ca/pkay/rcloneexplorer/Services/ReportService.java diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Services/ReportService.java b/app/src/main/java/ca/pkay/rcloneexplorer/Services/ReportService.java deleted file mode 100644 index 8daf7efe..00000000 --- a/app/src/main/java/ca/pkay/rcloneexplorer/Services/ReportService.java +++ /dev/null @@ -1,364 +0,0 @@ -package ca.pkay.rcloneexplorer.Services; - -import static ca.pkay.rcloneexplorer.util.ActivityHelper.tryStartActivity; - -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.app.Service; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Build; -import android.os.IBinder; -import android.util.Log; - -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.NotificationCompat; -import androidx.core.content.FileProvider; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import ca.pkay.rcloneexplorer.BuildConfig; -import ca.pkay.rcloneexplorer.R; -import ca.pkay.rcloneexplorer.Rclone; -import ca.pkay.rcloneexplorer.util.FLog; - -/** - * A service for collecting bug reports. - */ -public class ReportService extends Service { - - private static final String TAG = "ReportCollectionService"; - - private static final String REPORT_HEADER = "RCX_BUG_REPORT_v0"; - - private static final String NOTIFICATION_CHANNEL = "ca.pkay.rcloneexplorer.reportcollector"; - - private static final int NOTIFICATION_ID = 201; - - /** - * Start collecting report data - */ - private static final String ACTION_START_COLLECTION = "ca.pkay.rcloneexplorer.Services.action.START_COLLECTION"; - /** - * Stop collecting report data - */ - private static final String ACTION_STOP_COLLECTION = "ca.pkay.rcloneexplorer.Services.action.STOP_COLLECTION"; - - /** - * Collect rclone log files - */ - private static final String EXTRA_RCLONE_LOGS = "ca.pkay.rcloneexplorer.Services.extra.RCLONE_LOGS"; - - /** - * Collect logcat data - */ - private static final String EXTRA_LOGCAT = "ca.pkay.rcloneexplorer.Services.extra.LOGCAT"; - - /** - * Collect configuration data - */ - private static final String EXTRA_CONFIG = "ca.pkay.rcloneexplorer.Services.extra.CONFIG"; - - private static final String EXTRA_COLL_TARGETS = "ca.pkay.rcloneexplorer.Services.extra.COLL_TARGETS"; - - private static final String EXTRA_LOGCAT_LEVEL = "ca.pkay.rcloneexplorer.Services.extra.LOGCAT_LVL"; - - public static final int RCLONE_LOGS = 2 << 0; - - public static final int LOGCAT = 2 << 1; - - public static final int CONFIG = 2 << 2; - - private volatile boolean reportRunning = false; - private int flags = 0; - private Thread logcatThread; - - @Retention(RetentionPolicy.SOURCE) - @IntDef(value = {RCLONE_LOGS, LOGCAT, CONFIG}, flag = true) - public @interface CollectionFlags { - } - - @Nullable - @Override - public IBinder onBind(Intent intent) { - return null; - } - - public static void startCollection(@NonNull Context context, @CollectionFlags int flags) { - Intent intent = new Intent(context, ReportService.class); - intent.setAction(ACTION_START_COLLECTION); - intent.putExtra(EXTRA_COLL_TARGETS, flags); - context.startService(intent); - } - - public static void stopCollection(@NonNull Context context) { - Intent intent = new Intent(context, ReportService.class); - intent.setAction(ACTION_STOP_COLLECTION); - context.startService(intent); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (null == intent) { - return START_STICKY; - } - - if (ACTION_START_COLLECTION.equals(intent.getAction()) && intent.hasExtra(EXTRA_COLL_TARGETS) && !reportRunning) { - int collectionTargets = intent.getIntExtra(EXTRA_COLL_TARGETS, RCLONE_LOGS | LOGCAT); - int logcatLevel = intent.getIntExtra(EXTRA_LOGCAT_LEVEL, Log.INFO); - handleStartCollection(getApplicationContext(), collectionTargets, logcatLevel); - } else if (ACTION_STOP_COLLECTION.equals(intent.getAction()) && reportRunning) { - handleStopCollection(getApplicationContext()); - } - return START_STICKY; - } - - private void handleStartCollection(Context context, @CollectionFlags int flags, int logLevel) { - FLog.d(TAG, "Starting collection (%d) (%d)", flags, logLevel); - this.reportRunning = true; - this.flags = flags; - - File baseDirectory = new File(context.getCacheDir(), "report"); - if (!baseDirectory.exists()) { - baseDirectory.mkdir(); - } - - if ((flags & LOGCAT) == LOGCAT) { - System.setProperty("log.tag.APP_MIN", Integer.toString(logLevel)); - String logcatFile = new File(baseDirectory, "logcat.log").getPath(); - logcatThread = new LogcatWatcherThread(logcatFile); - logcatThread.start(); - } - - int intentflags = 0; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - intentflags = PendingIntent.FLAG_IMMUTABLE; - } - Intent foregroundIntent = new Intent(this, ReportService.class); - PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, foregroundIntent, intentflags); - - Intent stopIntent = new Intent(this, StopCollectionReceiver.class); - - PendingIntent cancelPendingIntent = PendingIntent.getBroadcast(this, 0, stopIntent, intentflags); - - NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL) - .setSmallIcon(R.drawable.ic_bug_report) - .setContentTitle(getString(R.string.report_collection_title)) - .setPriority(NotificationCompat.PRIORITY_LOW) - .setContentText(getString(R.string.report_collection_collecting)) - .addAction(R.drawable.ic_baseline_stop_24, getString(R.string.report_collection_stop_collection), cancelPendingIntent); - - setNotificationChannel(); - startForeground(NOTIFICATION_ID, builder.build()); - - } - - private void setNotificationChannel() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL, "Bug Reporter", NotificationManager.IMPORTANCE_LOW); - channel.setDescription("Helps you to collect information about bugs."); - NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - if (notificationManager != null) { - notificationManager.createNotificationChannel(channel); - } - } - } - - private void handleStopCollection(Context context) { - FLog.d(TAG, "Stopping collection (%d)", flags); - if ((flags & LOGCAT) == LOGCAT) { - logcatThread.interrupt(); - } - packageReport(context); - reportRunning = false; - stopForeground(true); - stopSelf(); - } - - private void packageReport(Context context) { - File baseDirectory = new File(context.getCacheDir(), "report"); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH_mm_ss", Locale.US); - String fileName = "report-" + sdf.format(new Date()) + ".rcx-report"; - File reportZipFile = new File(baseDirectory, fileName); - boolean logcat = (flags & LOGCAT) == LOGCAT; - boolean rcloneLogs = (flags & RCLONE_LOGS) == RCLONE_LOGS; - try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(reportZipFile))) { - - zos.setComment(REPORT_HEADER); - - MetaData meta = new MetaData( - BuildConfig.VERSION_NAME, - BuildConfig.VERSION_CODE, - context.getPackageManager().getInstallerPackageName(context.getPackageName()), - new Rclone(context).getRcloneVersion(), - Build.VERSION.SDK_INT, - android.os.Build.MODEL, - android.os.Build.PRODUCT, - android.os.Build.MANUFACTURER, - android.os.Build.SUPPORTED_ABIS, - logcat, - rcloneLogs, - false - ); - File metaFile = new File(baseDirectory, meta.getFileName()); - ObjectMapper mapper = new ObjectMapper(); - mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.NON_PRIVATE); - mapper.writeValue(metaFile, meta); - addToZip(zos, metaFile); - - if (logcat) { - File logcatLog = new File(baseDirectory, "logcat.log"); - addToZip(zos, logcatLog); - } - - if (rcloneLogs) { - File logsTxt = new File(context.getExternalFilesDir("logs"), "log.txt"); - addToZip(zos, logsTxt); - - File rcdLogs = new File(context.getExternalFilesDir("logs"), "rcd.log"); - addToZip(zos, rcdLogs); - } - - zos.flush(); - zos.finish(); - } catch (FileNotFoundException e) { - FLog.e(TAG, "Report collection stopped: could not find file", e); - return; - } catch (IOException e) { - FLog.e(TAG, "Report collection stopped: I/O error", e); - return; - } - - Uri reportZipUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", reportZipFile); - Intent intent = new Intent(Intent.ACTION_SEND, reportZipUri); - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - tryStartActivity(context, intent); - } - - private void addToZip(ZipOutputStream base, File srcFile) throws IOException { - if (srcFile.exists() && srcFile.canRead()) { - ZipEntry zipEntry = new ZipEntry(srcFile.getName()); - base.putNextEntry(zipEntry); - try (FileInputStream fis = new FileInputStream(srcFile)) { - byte[] buf = new byte[4096]; - int len; - while ((len = fis.read(buf)) >= 0) { - base.write(buf, 0, len); - } - } - base.closeEntry(); - base.flush(); - } - } - - private void addToZip(ZipOutputStream base, ReportData model) throws IOException { - ZipEntry zipEntry = new ZipEntry(model.getFileName()); - base.putNextEntry(zipEntry); - ObjectMapper mapper = new ObjectMapper(); - mapper.writeValue(base, model); - base.closeEntry(); - } - - interface ReportData { - String getFileName(); - } - - static final class MetaData implements ReportData { - String appVersionName; - int appVersionCode; - String appInstaller; - String rcloneVersion; - int androidSdk; - String deviceModel; - String deviceProduct; - String deviceManufacturer; - String[] supportedABIs; - boolean logcat; - boolean rcloneLogs; - boolean config; - - public MetaData(String appVersionName, int appVersionCode, String appInstaller, String rcloneVersion, int androidSdk, String deviceModel, String deviceProduct, String deviceManufacturer, String[] supportedABIs, boolean logcat, boolean rcloneLogs, boolean config) { - this.appVersionName = appVersionName; - this.appVersionCode = appVersionCode; - this.appInstaller = appInstaller; - this.rcloneVersion = rcloneVersion; - this.androidSdk = androidSdk; - this.deviceModel = deviceModel; - this.deviceProduct = deviceProduct; - this.deviceManufacturer = deviceManufacturer; - this.supportedABIs = supportedABIs; - this.logcat = logcat; - this.rcloneLogs = rcloneLogs; - this.config = config; - } - - @Override - public String getFileName() { - return "metadata.json"; - } - } - - public static class StopCollectionReceiver extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - ReportService.stopCollection(context); - } - } - - static final class LogcatWatcherThread extends Thread { - - private final static int MAX_BUFFER = 165537; - private String filePath; - - public LogcatWatcherThread(String filePath) { - this.filePath = filePath; - } - - @Override - public void run() { - try { - Process process = Runtime.getRuntime().exec("logcat"); - try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - BufferedWriter bw = new BufferedWriter(new FileWriter(filePath), MAX_BUFFER)) { - FLog.d(TAG, "Retrieving logcat data"); - String line; - while (!interrupted() && (line = br.readLine()) != null) { - bw.write(line); - bw.newLine(); - } - bw.flush(); - process.destroy(); - } - } catch (IOException e) { - FLog.e(TAG, "Error starting logcat", e); - } - } - } -} diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java b/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java index a664ef98..774a1e12 100644 --- a/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java +++ b/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import android.widget.TextView; import android.widget.Toast; import java.io.BufferedReader; @@ -23,9 +22,7 @@ import java.util.regex.Pattern; import ca.pkay.rcloneexplorer.R; -import ca.pkay.rcloneexplorer.Services.ReportService; import ca.pkay.rcloneexplorer.util.FLog; -import es.dmoral.toasty.Toasty; public class LoggingSettingsFragment extends Fragment { @@ -34,11 +31,6 @@ public class LoggingSettingsFragment extends Fragment { private Context context; private Switch useLogsSwitch; private View useLogsElement; - private View crashReportsElement; - private TextView crashReportSummary; - private Switch crashReportsSwitch; - private View testReportElement; - private View startCollectionElement; private View sigquitElement; /** @@ -81,43 +73,19 @@ public void onAttach(Context context) { private void getViews(View view) { useLogsSwitch = view.findViewById(R.id.use_logs_switch); useLogsElement = view.findViewById(R.id.use_logs); - crashReportsElement = view.findViewById(R.id.crash_reporting); - crashReportsSwitch = view.findViewById(R.id.crash_reporting_switch); - crashReportSummary = view.findViewById(R.id.txt_crash_report_summary); - testReportElement = view.findViewById(R.id.send_test_report); - startCollectionElement = view.findViewById(R.id.start_report_collection); sigquitElement = view.findViewById(R.id.send_sigquit_to_rclone); } private void setDefaultStates() { SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); boolean useLogs = sharedPreferences.getBoolean(getString(R.string.pref_key_logs), false); - boolean crashReports = sharedPreferences.getBoolean(getString(R.string.pref_key_crash_reports), - getResources().getBoolean(R.bool.default_crash_log_enable)); useLogsSwitch.setChecked(useLogs); - crashReportsSwitch.setChecked(crashReports); - if (crashReports) { - - } else { - crashReportSummary.setText(getString(R.string.pref_crash_report_summary, "N/A")); - } } private void setClickListeners() { useLogsElement.setOnClickListener(v -> useLogsSwitch.setChecked(!useLogsSwitch.isChecked())); useLogsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> onUseLogsClicked(isChecked)); - crashReportsElement.setOnClickListener(v -> crashReportsSwitch.setChecked(!crashReportsSwitch.isChecked())); - crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> crashReportsClicked(isChecked)); - testReportElement.setOnClickListener(v -> FLog.e( - "TestReport", - "Sending test report, %s, %s, %s", - "/storage/0/private.file", - "content://authority/private.file", - "Non-filterd argument")); - startCollectionElement.setOnClickListener(v -> { - ReportService.startCollection(context, ReportService.RCLONE_LOGS | ReportService.LOGCAT); - }); sigquitElement.setOnClickListener(this::sigquitAll); } @@ -128,15 +96,6 @@ private void onUseLogsClicked(boolean isChecked) { editor.apply(); } - private void crashReportsClicked(boolean isChecked) { - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putBoolean(getString(R.string.pref_key_crash_reports), isChecked); - editor.apply(); - - Toasty.info(context, getString(R.string.restart_required), Toast.LENGTH_SHORT, true).show(); - } - private void sigquitAll(View view) { Toast.makeText(context, "RCX: Stopping everything", Toast.LENGTH_LONG).show(); try { diff --git a/app/src/main/res/layout/settings_fragment_logging.xml b/app/src/main/res/layout/settings_fragment_logging.xml index 48495f18..77edd769 100644 --- a/app/src/main/res/layout/settings_fragment_logging.xml +++ b/app/src/main/res/layout/settings_fragment_logging.xml @@ -57,102 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sprache auswählen Sprache wird beim nächsten neustart der App geändert. Rclone-Fehler protokollieren - Fehler werden in einer lokalen Datei protokolliert (Android/data/io.github.rcx/files/logs) + Fehler werden in einer lokalen Datei protokolliert (Android/data/de.felixnuesse.extract/files/logs) Benachrichtigungen Systemeinstellungen öffnen Kreis @@ -171,9 +171,6 @@ Erstelle öffentlichen Link Öffentlicher Link Link in Zwischenablage kopiert - Anonyme Absturzberichte senden - Test-Fehlerbericht senden - Testet die Fehlerberichterstattung Oben anheften Nicht mehr anheften Im Menü anheften diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c481e8df..24db1fa0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -132,7 +132,7 @@ 选择语言 语言更改将在重新启动应用后生效 记录 Rclone 错误 - 错误日志将会保存到本地文件夹 \'Android/data/de.felixnuesse.extract/files/logs\' + 错误日志将会保存到本地文件夹 (Android/data/de.felixnuesse.extract/files/logs) 消息通知 打开系统设置 圈 @@ -184,10 +184,6 @@ 正在生成公共链接 公共链接 链接已复制到剪贴板 - 发送匿名崩溃报告 - 通过发送错误和崩溃报告来帮助开发人员。详情见 https://x0b.github.io/rcx-privacy. \nID: %1$s. - 发送测试报告 - 向崩溃记录器发送测试报告 置顶 取消置顶 收藏 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c4a34e4c..e31d732c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -165,7 +165,7 @@ Changing the language will take effect after restarting the app locale Log rclone errors - Error logs will be saved to a local file at \'Android/data/de.felixnuesse.extract/files/logs\' + Error logs will be saved to a local file at (Android/data/de.felixnuesse.extract/files/logs) Notifications Open system settings circle @@ -222,10 +222,6 @@ Generating public link Public link Link copied to clipboard - Send anonymous crash reports - Help the devs by sending error and crash reports. See https://x0b.github.io/rcx-privacy. \nID: %1$s. - Send Test Report - Sends a test report to the crash logger Pin to the top Unpin Pin to drawer