solved merge conflict

1 files changed, 14 insertions, 0 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 1ade8155..09858cd2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,20 @@ android {
     resValue "string", "app_name", "Bitmask"
     vectorDrawables.useSupportLibrary = true
     buildConfigField 'boolean', 'openvpn3', 'false'
+
+    //Build Config Fields for default donation details
+
+    //This is the default donation URL and should be set to the donation page of LEAP
+    // and this should not be set/altered anywhere else.
+    buildConfigField 'String', 'default_donation_url', '"https://leap.se/en/about-us/donate"'
+    //This is the donation URL and should be set to the relevant donation page.
+    buildConfigField 'String', 'donation_url', 'null'
+    //The field to enable donations in the app.
+    buildConfigField 'boolean', 'enable_donation', 'true'
+    //The field to enable donation reminder popup in the app if enable_donation is set to 'false' this will be disabled.
+    buildConfigField 'boolean', 'enable_donation_reminder', 'true'
+    //The duration in days to trigger the donation reminder
+    buildConfigField 'int', 'donation_reminder_duration', '30'
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     dexOptions {
       jumboMode true