From dd8e532547b05df61dd25132820f856cd746c534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Thu, 4 Aug 2016 17:21:49 +0200
Subject: [PATCH] #421 Code clean up
---
core/src/cz/nic/tablexia/Tablexia.java | 3 ++-
core/src/cz/nic/tablexia/TablexiaRaven.java | 1 -
desktop/build.gradle | 3 ---
ios/build.gradle | 1 -
ios/src/cz/nic/tablexia/IOSLauncher.java | 2 +-
5 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index 333a41375..4c1b4f3ea 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 {
});
if(TablexiaSettings.getInstance().getBuildType().isBugReport()) {
- String DSN = (TablexiaBuildConfig.SENTRY_DSN_FALLBACK == null || sentryDSN == null || sentryDSN.equals(TablexiaBuildConfig.SENTRY_DSN_FALLBACK)) ? null : sentryDSN;
+ @SuppressWarnings("ConstantConditions")
+ String DSN = (TablexiaBuildConfig.SENTRY_DSN_FALLBACK == null || sentryDSN == null || TablexiaBuildConfig.SENTRY_DSN_FALLBACK.equals(sentryDSN)) ? null : sentryDSN;
TablexiaRaven.start(DSN);
}
}
diff --git a/core/src/cz/nic/tablexia/TablexiaRaven.java b/core/src/cz/nic/tablexia/TablexiaRaven.java
index d2c6ed509..0334c1079 100644
--- a/core/src/cz/nic/tablexia/TablexiaRaven.java
+++ b/core/src/cz/nic/tablexia/TablexiaRaven.java
@@ -225,7 +225,6 @@ public class TablexiaRaven {
fis.close();
} catch (Exception e) {
e.printStackTrace();
- return null;
}
return event;
diff --git a/desktop/build.gradle b/desktop/build.gradle
index c05f144da..7c7be6b77 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -27,9 +27,7 @@ task debugJar(type: Jar) {
attributes 'Build-Type': 'debug'
attributes 'Version-Name': tablexiaVersionName
attributes 'Assets-Cheksums': getMapConvertedToString(rootProject.ext.assetsChecksum)
-
attributes 'Sentry-DSN': project.hasProperty('TABLEXIA_SENTRY_DSN_DEBUG') ? "$TABLEXIA_SENTRY_DSN_DEBUG" : "$project.sentryDSNFallbackValue";
- attributes 'Sentry-DSN-Fallback': "$project.sentryDSNFallbackValue";
}
}
}
@@ -47,7 +45,6 @@ task releaseJar(type: Jar) {
attributes 'Build-Type': 'release'
attributes 'Version-Name': tablexiaVersionName
attributes 'Assets-Cheksums': getMapConvertedToString(rootProject.ext.assetsChecksum)
-
attributes 'Sentry-DSN': project.hasProperty('TABLEXIA_SENTRY_DSN_RELEASE') ? "$TABLEXIA_SENTRY_DSN_RELEASE" : "$project.sentryDSNFallbackValue";
}
}
diff --git a/ios/build.gradle b/ios/build.gradle
index ff08c3aa2..7b94a0a1d 100644
--- a/ios/build.gradle
+++ b/ios/build.gradle
@@ -37,7 +37,6 @@ def updateRoboVMProperties(String buildType, String applicationId, String iconNa
// Extracts native libs (*.a) from the native-ios.jar and places them
// under build/libs/ios/.
-// also copies all '*.a' libraries from libs/ to build/libs/ios
task copyNatives << {
file("build/libs/ios/").mkdirs();
configurations.natives.files.each { jar ->
diff --git a/ios/src/cz/nic/tablexia/IOSLauncher.java b/ios/src/cz/nic/tablexia/IOSLauncher.java
index 0cdaa0217..8f3d61103 100644
--- a/ios/src/cz/nic/tablexia/IOSLauncher.java
+++ b/ios/src/cz/nic/tablexia/IOSLauncher.java
@@ -21,9 +21,9 @@ import java.util.Locale;
import cz.nic.tablexia.screen.loader.IConnectionManager;
public class IOSLauncher extends IOSApplication.Delegate {
+
private static final String TABLEXIA_BUILD_TYPE_KEY = "cz.nic.tablexia.BuildType";
private static final String TABLEXIA_SENTRY_DSN_KEY = "cz.nic.tablexia.SentryDSN";
- private static final String TABLEXIA_SENTRY_DSN_FALLBACK_KEY = "cz.nic.tablexia.SentryDSNFallback";
public static final Tablexia.SQLConnectionType SQL_CONNECTION_TYPE = new Tablexia.SQLConnectionType("SQLite.JDBCDriver", "jdbc:sqlite:");
private static final boolean HAS_SOFT_BACK_BUTTON = true;
--
GitLab