Add standard and gplay product flavor

app/build.gradle

@@ -17,12 +17,19 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 105
+        versionCode 106
         versionName "1.1.1.1"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
 
+    productFlavors {
+        standard {}
+        gplay {
+            versionName "1.1.1.1-gplay"
+        }
+    }
+
     buildTypes {
         debug {
             minifyEnabled false

app/src/gplay/res/menu/activity_accounts_drawer.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<menu xmlns:tools="http://schemas.android.com/tools"
+      xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/nav_about"
+        android:icon="@drawable/ic_info_dark"
+        android:title="@string/navigation_drawer_about"/>
+    <item
+        android:id="@+id/nav_app_settings"
+        android:icon="@drawable/ic_settings_dark"
+        android:title="@string/navigation_drawer_settings"/>
+
+    <item android:title="@string/navigation_drawer_news_updates">
+        <menu>
+            <item
+                android:id="@+id/nav_twitter"
+                android:icon="@drawable/twitter"
+                android:title="\@davdroidapp"
+                tools:ignore="HardcodedText"/>
+        </menu>
+    </item>
+
+    <item android:title="@string/navigation_drawer_external_links">
+        <menu>
+            <item
+                android:id="@+id/nav_website"
+                android:icon="@drawable/ic_home_dark"
+                android:title="@string/navigation_drawer_website"/>
+            <item
+                android:id="@+id/nav_faq"
+                android:icon="@drawable/ic_help_dark"
+                android:title="@string/navigation_drawer_faq"/>
+            <item
+                android:id="@+id/nav_forums"
+                android:icon="@drawable/ic_forum_dark"
+                android:title="@string/navigation_drawer_forums"/>
+            <item
+                android:id="@+id/nav_donate"
+                android:icon="@drawable/ic_attach_money_dark"
+                android:title="(entry disabled)"
+                android:visible="false"
+                tools:ignore="HardcodedText"/>
+        </menu>
+    </item>
+
+</menu>

app/src/main/java/at/bitfire/davdroid/App.java

@@ -38,6 +38,8 @@ import lombok.Getter;
 import okhttp3.internal.tls.OkHostnameVerifier;
 
 public class App extends Application {
+    public static final String FLAVOR_GOOGLE_PLAY = "gplay";
+
     public static final String LOG_TO_EXTERNAL_STORAGE = "logToExternalStorage";
 
     @Getter

app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java

@@ -10,6 +10,7 @@ package at.bitfire.davdroid.ui;
 
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
@@ -22,6 +23,8 @@ import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 
+import at.bitfire.davdroid.App;
+import at.bitfire.davdroid.BuildConfig;
 import at.bitfire.davdroid.Constants;
 import at.bitfire.davdroid.R;
 import at.bitfire.davdroid.ui.setup.LoginActivity;
@@ -93,7 +96,8 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
                 startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("forums/").build()));
                 break;
             case R.id.nav_donate:
-                startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build()));
+                if (!App.FLAVOR_GOOGLE_PLAY.equals(BuildConfig.FLAVOR))
+                    startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build()));
                 break;
         }
 

app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java

@@ -59,14 +59,17 @@ public class StartupDialogFragment extends DialogFragment {
             dialogs.add(StartupDialogFragment.instantiate(Mode.DEVELOPMENT_VERSION));
         else {
             // store-specific information
-            final String installedFrom = installedFrom(context);
+            if (App.FLAVOR_GOOGLE_PLAY.equals(BuildConfig.FLAVOR)) {
-            if (installedFrom == null || installedFrom.startsWith("org.fdroid"))
+                // Play store
-                dialogs.add(StartupDialogFragment.instantiate(Mode.FDROID_DONATE));
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP &&    // only on Android <5
-
-            else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP &&    // only on Android <5
-                    "com.android.vending".equals(installedFrom) &&              // only when installed from Play Store
                     settings.getBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, true))      // and only when "Don't show again" hasn't been clicked yet
-                dialogs.add(StartupDialogFragment.instantiate(Mode.GOOGLE_PLAY_ACCOUNTS_REMOVED));
+                    dialogs.add(StartupDialogFragment.instantiate(Mode.GOOGLE_PLAY_ACCOUNTS_REMOVED));
+            } else {
+                // other stores
+                final String installedFrom = installedFrom(context);
+                if (installedFrom == null || installedFrom.startsWith("org.fdroid"))
+                    dialogs.add(StartupDialogFragment.instantiate(Mode.FDROID_DONATE));
+            }
         }
 
         // OpenTasks information

run-tests-connected.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-./gradlew -i testDebug && \
+./gradlew -i check mergeAndroidReports --continue
-	./gradlew -i deviceCheck mergeAndroidReports --continue