Fixed preview of images in Android 2.x ; fixed synchronization progress indicator...

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c66c64d..098033c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
-    android:versionName="0.1.134B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.135B" xmlns:android="http://schemas.android.com/apk/res/android">\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/AccountUtils.java b/src/eu/alefzero/owncloud/AccountUtils.java
index 090dec3..d088d2c 100644 (file)
--- a/src/eu/alefzero/owncloud/AccountUtils.java
+++ b/src/eu/alefzero/owncloud/AccountUtils.java
@@ -68,6 +68,21 @@ public class AccountUtils {
         return defaultAccount;\r
     }\r
 \r
+    \r
+\r
+    /**\r
+     * Checks, whether or not there are any ownCloud accounts setup.\r
+     * \r
+     * @return true, if there is at least one account.\r
+     */\r
+    public static boolean accountsAreSetup(Context context) {\r
+        AccountManager accMan = AccountManager.get(context);\r
+        Account[] accounts = accMan\r
+                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
+        return accounts.length > 0;\r
+    }\r
+    \r
+    \r
     public static void setCurrentOwnCloudAccount(Context context, String name) {\r
         SharedPreferences.Editor appPrefs = PreferenceManager\r
                 .getDefaultSharedPreferences(context).edit();\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index ec4def4..e8f9151 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,10 +18,7 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
-import java.io.BufferedReader;\r
 import java.io.File;\r
-import java.io.InputStreamReader;\r
-import java.lang.Thread.UncaughtExceptionHandler;\r
 import java.util.ArrayList;\r
 \r
 import android.accounts.Account;\r
@@ -37,18 +34,15 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.pm.PackageInfo;\r
-import android.content.pm.PackageManager;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r
-import android.telephony.TelephonyManager;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r
-import android.widget.CheckedTextView;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r
@@ -81,16 +75,17 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
-        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {\r
+    \r
     private ArrayAdapter<String> mDirectories;\r
-    private DataStorageManager mStorageManager;\r
-    private FileListFragment mFileList;\r
     private OCFile mCurrentDir;\r
     private String[] mDirs = null;\r
 \r
-    private SyncBroadcastReceiver syncBroadcastRevceiver;\r
+    private DataStorageManager mStorageManager;\r
+    private SyncBroadcastReceiver syncBroadcastReceiver;\r
     \r
     private View mLayoutView = null;\r
+    private FileListFragment mFileList;\r
     \r
     private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
     private static final String KEY_CURRENT_DIR = "DIR";\r
@@ -98,39 +93,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     private static final int DIALOG_ABOUT_APP = 2;\r
+    \r
     private static final int ACTION_SELECT_FILE = 1;\r
+    //private static final int ACTION_CREATE_FIRST_ACCOUNT = 2; dvelasco: WIP\r
 \r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r
-        // TODO: fix hack: workaround for bug in actionbar sherlock\r
-        // it always shows indeterminate progress bar\r
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {\r
-            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-            setProgressBarIndeterminateVisibility(false);\r
-        }\r
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
+        setSupportProgressBarIndeterminateVisibility(false);\r
 \r
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         if(savedInstanceState != null){\r
-            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
+            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);   // this is never saved with this key :S\r
         }\r
         \r
-        if (findViewById(R.id.file_list_view) == null) \r
-            mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
+        mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
         \r
-        //TODO: Dialog useless -> get rid of this\r
-        if (!accountsAreSetup()) {\r
+        if (AccountUtils.accountsAreSetup(this)) {\r
+            setContentView(mLayoutView);    \r
+            \r
+        } else  {\r
             setContentView(R.layout.no_account_available);\r
             setProgressBarIndeterminateVisibility(false);\r
             getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
             findViewById(R.id.setup_account).setOnClickListener(this);\r
-            \r
-        } else if (findViewById(R.id.file_list_view) == null) {\r
-            setContentView(mLayoutView);\r
         }\r
         \r
+        Log.i(getClass().toString(), "onCreate() end");\r
     }\r
 \r
     @Override\r
@@ -199,8 +192,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * Called, when the user selected something for uploading\r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-        if (resultCode == RESULT_OK) {\r
-            if (requestCode == ACTION_SELECT_FILE) {\r
+        if (requestCode == ACTION_SELECT_FILE) {\r
+            if (resultCode == RESULT_OK) {\r
                 Uri selectedImageUri = data.getData();\r
     \r
                 String filemanagerstring = selectedImageUri.getPath();\r
@@ -234,7 +227,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
                 startService(i);\r
             }\r
-        }\r
+            \r
+        }/* dvelasco: WIP - not working as expected ... yet :)\r
+             else if (requestCode == ACTION_CREATE_FIRST_ACCOUNT) {\r
+            if (resultCode != RESULT_OK) {\r
+                finish();   // the user cancelled the AuthenticatorActivity\r
+            }\r
+        }*/\r
     }\r
 \r
     @Override\r
@@ -255,6 +254,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onRestoreInstanceState() start");\r
         super.onRestoreInstanceState(savedInstanceState);\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
@@ -263,10 +263,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r
         mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
+        Log.i(getClass().toString(), "onRestoreInstanceState() end");\r
     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
+        Log.i(getClass().toString(), "onSaveInstanceState() start");\r
         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r
@@ -276,20 +278,30 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r
+        Log.i(getClass().toString(), "onResume() start");\r
         super.onResume();\r
 \r
-        if (accountsAreSetup()) {\r
+        if (!AccountUtils.accountsAreSetup(this)) {\r
+            /*Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            //startActivity(intent);\r
+            startActivityForResult(intent, ACTION_CREATE_FIRST_ACCOUNT);*/\r
+            \r
+        } else {    // at least an account exist: normal operation\r
 \r
-            setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r
+            // set the layout only if it couldn't be set in onCreate\r
+            if (findViewById(R.id.file_list_view) == null)\r
+                setContentView(mLayoutView);\r
 \r
             // Listen for sync messages\r
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
-            syncBroadcastRevceiver = new SyncBroadcastReceiver();\r
-            registerReceiver(syncBroadcastRevceiver, syncIntentFilter);\r
+            syncBroadcastReceiver = new SyncBroadcastReceiver();\r
+            registerReceiver(syncBroadcastReceiver, syncIntentFilter);\r
         \r
             // Storage manager initialization\r
             mStorageManager = new FileDataStorageManager(\r
@@ -355,16 +367,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             // List dir here\r
             mFileList.listDirectory(mCurrentDir);\r
         }\r
+        Log.i(getClass().toString(), "onResume() end");\r
     }\r
 \r
     @Override\r
     protected void onPause() {\r
+        Log.i(getClass().toString(), "onPause() start");\r
         super.onPause();\r
-        if (syncBroadcastRevceiver != null) {\r
-            unregisterReceiver(syncBroadcastRevceiver);\r
-            syncBroadcastRevceiver = null;\r
+        if (syncBroadcastReceiver != null) {\r
+            unregisterReceiver(syncBroadcastReceiver);\r
+            syncBroadcastReceiver = null;\r
         }\r
         getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onPause() end");\r
     }\r
 \r
     @Override\r
@@ -520,18 +535,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return !mDirectories.isEmpty();\r
     }\r
 \r
-    /**\r
-     * Checks, whether or not there are any ownCloud accounts setup.\r
-     * \r
-     * @return true, if there is at least one account.\r
-     */\r
-    private boolean accountsAreSetup() {\r
-        AccountManager accMan = AccountManager.get(this);\r
-        Account[] accounts = accMan\r
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
-        return accounts.length > 0;\r
-    }\r
-\r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
@@ -598,12 +601,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
             Log.d("FileDisplay", "sync of account " + account_name\r
                     + " is in_progress: " + inProgress);\r
-            setProgressBarIndeterminateVisibility(inProgress);\r
+            setSupportProgressBarIndeterminateVisibility(inProgress);\r
             if (!inProgress) {\r
-                FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
+                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                         .findFragmentById(R.id.fileList);\r
-                if (fileListFramgent != null)\r
-                    fileListFramgent.listDirectory();\r
+                if (fileListFragment != null)\r
+                    fileListFragment.listDirectory();\r
             }\r
         }\r
 \r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index ee69555..0397e5b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -203,9 +203,13 @@ public class FileDetailFragment extends SherlockFragment implements
                     if (mFile.getMimetype().startsWith("image/")) {\r
                         BitmapFactory.Options options = new Options();\r
                         options.inScaled = true;\r
-                        options.inMutable = false;\r
-                        options.inPreferQualityOverSpeed = false;\r
                         options.inPurgeable = true;\r
+                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {\r
+                            options.inPreferQualityOverSpeed = false;\r
+                        }\r
+                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {\r
+                            options.inMutable = false;\r
+                        }\r
 \r
                         Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath(), options);\r
 \r
@@ -224,6 +228,14 @@ public class FileDetailFragment extends SherlockFragment implements
                 } catch (OutOfMemoryError e) {\r
                     preview.setVisibility(View.INVISIBLE);\r
                     Log.e(TAG, "Out of memory occured for file with size " + mFile.getFileLength());\r
+                    \r
+                } catch (NoSuchFieldError e) {\r
+                    preview.setVisibility(View.INVISIBLE);\r
+                    Log.e(TAG, "Error from access to unexisting field despite protection " + mFile.getFileLength());\r
+                    \r
+                } catch (Throwable t) {\r
+                    preview.setVisibility(View.INVISIBLE);\r
+                    Log.e(TAG, "Unexpected error while creating image preview " + mFile.getFileLength());\r
                 }\r
                 downloadButton.setText(R.string.filedetails_open);\r
                 downloadButton.setOnClickListener(new OnClickListener() {\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 3aedfad..3cfead5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -50,36 +50,40 @@ import eu.alefzero.owncloud.ui.adapter.FileListListAdapter;
  */\r
 public class FileListFragment extends FragmentListView {\r
     private static final String TAG = "FileListFragment";\r
-    //private Account mAccount;         // dvelasco : the fragment is not recreated when other account is selected; keep as an attribute is dangerous\r
+    \r
     private Vector<OCFile> mFiles;    \r
-    //private DataStorageManager mStorageManager;   // dvelasco : just the same; it depends upon the current account ; it's updated in FileDisplayActivity!!\r
     private OCFile mFile;\r
-    private boolean mIsLargeDevice = false; \r
+    private boolean mIsLargeDevice; \r
 \r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r
         Intent intent = getActivity().getIntent();\r
         OCFile directory = intent.getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
         mFile = directory;\r
+        mIsLargeDevice = false; \r
         \r
+        Log.i(getClass().toString(), "onCreate() stop");\r
     }\r
     \r
     @Override\r
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
             Bundle savedInstanceState) {\r
+        Log.i(getClass().toString(), "onCreateView() start");\r
         super.onCreateView(inflater, container, savedInstanceState);\r
         getListView().setDivider(getResources().getDrawable(R.drawable.uploader_list_separator));\r
         getListView().setDividerHeight(1);\r
         \r
-        //listDirectory(mFile);\r
-        \r
+        Log.i(getClass().toString(), "onCreateView() end");\r
         return getListView();\r
     }    \r
 \r
     @Override\r
     public void onStart() {\r
+        Log.i(getClass().toString(), "onStart() start");\r
+        super.onStart();\r
         // Create a placeholder upon launch\r
         View fragmentContainer = getActivity().findViewById(R.id.file_details_container);\r
         if (fragmentContainer != null) {\r
@@ -88,7 +92,7 @@ public class FileListFragment extends FragmentListView {
             transaction.replace(R.id.file_details_container, new FileDetailFragment(true));\r
             transaction.commit();\r
         }\r
-        super.onStart();\r
+        Log.i(getClass().toString(), "onStart() end");\r
     }\r
 \r
     @Override\r
@@ -212,10 +216,4 @@ public class FileListFragment extends FragmentListView {
         setListAdapter(new FileListListAdapter(directory, storageManager, getActivity()));\r
     }\r
 \r
-    @Override\r
-    public void onSaveInstanceState(Bundle outState) {\r
-        super.onSaveInstanceState(outState);\r
-        outState.putParcelable("ACCOUNT", AccountUtils.getCurrentOwnCloudAccount(getActivity()));\r
-    }\r
-\r
 }\r