浏览代码

Check capability

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 年之前
父节点
当前提交
3cd56c7b8b

+ 7 - 1
app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -366,6 +366,12 @@ public abstract class DrawerActivity extends ToolbarActivity
                 ecosystemApps.findViewById(R.id.drawer_ecosystem_assistant),
             };
 
+            if (getCapabilities() != null && getCapabilities().getAssistant().isTrue() && !getResources().getBoolean(R.bool.is_branded_client)) {
+                views[3].setVisibility(View.VISIBLE);
+            } else {
+                views[3].setVisibility(View.GONE);
+            }
+
             views[0].setOnClickListener(v -> openAppOrStore("it.niedermann.owncloud.notes"));
             views[1].setOnClickListener(v -> openAppOrStore("com.nextcloud.talk2"));
             views[2].setOnClickListener(v -> openAppStore("Nextcloud", true));
@@ -471,7 +477,7 @@ public abstract class DrawerActivity extends ToolbarActivity
         DrawerMenuUtil.filterTrashbinMenuItem(menu, capability);
         DrawerMenuUtil.filterActivityMenuItem(menu, capability);
         DrawerMenuUtil.filterGroupfoldersMenuItem(menu, capability);
-        DrawerMenuUtil.filterAssistantMenuItem(menu, capability);
+        DrawerMenuUtil.filterAssistantMenuItem(menu, capability, getResources());
         DrawerMenuUtil.setupHomeMenuItem(menu, getResources());
 
         DrawerMenuUtil.removeMenuItem(menu, R.id.nav_community,

+ 2 - 2
app/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java

@@ -64,8 +64,8 @@ public final class DrawerMenuUtil {
         }
     }
 
-    public static void filterAssistantMenuItem(Menu menu, @Nullable OCCapability capability) {
-        if (capability != null && !capability.getAssistant().isTrue()) {
+    public static void filterAssistantMenuItem(Menu menu, @Nullable OCCapability capability, Resources resources) {
+        if (capability != null && !capability.getAssistant().isTrue() && resources.getBoolean(R.bool.is_branded_client)) {
             filterMenuItems(menu, R.id.nav_assistant);
         }
     }