fix on device action bar

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -579,8 +579,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
             setupToolbar();
             startPhotoSearch(menuItem.getItemId());
         } else if (itemId == R.id.nav_on_device) {
-            EventBus.getDefault().post(new ChangeMenuEvent());
-            showFiles(true, false);
+            showOnDeviceFiles();
         } else if (itemId == R.id.nav_uploads) {
             resetOnlyPersonalAndOnDevice();
             startActivity(UploadListActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -1255,6 +1254,16 @@ public void showFiles(boolean onDeviceOnly, boolean onlyPersonalFiles) {
         startActivity(intent);
     }
 
+    private void showOnDeviceFiles() {
+        MainApp.showOnlyFilesOnDevice(true);
+        MainApp.showOnlyPersonalFiles(false);
+
+        Intent intent = new Intent(getApplicationContext(), FileDisplayActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.setAction(FileDisplayActivity.ON_DEVICE);
+        startActivity(intent);
+    }
+
     @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         if (callContext instanceof MenuItem menuItem) {

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -572,6 +572,12 @@ class FileDisplayActivity :
                 leftFragment = GroupfolderListFragment()
                 supportFragmentManager.executePendingTransactions()
             }
+
+            ON_DEVICE == action -> {
+                refreshOrInitOCFileListFragment()
+                listOfFilesFragment?.setCurrentSearchType(SearchType.ON_DEVICE)
+                updateActionBarTitleAndHomeButton(null)
+            }
         }
     }
 
@@ -2712,9 +2718,10 @@ class FileDisplayActivity :
 
     override fun showFiles(onDeviceOnly: Boolean, personalFiles: Boolean) {
         super.showFiles(onDeviceOnly, personalFiles)
-        if (onDeviceOnly) {
-            updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_on_device))
-        }
+        refreshOrInitOCFileListFragment()
+    }
+
+    private fun refreshOrInitOCFileListFragment() {
         val ocFileListFragment = this.listOfFilesFragment
         if (ocFileListFragment != null &&
             (ocFileListFragment !is GalleryFragment) &&
@@ -3062,6 +3069,7 @@ class FileDisplayActivity :
         const val LIST_GROUPFOLDERS: String = "LIST_GROUPFOLDERS"
         const val SINGLE_USER_SIZE: Int = 1
         const val OPEN_FILE: String = "NC_OPEN_FILE"
+        const val ON_DEVICE = "ON_DEVICE"
 
         const val TAG_PUBLIC_LINK: String = "PUBLIC_LINK"
         const val FTAG_CHOOSER_DIALOG: String = "CHOOSER_DIALOG"

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1752,6 +1752,10 @@ public void setCurrentSearchType(SearchEvent event) {
         }
     }
 
+    public void setCurrentSearchType(SearchType searchType) {
+        currentSearchType = searchType;
+    }
+
     public SearchType getCurrentSearchType() {
         return currentSearchType;
     }

app/src/main/java/com/owncloud/android/ui/fragment/SearchType.kt

@@ -24,13 +24,15 @@ enum class SearchType : Parcelable {
 
     // not a real filter, but nevertheless
     SHARED_FILTER,
-    GROUPFOLDER;
+    GROUPFOLDER,
+    ON_DEVICE;
 
     fun titleId(): Int? = when (this) {
         FAVORITE_SEARCH -> R.string.drawer_item_favorites
         GALLERY_SEARCH -> R.string.drawer_item_gallery
         RECENTLY_MODIFIED_SEARCH -> R.string.drawer_item_recently_modified
         SHARED_FILTER -> R.string.drawer_item_shared
+        ON_DEVICE -> R.string.drawer_item_on_device
         else -> null
     }
 }