From 6911fbd124720c7558211090056ee250e66a41dc Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 1 Dec 2020 16:09:14 +0100
Subject: [PATCH] Limits some actions

---
 app/build.gradle                              | 10 ++++++++++
 .../app/fedilab/fedilabtube/MainActivity.java | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3b320b1..276d8d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,30 +46,40 @@ android {
             buildConfigField "String", "version", "\"fdroid_acad\""
             buildConfigField "boolean", "full_instances", "false"
             buildConfigField "boolean", "google_restriction", "false"
+            buildConfigField "boolean", "surfing_mode", "false"
+            buildConfigField "boolean", "sepia_search", "false"
         }
         google_acad {
             applicationId "app.fedilab.fedilabtube"
             buildConfigField "String", "version", "\"google_acad\""
             buildConfigField "boolean", "full_instances", "false"
             buildConfigField "boolean", "google_restriction", "true"
+            buildConfigField "boolean", "surfing_mode", "false"
+            buildConfigField "boolean", "sepia_search", "false"
         }
         fdroid_full {
             applicationId "app.fedilab.tubelab"
             buildConfigField "String", "version", "\"fdroid_full\""
             buildConfigField "boolean", "full_instances", "true"
             buildConfigField "boolean", "google_restriction", "false"
+            buildConfigField "boolean", "surfing_mode", "true"
+            buildConfigField "boolean", "sepia_search", "true"
         }
         google_full {
             applicationId "app.fedilab.tubelab"
             buildConfigField "String", "version", "\"google_full\""
             buildConfigField "boolean", "full_instances", "true"
             buildConfigField "boolean", "google_restriction", "true"
+            buildConfigField "boolean", "surfing_mode", "true"
+            buildConfigField "boolean", "sepia_search", "true"
         }
         bittube {
             applicationId "app.fedilab.bittube"
             buildConfigField "String", "version", "\"google_full\""
             buildConfigField "boolean", "full_instances", "true"
             buildConfigField "boolean", "google_restriction", "true"
+            buildConfigField "boolean", "surfing_mode", "false"
+            buildConfigField "boolean", "sepia_search", "false"
         }
     }
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
index 86c6c95..2d617e8 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
@@ -28,7 +28,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -265,6 +264,9 @@ public class MainActivity extends AppCompatActivity {
 
 
         toolbar.setOnClickListener(v -> {
+            if (binding.viewpager.getAdapter() == null) {
+                return;
+            }
             if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayVideosFragment) {
                 ((DisplayVideosFragment) binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem())).scrollToTop();
             } else if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayOverviewFragment) {
@@ -446,18 +448,17 @@ public class MainActivity extends AppCompatActivity {
         MenuItem instanceItem = menu.findItem(R.id.action_change_instance);
         MenuItem accountItem = menu.findItem(R.id.action_account);
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        ImageView instances = toolbar.findViewById(R.id.instances);
-        if (BuildConfig.full_instances && ((Helper.isLoggedIn(MainActivity.this) && typeOfConnection == NORMAL) || typeOfConnection == SURFING)) {
-            instances.setVisibility(View.VISIBLE);
-            instances.setOnClickListener(null);
-            instances.setOnClickListener(v -> {
+
+        if (BuildConfig.surfing_mode && ((Helper.isLoggedIn(MainActivity.this) && typeOfConnection == NORMAL) || typeOfConnection == SURFING)) {
+            binding.instances.setVisibility(View.VISIBLE);
+            binding.instances.setOnClickListener(null);
+            binding.instances.setOnClickListener(v -> {
                 Intent intent = new Intent(MainActivity.this, ManageInstancesActivity.class);
                 startActivity(intent);
                 overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
             });
         } else {
-            instances.setVisibility(View.GONE);
+            binding.instances.setVisibility(View.GONE);
         }
         switch (typeOfConnection) {
             case UNKNOWN:
@@ -510,7 +511,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
 
-        if (!BuildConfig.full_instances) {
+        if (!BuildConfig.sepia_search) {
             sepiaSearchItem.setVisible(false);
         }
         return true;