load Sentry DSN from sentry.properties

opacapp · Jul 7, 2020 · 7f6a297 · 7f6a297
1 parent f786ab2
commit 7f6a297
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/opacclient/opacapp/build.gradle b/opacclient/opacapp/build.gradle
@@ -26,16 +26,27 @@ android {
         }
     }
 
+    // load Sentry configuration from sentry.properties file, if it exists
+    def sentryProps = new Properties()
+    def sentryPropsFile = project.rootProject.file("sentry.properties")
+    String dsn = null;
+    if (sentryPropsFile.exists()) {
+        sentryProps.load(sentryPropsFile.newDataInputStream())
+        dsn = sentryProps.getProperty("dsn")
+    }
+
     buildTypes {
         release {
             minifyEnabled true
             signingConfig signingConfigs.release
             proguardFiles 'proguard-rules.txt'
+            buildConfigField("String", "SENTRY_DSN", dsn != null ? "\"$dsn\"" : "null")
         }
         debug {
             debuggable true
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
+            buildConfigField("String", "SENTRY_DSN", "null")
         }
     }
 

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/OpacClient.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/OpacClient.java
@@ -29,7 +29,6 @@
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
 
 import org.joda.time.DateTime;
@@ -53,6 +52,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 import androidx.multidex.MultiDex;
+import androidx.preference.PreferenceManager;
 import de.geeksfactory.opacclient.apis.OpacApi;
 import de.geeksfactory.opacclient.frontend.AccountListActivity;
 import de.geeksfactory.opacclient.frontend.LibraryListActivity;
@@ -373,8 +373,10 @@ public void onCreate() {
 
         sp = PreferenceManager.getDefaultSharedPreferences(this);
 
-        if (!BuildConfig.DEBUG) {
-            SentryAndroid.init(this);
+        if (BuildConfig.SENTRY_DSN != null) {
+            SentryAndroid.init(this, options -> {
+                options.setDsn(BuildConfig.SENTRY_DSN);
+            });
             if (getLibrary() != null) {
                 Sentry.setTag(SENTRY_LIBRARY, getLibrary().getIdent());
             }