wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

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

@@ -485,7 +485,7 @@ public class FileDisplayActivity extends FileActivity
 
                 SearchEvent searchEvent = intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT);
                 if (searchEvent != null) {
-                    if (SearchRemoteOperation.SearchType.PHOTO_SEARCH.equals(searchEvent.getSearchType())) {
+                    if (SearchRemoteOperation.SearchType.PHOTO_SEARCH == searchEvent.getSearchType()) {
                         Log_OC.d(this, "Switch to photo search fragment");
 
                         GalleryFragment photoFragment = new GalleryFragment();
@@ -493,7 +493,7 @@ public class FileDisplayActivity extends FileActivity
                         bundle.putParcelable(OCFileListFragment.SEARCH_EVENT, searchEvent);
                         photoFragment.setArguments(bundle);
                         setLeftFragment(photoFragment);
-                    } else if (searchEvent.getSearchType().equals(SearchRemoteOperation.SearchType.SHARED_FILTER)) {
+                    } else if (searchEvent.getSearchType() == SearchRemoteOperation.SearchType.SHARED_FILTER) {
                         Log_OC.d(this, "Switch to shared fragment");
                         SharedListFragment sharedListFragment = new SharedListFragment();
                         Bundle bundle = new Bundle();

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -1240,7 +1240,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
 
         if (sortOrder.getType() == FileSortOrder.SortType.ALPHABET) {
-            return String.valueOf(file.getFileName().charAt(0)).toUpperCase();
+            return String.valueOf(file.getFileName().charAt(0)).toUpperCase(Locale.getDefault());
         } else if (sortOrder.getType() == FileSortOrder.SortType.DATE) {
             long milliseconds = file.getModificationTimestamp();
             Date date = new Date(milliseconds);

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

@@ -1638,7 +1638,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     @Override
     public void onRefresh() {
-        if (isSearchEventSet(searchEvent) && searchFragment) {
+        if (searchFragment && isSearchEventSet(searchEvent)) {
             handleSearchEvent(searchEvent);
 
             mRefreshListLayout.setRefreshing(false);