This wraps the android.util.logging into Log_OC which , if its enabled

[pub/Android/ownCloud.git] / 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 46ed65e..cfdd89b 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -66,6 +66,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.AccountUtils;
 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.R;
 import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;


@@ -122,7 +123,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;
     
     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;
     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;


@@ -136,11 +136,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
 
     private static final String TAG = "FileDisplayActivity";
 
 
     private static final String TAG = "FileDisplayActivity";
 

-    private static int[] mMenuIdentifiersToPatch = {R.id.about_app};

     
     @Override
     public void onCreate(Bundle savedInstanceState) {
     
     @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
         super.onCreate(savedInstanceState);
 
         /// Load of parameters from received intent


@@ -217,7 +216,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         // show changelog, if needed
         showChangeLog();
         
         // show changelog, if needed
         showChangeLog();
         

-        Log.d(getClass().toString(), "onCreate() end");
+        Log_OC.d(getClass().toString(), "onCreate() end");

     }
 
     
     }
 
     


@@ -320,32 +319,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();
             inflater.inflate(R.menu.menu, menu);
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();
             inflater.inflate(R.menu.menu, menu);

-            
-            patchHiddenAccents(menu);
-            

             return true;
     }
 
             return true;
     }
 

-    /**
-     * Workaround for this: <a href="http://code.google.com/p/android/issues/detail?id=3974">http://code.google.com/p/android/issues/detail?id=3974</a> 
-     * 
-     * @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;
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;


@@ -367,10 +343,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             startActivity(settingsIntent);
             break;
         }
             startActivity(settingsIntent);
             break;
         }

-        case R.id.about_app: {
-            showDialog(DIALOG_ABOUT_APP);
-            break;
-        }

         case android.R.id.home: {
             if (mCurrentDir != null && mCurrentDir.getParentId() != 0) {
                 onBackPressed();
         case android.R.id.home: {
             if (mCurrentDir != null && mCurrentDir.getParentId() != 0) {
                 onBackPressed();


@@ -447,7 +419,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             startService(i);
             
         } else {
             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;
             Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
             t.show();
             return;


@@ -469,12 +441,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 filepath = filemanagerstring;
             
         } catch (Exception e) {
                 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) {
             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;
                 Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);
                 t.show();
                 return;


@@ -533,7 +505,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
     @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) {
         super.onSaveInstanceState(outState);
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
         if (mDualPane) {


@@ -545,12 +517,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 }
             }
         }
                 }
             }
         }

-        Log.d(getClass().toString(), "onSaveInstanceState() end");
+        Log_OC.d(getClass().toString(), "onSaveInstanceState() end");

     }
 
     @Override
     protected void onResume() {
     }
 
     @Override
     protected void onResume() {

-        Log.d(getClass().toString(), "onResume() start");
+        Log_OC.d(getClass().toString(), "onResume() start");

         super.onResume();
 
         if (AccountUtils.accountsAreSetup(this)) {
         super.onResume();
 
         if (AccountUtils.accountsAreSetup(this)) {


@@ -587,13 +559,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             showDialog(DIALOG_SETUP_ACCOUNT);
             
         }
             showDialog(DIALOG_SETUP_ACCOUNT);
             
         }

-        Log.d(getClass().toString(), "onResume() end");
+        Log_OC.d(getClass().toString(), "onResume() end");

     }
 
     
     @Override
     protected void onPause() {
     }
 
     
     @Override
     protected void onPause() {

-        Log.d(getClass().toString(), "onPause() start");
+        Log_OC.d(getClass().toString(), "onPause() start");

         super.onPause();
         if (mSyncBroadcastReceiver != null) {
             unregisterReceiver(mSyncBroadcastReceiver);
         super.onPause();
         if (mSyncBroadcastReceiver != null) {
             unregisterReceiver(mSyncBroadcastReceiver);


@@ -611,7 +583,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             dismissDialog(DIALOG_SETUP_ACCOUNT);
         }
         
             dismissDialog(DIALOG_SETUP_ACCOUNT);
         }
         

-        Log.d(getClass().toString(), "onPause() end");
+        Log_OC.d(getClass().toString(), "onPause() end");

     }
 
     
     }
 
     


@@ -650,22 +622,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             dialog = builder.create();
             break;
         }
             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());
         case DIALOG_CREATE_DIR: {
             builder = new Builder(this);
             final EditText dirNameInput = new EditText(getBaseContext());


@@ -861,7 +817,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                             msg.show();
                         
                         } catch (NotFoundException e) {
                             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);

                         }
                     }
                 });
                         }
                     }
                 });


@@ -904,7 +860,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             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)) {
 
 
             if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {
 


@@ -1097,10 +1053,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         @Override
         public void onServiceConnected(ComponentName component, IBinder service) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
         @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;
             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
                 mDownloaderBinder = (FileDownloaderBinder) service;
             } 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;
                 mUploaderBinder = (FileUploaderBinder) service;
             } else {
                 return;


@@ -1119,10 +1075,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
         @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))) {
                 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;
             }
         }
                 mUploaderBinder = null;
             }
         }