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

Merge pull request #1846 from nextcloud/resizedImages_walledGarden

Browse source 
Fix walledGarden with resized images
This commit is contained in:
Tobias Kaminsky 2017-12-11 10:35:15 +01:00 committed by GitHub
commit 34143f4e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file

@ -352,11 +352,14 @@ public class ThumbnailsCacheManager {
}
}
} else {
if (ConnectivityUtils.isInternetWalled(MainApp.getAppContext())) {
previewImageFragment.setNoConnectionErrorMessage();
} else {
previewImageFragment.setErrorPreviewMessage();
}
new Thread(() -> {
if (ConnectivityUtils.isInternetWalled(MainApp.getAppContext())) {
previewImageFragment.setNoConnectionErrorMessage();
} else {
previewImageFragment.setErrorPreviewMessage();
}
}).start();
}
}
}

6
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -224,7 +224,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Log_OC.i(TAG, "onCreateView() start");
View v = super.onCreateView(inflater, container, savedInstanceState);
bottomNavigationView = (BottomNavigationView) v.findViewById(R.id.bottom_navigation_view);
bottomNavigationView = v.findViewById(R.id.bottom_navigation_view);
if (savedInstanceState != null) {
currentSearchType = Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE));
@ -901,9 +901,9 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
type = VirtualFolderType.NONE;
break;
}
((FileDisplayActivity) mContainerActivity).startImagePreview(file, type, false);
((FileDisplayActivity) mContainerActivity).startImagePreview(file, type, !file.isDown());
} else {
((FileDisplayActivity) mContainerActivity).startImagePreview(file, false);
((FileDisplayActivity) mContainerActivity).startImagePreview(file, !file.isDown());
}
} else if (file.isDown() && MimeTypeUtil.isVCard(file)) {
((FileDisplayActivity) mContainerActivity).startContactListFragment(file);

8
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
View file

@ -54,8 +54,8 @@ import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.ShareActivity;
import com.owncloud.android.ui.events.FavoriteEvent;
import com.owncloud.android.ui.events.SyncEventFinished;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.FileStorageUtils;
import org.greenrobot.eventbus.EventBus;
@ -168,8 +168,10 @@ public class FileOperationsHelper {
i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, account);
mFileActivity.startActivity(i);
} else {
FileStorageUtils.checkIfFileFinishedSaving(file);
EventBus.getDefault().post(new SyncEventFinished(intent));
if (file.isDown()) {
FileStorageUtils.checkIfFileFinishedSaving(file);
EventBus.getDefault().post(new SyncEventFinished(intent));
}
}
mFileActivity.dismissLoadingDialog();
}