mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3485 from nextcloud/shareScreen

Browse source 
fix showing spinner when opening keyboard in file detail view
This commit is contained in:
Andy Scherzinger 2019-01-22 14:37:48 +01:00 committed by GitHub
commit 627106c18f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -213,7 +213,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
public void onResume() {
super.onResume();
if (getFile()!= null && MimeTypeUtil.isImage(getFile()) && previewLoaded) {
if (previewLoaded && getFile() != null && MimeTypeUtil.isImage(getFile())) {
activatePreviewImage();
}
}
@ -259,6 +259,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
if (getFile() == null || account == null) {
showEmptyContent();
} else {
emptyContentContainer.setVisibility(View.GONE);
}
return view;
@ -317,7 +319,11 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
viewPager.setCurrentItem(tab.getPosition());
if (tab.getPosition() == 0) {
getFileDetailActivitiesFragment().markCommentsAsRead();
FileDetailActivitiesFragment fragment = getFileDetailActivitiesFragment();
if (fragment != null) {
fragment.markCommentsAsRead();
}
}
}
@ -602,7 +608,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
private void setFilePreview(OCFile file) {
Bitmap resizedImage;
if (MimeTypeUtil.isImage(file) && activity != null) {
if (activity != null && MimeTypeUtil.isImage(file)) {
String tagId = String.valueOf(ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + getFile().getRemoteId());
resizedImage = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
@ -722,6 +728,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
private void showEmptyContent() {
if (emptyContentContainer != null) {
emptyContentContainer.setVisibility(View.VISIBLE);
detailContainer.setVisibility(View.GONE);
emptyContentHeadline.setText(R.string.file_details_no_content);