X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4ba98835dfa26fd6d0fff0e24e8747054b8bdb0e..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/src/com/owncloud/android/ui/preview/PreviewImageActivity.java diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 3bff9a12..fde70df0 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,41 +16,46 @@ */ package com.owncloud.android.ui.preview; -import android.accounts.Account; -import android.app.Dialog; -import android.app.ProgressDialog; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewPager; -import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnTouchListener; import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.datamodel.DataStorageManager; +import com.actionbarsherlock.view.Window; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; -import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; -import com.owncloud.android.ui.activity.FileDetailActivity; -import com.owncloud.android.ui.fragment.FileDetailFragment; +import com.owncloud.android.ui.activity.FileActivity; +import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.dialog.LoadingDialog; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.Log_OC; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.R; /** - * Used as an utility to preview image files contained in an ownCloud account. + * Holds a swiping galley where image files contained in an ownCloud directory are shown * * @author David A. Velasco */ -public class PreviewImageActivity extends SherlockFragmentActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener { +public class PreviewImageActivity extends FileActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener, OnTouchListener { public static final int DIALOG_SHORT_WAIT = 0; @@ -60,10 +64,9 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; private static final String KEY_WAITING_FOR_BINDER = "WAITING_FOR_BINDER"; - private OCFile mFile; - private OCFile mParentFolder; - private Account mAccount; - private DataStorageManager mStorageManager; + private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT"; + + private FileDataStorageManager mStorageManager; private ViewPager mViewPager; private PreviewImagePagerAdapter mPreviewImagePagerAdapter; @@ -71,78 +74,69 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi private FileDownloaderBinder mDownloaderBinder = null; private ServiceConnection mDownloadConnection, mUploadConnection = null; private FileUploaderBinder mUploaderBinder = null; - private OCFile mWaitingToPreview = null; private boolean mRequestWaitingForBinder; + private DownloadFinishReceiver mDownloadFinishReceiver; + private boolean mFullScreen; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mFile = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); - mAccount = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT); - if (mFile == null) { - throw new IllegalStateException("Instanced with a NULL OCFile"); - } - if (mAccount == null) { - throw new IllegalStateException("Instanced with a NULL ownCloud Account"); - } - if (!mFile.isImage()) { - throw new IllegalArgumentException("Non-image file passed as argument"); - } - + requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); setContentView(R.layout.preview_image_activity); - + ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setTitle(mFile.getFileName()); + actionBar.hide(); - mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); - mParentFolder = mStorageManager.getFileById(mFile.getParentId()); - if (mParentFolder == null) { - // should not be necessary - mParentFolder = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); - } - + mFullScreen = true; if (savedInstanceState != null) { - mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(KEY_WAITING_TO_PREVIEW); mRequestWaitingForBinder = savedInstanceState.getBoolean(KEY_WAITING_FOR_BINDER); } else { - mWaitingToPreview = null; mRequestWaitingForBinder = false; } - createViewPager(); - - mDownloadConnection = new PreviewImageServiceConnection(); - bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE); - mUploadConnection = new PreviewImageServiceConnection(); - bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE); - } - private void createViewPager() { - mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), mParentFolder, mAccount, mStorageManager); + private void initViewPager() { + // get parent from path + String parentPath = getFile().getRemotePath().substring(0, getFile().getRemotePath().lastIndexOf(getFile().getFileName())); + OCFile parentFolder = mStorageManager.getFileByPath(parentPath); + //OCFile parentFolder = mStorageManager.getFileById(getFile().getParentId()); + if (parentFolder == null) { + // should not be necessary + parentFolder = mStorageManager.getFileByPath(OCFile.ROOT_PATH); + } + mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), parentFolder, getAccount(), mStorageManager); mViewPager = (ViewPager) findViewById(R.id.fragmentPager); - int position = mPreviewImagePagerAdapter.getFilePosition(mFile); + int position = mPreviewImagePagerAdapter.getFilePosition(getFile()); position = (position >= 0) ? position : 0; - mViewPager.setAdapter(mPreviewImagePagerAdapter); + mViewPager.setAdapter(mPreviewImagePagerAdapter); mViewPager.setOnPageChangeListener(this); - Log.e(TAG, "Setting initial position " + position); mViewPager.setCurrentItem(position); - if (position == 0 && !mFile.isDown()) { + if (position == 0 && !getFile().isDown()) { // this is necessary because mViewPager.setCurrentItem(0) just after setting the adapter does not result in a call to #onPageSelected(0) - mWaitingToPreview = mFile; mRequestWaitingForBinder = true; } } - + + @Override + public void onStart() { + super.onStart(); + mDownloadConnection = new PreviewImageServiceConnection(); + bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE); + mUploadConnection = new PreviewImageServiceConnection(); + bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE); + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putParcelable(KEY_WAITING_TO_PREVIEW, mWaitingToPreview); outState.putBoolean(KEY_WAITING_FOR_BINDER, mRequestWaitingForBinder); } @@ -154,17 +148,15 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi public void onServiceConnected(ComponentName component, IBinder service) { if (component.equals(new ComponentName(PreviewImageActivity.this, FileDownloader.class))) { - Log.e(TAG, "PREVIEW_IMAGE Download service connected"); mDownloaderBinder = (FileDownloaderBinder) service; if (mRequestWaitingForBinder) { - if (mWaitingToPreview != null) { - requestForDownload(); - } - mRequestWaitingForBinder = false; + mRequestWaitingForBinder = false; + Log_OC.d(TAG, "Simulating reselection of current page after connection of download binder"); + onPageSelected(mViewPager.getCurrentItem()); } - + } else if (component.equals(new ComponentName(PreviewImageActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service connected"); + Log_OC.d(TAG, "Upload service connected"); mUploaderBinder = (FileUploaderBinder) service; } else { return; @@ -175,10 +167,10 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override public void onServiceDisconnected(ComponentName component) { if (component.equals(new ComponentName(PreviewImageActivity.this, FileDownloader.class))) { - Log.d(TAG, "Download service suddenly disconnected"); + Log_OC.d(TAG, "Download service suddenly disconnected"); mDownloaderBinder = null; } else if (component.equals(new ComponentName(PreviewImageActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service suddenly disconnected"); + Log_OC.d(TAG, "Upload service suddenly disconnected"); mUploaderBinder = null; } } @@ -186,8 +178,8 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override - public void onDestroy() { - super.onDestroy(); + public void onStop() { + super.onStop(); if (mDownloadConnection != null) { unbindService(mDownloadConnection); mDownloadConnection = null; @@ -200,6 +192,12 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override + public void onDestroy() { + super.onDestroy(); + } + + + @Override public boolean onOptionsItemSelected(MenuItem item) { boolean returnValue = false; @@ -219,41 +217,55 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override protected void onResume() { super.onResume(); + //Log.e(TAG, "ACTIVITY, ONRESUME"); + mDownloadFinishReceiver = new DownloadFinishReceiver(); + + IntentFilter filter = new IntentFilter(FileDownloader.getDownloadFinishMessage()); + filter.addAction(FileDownloader.getDownloadAddedMessage()); + registerReceiver(mDownloadFinishReceiver, filter); + } + + @Override + protected void onPostResume() { + //Log.e(TAG, "ACTIVITY, ONPOSTRESUME"); + super.onPostResume(); + } + + @Override + public void onPause() { + super.onPause(); + unregisterReceiver(mDownloadFinishReceiver); + mDownloadFinishReceiver = null; } private void backToDisplayActivity() { - /* - Intent intent = new Intent(this, FileDisplayActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.putExtra(FileDetailFragment.EXTRA_FILE, mFile); - intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount); - startActivity(intent); - */ finish(); } + /** + * Show loading dialog + */ + public void showLoadingDialog() { + // Construct dialog + LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment)); + FragmentManager fm = getSupportFragmentManager(); + FragmentTransaction ft = fm.beginTransaction(); + loading.show(ft, DIALOG_WAIT_TAG); + + } - @Override - protected Dialog onCreateDialog(int id) { - Dialog dialog = null; - switch (id) { - case DIALOG_SHORT_WAIT: { - ProgressDialog working_dialog = new ProgressDialog(this); - working_dialog.setMessage(getResources().getString( - R.string.wait_a_moment)); - working_dialog.setIndeterminate(true); - working_dialog.setCancelable(false); - dialog = working_dialog; - break; - } - default: - dialog = null; + /** + * Dismiss loading dialog + */ + public void dismissLoadingDialog(){ + Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG); + if (frag != null) { + LoadingDialog loading = (LoadingDialog) frag; + loading.dismiss(); } - return dialog; } - /** * {@inheritDoc} */ @@ -279,44 +291,30 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override - public void showFragmentWithDetails(OCFile file) { - Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); - showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS); + public void showDetails(OCFile file) { + Intent showDetailsIntent = new Intent(this, FileDisplayActivity.class); + showDetailsIntent.setAction(FileDisplayActivity.ACTION_DETAILS); + showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, file); + showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); startActivity(showDetailsIntent); + int pos = mPreviewImagePagerAdapter.getFilePosition(file); + file = mPreviewImagePagerAdapter.getFileAt(pos); + } - private void requestForDownload() { - Log.e(TAG, "REQUEST FOR DOWNLOAD : " + mWaitingToPreview.getFileName()); + private void requestForDownload(OCFile file) { if (mDownloaderBinder == null) { - mRequestWaitingForBinder = true; + Log_OC.d(TAG, "requestForDownload called without binder to download service"); - } else if (!mDownloaderBinder.isDownloading(mAccount, mWaitingToPreview)) { + } else if (!mDownloaderBinder.isDownloading(getAccount(), file)) { Intent i = new Intent(this, FileDownloader.class); - i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount); - i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview); + i.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount()); + i.putExtra(FileDownloader.EXTRA_FILE, file); startService(i); } - mViewPager.invalidate(); } - @Override - public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success) { - if (success) { - if (mWaitingToPreview != null && mWaitingToPreview.equals(file)) { - mWaitingToPreview = null; - int position = mViewPager.getCurrentItem(); - mPreviewImagePagerAdapter.updateFile(position, file); - Log.e(TAG, "BEFORE NOTIFY DATA SET CHANGED"); - mPreviewImagePagerAdapter.notifyDataSetChanged(); - Log.e(TAG, "AFTER NOTIFY DATA SET CHANGED"); - } - } - } - - /** * This method will be invoked when a new page becomes selected. Animation is not necessarily complete. * @@ -324,20 +322,23 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi */ @Override public void onPageSelected(int position) { - Log.e(TAG, "onPageSelected " + position); - OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position); - getSupportActionBar().setTitle(currentFile.getFileName()); - if (currentFile.isDown()) { - mWaitingToPreview = null; + if (mDownloaderBinder == null) { + mRequestWaitingForBinder = true; + } else { - mWaitingToPreview = currentFile; - requestForDownload(); + OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position); + getSupportActionBar().setTitle(currentFile.getFileName()); + if (!currentFile.isDown()) { + if (!mPreviewImagePagerAdapter.pendingErrorAt(position)) { + requestForDownload(currentFile); + } + } } } /** * Called when the scroll state changes. Useful for discovering when the user begins dragging, - * when the pager is automatically settling to the current page, or when it is fully stopped/idle. + * when the pager is automatically settling to the current page. when it is fully stopped/idle. * * @param State The new scroll state (SCROLL_STATE_IDLE, _DRAGGING, _SETTLING */ @@ -359,4 +360,101 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { } + + /** + * Class waiting for broadcast events from the {@link FielDownloader} service. + * + * Updates the UI when a download is started or finished, provided that it is relevant for the + * folder displayed in the gallery. + */ + private class DownloadFinishReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME); + String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); + if (getAccount().name.equals(accountName) && + downloadedRemotePath != null) { + + OCFile file = mStorageManager.getFileByPath(downloadedRemotePath); + int position = mPreviewImagePagerAdapter.getFilePosition(file); + boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false); + //boolean isOffscreen = Math.abs((mViewPager.getCurrentItem() - position)) <= mViewPager.getOffscreenPageLimit(); + + if (position >= 0 && intent.getAction().equals(FileDownloader.getDownloadFinishMessage())) { + if (downloadWasFine) { + mPreviewImagePagerAdapter.updateFile(position, file); + + } else { + mPreviewImagePagerAdapter.updateWithDownloadError(position); + } + mPreviewImagePagerAdapter.notifyDataSetChanged(); // will trigger the creation of new fragments + + } else { + Log_OC.d(TAG, "Download finished, but the fragment is offscreen"); + } + + } + removeStickyBroadcast(intent); + } + + } + + + @Override + public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_UP) { + toggleFullScreen(); + } + return true; + } + + + private void toggleFullScreen() { + ActionBar actionBar = getSupportActionBar(); + if (mFullScreen) { + actionBar.show(); + + } else { + actionBar.hide(); + + } + mFullScreen = !mFullScreen; + } + + @Override + protected void onAccountSet(boolean stateWasRecovered) { + if (getAccount() != null) { + OCFile file = getFile(); + /// Validate handled file (first image to preview) + if (file == null) { + throw new IllegalStateException("Instanced with a NULL OCFile"); + } + if (!file.isImage()) { + throw new IllegalArgumentException("Non-image file passed as argument"); + } + mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver()); + + // Update file according to DB file, if it is possible + if (file.getFileId() > FileDataStorageManager.ROOT_PARENT_ID) + file = mStorageManager.getFileById(file.getFileId()); + + if (file != null) { + /// Refresh the activity according to the Account and OCFile set + setFile(file); // reset after getting it fresh from mStorageManager + getSupportActionBar().setTitle(getFile().getFileName()); + //if (!stateWasRecovered) { + initViewPager(); + //} + + } else { + // handled file not in the current Account + finish(); + } + + } else { + Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!"); + } + } + + }