From ffe118a18e6da5a0aaa4fda47212459b567407ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Drahom=C3=ADr=20Karch=C5=88=C3=A1k?=
<drahomir.karchnak@nic.cz>
Date: Tue, 2 Aug 2016 09:42:55 +0200
Subject: [PATCH] #421 Report files are hidden. Refactoring...
---
core/src/cz/nic/tablexia/Tablexia.java | 3 ++-
core/src/cz/nic/tablexia/TablexiaRaven.java | 26 ++++++++++-----------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index fce6c11f5..9d8809271 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -113,7 +113,8 @@ public class Tablexia extends TablexiaApplication {
}
});
- TablexiaRaven.start();
+ if(TablexiaSettings.getInstance().getBuildType().isBugReport())
+ TablexiaRaven.start(TablexiaBuildConfig.SENTRY_DSN_KEY);
}
private void loadingComplete() {
diff --git a/core/src/cz/nic/tablexia/TablexiaRaven.java b/core/src/cz/nic/tablexia/TablexiaRaven.java
index b56b9c273..4274a518f 100644
--- a/core/src/cz/nic/tablexia/TablexiaRaven.java
+++ b/core/src/cz/nic/tablexia/TablexiaRaven.java
@@ -147,7 +147,8 @@ public class TablexiaRaven {
* Reports Manager - Saves and Resends reports later
*/
private static class ReportsManager extends TablexiaAbstractFileManager {
- private static final String REPORT_FILE_EXTENSION = ".TablexiaReport";
+ private static final String REPORT_FILE_EXTENSION = ".TablexiaReport";
+ private static final boolean HIDE_REPORT_FILES = true;
public ReportsManager() {
super(ReportStorageType.EXTERNAL);
@@ -155,7 +156,7 @@ public class TablexiaRaven {
public void storeRavenEvent(Event event) {
try {
- String fileName = event.getId().toString() + REPORT_FILE_EXTENSION;
+ String fileName = (HIDE_REPORT_FILES ? "." : "") + event.getId().toString() + REPORT_FILE_EXTENSION;
File dir = TablexiaAbstractFileManager.getFileStoragePathFileHandle(ReportStorageType.EXTERNAL).file();
if(!dir.exists()) dir.mkdir();
@@ -245,12 +246,10 @@ public class TablexiaRaven {
return instance != null;
}
- public static void start() {
- if(TablexiaBuildConfig.SENTRY_DSN_KEY == null || !TablexiaSettings.getInstance().getBuildType().isBugReport() || instance != null) {
- return;
- }
+ public static void start(String DSN) {
+ if(DSN == null || instance != null) return;
- instance = new TablexiaRaven(TablexiaBuildConfig.SENTRY_DSN_KEY);
+ instance = new TablexiaRaven(DSN);
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
@@ -273,10 +272,11 @@ public class TablexiaRaven {
}
private void addEventSendFailureCallback(EventSendFailureCallback eventSendFailureCallback) {
- if(!isStarted()) return;
-
- if(eventSendFailureCallback != null) {
- if(!sendFailureCallbacks.contains(eventSendFailureCallback)) sendFailureCallbacks.add(eventSendFailureCallback);
+ if(isStarted()) {
+ if (eventSendFailureCallback != null) {
+ if (!sendFailureCallbacks.contains(eventSendFailureCallback))
+ sendFailureCallbacks.add(eventSendFailureCallback);
+ }
}
}
@@ -297,8 +297,6 @@ public class TablexiaRaven {
}
private void sentEvent(Event e) {
- if(!isStarted() || e == null) return;
-
- instance.raven.sendEvent(e);
+ if(isStarted() && e != null) instance.raven.sendEvent(e);
}
}
\ No newline at end of file
--
GitLab