X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/56f1df02c440c2643e0f202ebe55147fe1660d60..6a6d83311f01da26ce50b4f64111c254022eb47b:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 8e36b9aa..88dd728a 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -3,9 +3,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 3 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 @@ -38,11 +37,8 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.PackageInfo; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources.NotFoundException; import android.database.Cursor; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -67,6 +63,8 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; import com.owncloud.android.AccountUtils; +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; import com.owncloud.android.authenticator.AccountAuthenticator; import com.owncloud.android.datamodel.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -97,7 +95,6 @@ import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; -import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; /** @@ -130,7 +127,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private static final int DIALOG_SETUP_ACCOUNT = 0; private static final int DIALOG_CREATE_DIR = 1; - private static final int DIALOG_ABOUT_APP = 2; public static final int DIALOG_SHORT_WAIT = 3; private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4; private static final int DIALOG_SSL_VALIDATOR = 5; @@ -143,15 +139,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private static final String TAG = "FileDisplayActivity"; - private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app}; - private OCFile mWaitingToPreview; private Handler mHandler; - @Override public void onCreate(Bundle savedInstanceState) { - Log.d(getClass().toString(), "onCreate() start"); + Log_OC.d(getClass().toString(), "onCreate() start"); super.onCreate(savedInstanceState); /// Load of parameters from received intent @@ -162,7 +155,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements /// Load of saved instance state: keep this always before initDataFromCurrentAccount() if(savedInstanceState != null) { - // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES + // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER. SOME TIMES mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW); @@ -244,7 +237,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements //showChangeLog(); mBackFromCreatingFirstAccount = false; - Log.d(getClass().toString(), "onCreate() end"); + Log_OC.d(getClass().toString(), "onCreate() end"); } @@ -355,37 +348,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements MenuInflater inflater = getSherlock().getMenuInflater(); inflater.inflate(R.menu.main_menu, menu); - patchHiddenAccents(menu); - return true; } - /** - * Workaround for this: http://code.google.com/p/android/issues/detail?id=3974 - * - * @param menu Menu to patch - */ - private void patchHiddenAccents(Menu menu) { - for (int i = 0; i < mMenuIdentifiersToPatch.length ; i++) { - MenuItem aboutItem = menu.findItem(mMenuIdentifiersToPatch[i]); - if (aboutItem != null && aboutItem.getIcon() instanceof BitmapDrawable) { - // Clip off the bottom three (density independent) pixels of transparent padding - Bitmap original = ((BitmapDrawable) aboutItem.getIcon()).getBitmap(); - float scale = getResources().getDisplayMetrics().density; - int clippedHeight = (int) (original.getHeight() - (3 * scale)); - Bitmap scaled = Bitmap.createBitmap(original, 0, 0, original.getWidth(), clippedHeight); - aboutItem.setIcon(new BitmapDrawable(getResources(), scaled)); - } - } - } - - @Override public boolean onOptionsItemSelected(MenuItem item) { boolean retval = true; switch (item.getItemId()) { case R.id.action_create_dir: { - EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this); + EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this); dialog.show(getSupportFragmentManager(), "createdirdialog"); break; } @@ -402,10 +373,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements startActivity(settingsIntent); break; } - case R.id.action_about_app: { - showDialog(DIALOG_ABOUT_APP); - break; - } case android.R.id.home: { if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ onBackPressed(); @@ -480,7 +447,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements startService(i); } else { - Log.d("FileDisplay", "User clicked on 'Update' with no selection"); + Log_OC.d("FileDisplay", "User clicked on 'Update' with no selection"); Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG); t.show(); return; @@ -502,12 +469,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements filepath = filemanagerstring; } catch (Exception e) { - Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e); + Log_OC.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e); e.printStackTrace(); } finally { if (filepath == null) { - Log.e("FileDisplay", "Couldnt resolve path to file"); + Log_OC.e("FileDisplay", "Couldnt resolve path to file"); Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG); t.show(); return; @@ -563,7 +530,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override protected void onSaveInstanceState(Bundle outState) { // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved - Log.d(getClass().toString(), "onSaveInstanceState() start"); + Log_OC.d(getClass().toString(), "onSaveInstanceState() start"); super.onSaveInstanceState(outState); outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir); if (mDualPane) { @@ -576,13 +543,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview); - Log.d(getClass().toString(), "onSaveInstanceState() end"); + Log_OC.d(getClass().toString(), "onSaveInstanceState() end"); } @Override - public void onResume() { - Log.d(getClass().toString(), "onResume() start"); + protected void onResume() { + Log_OC.d(getClass().toString(), "onResume() start"); super.onResume(); if (AccountUtils.accountsAreSetup(this)) { @@ -621,13 +588,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements showDialog(DIALOG_SETUP_ACCOUNT); } - Log.d(getClass().toString(), "onResume() end"); + Log_OC.d(getClass().toString(), "onResume() end"); } @Override - public void onPause() { - Log.d(getClass().toString(), "onPause() start"); + protected void onPause() { + Log_OC.d(getClass().toString(), "onPause() start"); super.onPause(); if (mSyncBroadcastReceiver != null) { unregisterReceiver(mSyncBroadcastReceiver); @@ -645,7 +612,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements dismissDialog(DIALOG_SETUP_ACCOUNT); } - Log.d(getClass().toString(), "onPause() end"); + Log_OC.d(getClass().toString(), "onPause() end"); } @@ -684,22 +651,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements dialog = builder.create(); break; } - case DIALOG_ABOUT_APP: { - builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.about_title)); - PackageInfo pkg; - try { - pkg = getPackageManager().getPackageInfo(getPackageName(), 0); - builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName)); - builder.setIcon(android.R.drawable.ic_menu_info_details); - dialog = builder.create(); - } catch (NameNotFoundException e) { - builder = null; - dialog = null; - Log.e(TAG, "Error while showing about dialog", e); - } - break; - } case DIALOG_CREATE_DIR: { builder = new Builder(this); final EditText dirNameInput = new EditText(getBaseContext()); @@ -909,7 +860,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements msg.show(); } catch (NotFoundException e) { - Log.e(TAG, "Error while trying to show fail message " , e); + Log_OC.e(TAG, "Error while trying to show fail message ", e); } } }); @@ -952,13 +903,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements */ @Override public void onReceive(Context context, Intent intent) { - boolean inProgress = intent.getBooleanExtra( - FileSyncService.IN_PROGRESS, false); - String accountName = intent - .getStringExtra(FileSyncService.ACCOUNT_NAME); + boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false); + String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME); - Log.d("FileDisplay", "sync of account " + accountName - + " is in_progress: " + inProgress); + Log_OC.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress); if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) { @@ -1252,14 +1200,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void onServiceConnected(ComponentName component, IBinder service) { if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) { - Log.d(TAG, "Download service connected"); + Log_OC.d(TAG, "Download service connected"); mDownloaderBinder = (FileDownloaderBinder) service; if (mWaitingToPreview != null) { requestForDownload(); } } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service connected"); + Log_OC.d(TAG, "Upload service connected"); mUploaderBinder = (FileUploaderBinder) service; } else { return; @@ -1280,10 +1228,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void onServiceDisconnected(ComponentName component) { if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) { - Log.d(TAG, "Download service disconnected"); + Log_OC.d(TAG, "Download service disconnected"); mDownloaderBinder = null; } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service disconnected"); + Log_OC.d(TAG, "Upload service disconnected"); mUploaderBinder = null; } }