Merge branch 'epic18-standalone_trackers_alone' into 'main'

epic18: Trackers control on standalone app (without Ipscrambling).

See merge request e/os/advanced-privacy!147

2 files changed, 23 insertions, 1 deletions

diff --git a/app/src/main/java/foundation/e/advancedprivacy/common/BuildFlavor.kt b/app/src/main/java/foundation/e/advancedprivacy/common/BuildFlavor.kt
new file mode 100644
index 0000000..ecb24ce
--- /dev/null
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/BuildFlavor.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 MURENA SAS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.advancedprivacy.common
+
+import foundation.e.advancedprivacy.BuildConfig
+
+const val isStandaloneBuild: Boolean = BuildConfig.FLAVOR == "standalone"
diff --git a/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt b/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt
index 80fc760..589aa74 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt
@@ -75,7 +75,7 @@ class WarningDialog : AppCompatActivity() {
         val feature = try {
             intent.getParcelableExtra<ShowFeaturesWarning>(PARAM_FEATURE)!!
         } catch (e: Exception) {
-            Timber.e("Missing mandatory activity parameter", e)
+            Timber.e(e, "Missing mandatory activity parameter")
             finish()
             return
         }