From aadcb5a63b89ad8c2b32e4d640e81a9e3ef538e0 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 20 May 2019 17:48:16 +0200
Subject: [PATCH] Remove donation links for Google Release

---
 app/build.gradle                                    |  2 ++
 .../fedilab/android/activities/AboutActivity.java   | 13 +++++++++++++
 .../android/activities/BaseMainActivity.java        | 11 +++++++++++
 build.gradle                                        |  2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 299224a2c..9a345c9a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,9 +36,11 @@ android {
     productFlavors {
         fdroid {
             applicationId "fr.gouv.etalab.mastodon"
+            buildConfigField "boolean", "DONATIONS", "true"
         }
         playstore {
             applicationId "app.fedilab.android"
+            buildConfigField "boolean", "DONATIONS", "false"
         }
     }
     packagingOptions {
diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
index b62d311b6..265fb1e5f 100644
--- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
@@ -38,6 +38,7 @@ import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;
 
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.client.Entities.Relationship;
@@ -209,6 +210,11 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
                 startActivity(browserIntent);
             }
         });
+        if(BuildConfig.DONATIONS){
+            about_support.setVisibility(View.VISIBLE);
+        }else{
+            about_support.setVisibility(View.GONE);
+        }
 
         Button paypal = findViewById(R.id.about_support_paypal);
         paypal.setOnClickListener(new View.OnClickListener() {
@@ -219,6 +225,13 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
             }
         });
 
+        if(BuildConfig.DONATIONS){
+            paypal.setVisibility(View.VISIBLE);
+        }else{
+            paypal.setVisibility(View.GONE);
+        }
+
+
 
         TextView about_website = findViewById(R.id.about_website);
         about_website.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index d5908f1f5..4fa771ffd 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -72,6 +72,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Filters;
@@ -1055,6 +1056,13 @@ public abstract class BaseMainActivity extends BaseActivity
                 navigationView.getMenu().findItem(R.id.nav_list).setVisible(false);
             }
         }
+        if (!BuildConfig.DONATIONS) {
+            MenuItem openCollectiveItem = navigationView.getMenu().findItem(R.id.nav_opencollective);
+            if( openCollectiveItem != null){
+                openCollectiveItem.setVisible(false);
+            }
+
+        }
 
         LinearLayout owner_container = headerLayout.findViewById(R.id.main_header_container);
         owner_container.setOnClickListener(new View.OnClickListener() {
@@ -1135,6 +1143,8 @@ public abstract class BaseMainActivity extends BaseActivity
             // Retrieves filters
             new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
+
+
     }
 
     private void manageTimelineList(boolean displayed){
@@ -1705,6 +1715,7 @@ public abstract class BaseMainActivity extends BaseActivity
     }
 
 
+
     @Override
     public void onRetrieveMetaData(boolean error, String sharedSubject, String sharedText, String image, String title, String description) {
         Bundle b = new Bundle();
diff --git a/build.gradle b/build.gradle
index 748746728..5ea98810f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files