Add donation variant

7 files changed, 36 insertions, 1 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 68e5dd5..c35685e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,6 +77,10 @@ android {
             dimension "release"
             applicationId "se.lublin.mumla"
         }
+        donation {
+            dimension "release"
+            applicationId "se.lublin.mumla.donation"
+        }
         beta {
             dimension "release"
             applicationId "se.lublin.mumla.beta"
diff --git a/app/src/donation/AndroidManifest.xml b/app/src/donation/AndroidManifest.xml
new file mode 100644
index 0000000..4e829bb
--- /dev/null
+++ b/app/src/donation/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <provider
+            android:name="se.lublin.mumla.channel.ChannelSearchProvider"
+            android:authorities="se.lublin.mumla.donation.channel.ChannelSearchProvider"
+            android:exported="false" />
+    </application>
+</manifest>
diff --git a/app/src/donation/res/values/strings_notranslate.xml b/app/src/donation/res/values/strings_notranslate.xml
new file mode 100644
index 0000000..2356934
--- /dev/null
+++ b/app/src/donation/res/values/strings_notranslate.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Mumla*</string>
+</resources>
diff --git a/app/src/donation/res/xml/searchable.xml b/app/src/donation/res/xml/searchable.xml
new file mode 100644
index 0000000..5e50062
--- /dev/null
+++ b/app/src/donation/res/xml/searchable.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/app_name"
+    android:hint="@string/searchHint"
+    android:searchSuggestAuthority="se.lublin.mumla.donation.channel.ChannelSearchProvider"
+    android:searchSuggestSelection=" ?"
+    android:searchSuggestThreshold="1"
+    android:searchSuggestIntentAction="android.intent.action.SEARCH"
+    android:inputType="textNoSuggestions"
+    android:imeOptions="actionNone">
+</searchable>
diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index d377aae..ae71c5b 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -478,7 +478,11 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
         if(mSettings.isUsingCertificate()) return;
         AlertDialog.Builder adb = new AlertDialog.Builder(this);
         adb.setTitle(R.string.first_run_generate_certificate_title);
-        adb.setMessage(R.string.first_run_generate_certificate);
+        String msg = getString(R.string.first_run_generate_certificate);
+        if (BuildConfig.FLAVOR.equals("donation")) {
+            msg = getString(R.string.donation_thanks) + "\n\n" + msg;
+        }
+        adb.setMessage(msg);
         adb.setPositiveButton(R.string.generate, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/se/lublin/mumla/preference/Preferences.java b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
index 2e8b705..9b87c45 100644
--- a/app/src/main/java/se/lublin/mumla/preference/Preferences.java
+++ b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
@@ -140,6 +140,8 @@ public class Preferences extends PreferenceActivity {
                 f.setTimeZone(TimeZone.getTimeZone("UTC"));
                 version += ("\nBeta flavor, versioncode: " + info.versionCode
                         + "\nbuildtime: " + f.format(new Date(BuildConfig.TIMESTAMP)) + " UTC");
+            } else if (BuildConfig.FLAVOR.equals("donation")) {
+                version += "\n\n*) " + context.getString(R.string.donation_thanks);
             }
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69ad211..3109b9d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -270,6 +270,7 @@
     <string name="orbot_not_installed">The Orbot app is not installed. Not using Tor.</string>
     <string name="orbot_tor_failed">Could not connect to local Tor proxy on port %d (SOCKS).\n\nPlease ensure that the Orbot app is running.</string>
     <string name="default_">Default</string>
+    <string name="donation_thanks">Thank you for the donation.</string>
 
     <plurals name="search_channel_users">
         <item quantity="one">%d user</item>