Code cleanups

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 3642d50..dc24f34 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -42,25 +42,17 @@ import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;

-import android.provider.BaseColumns;

 import android.provider.MediaStore;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import android.provider.MediaStore;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.lib.common.utils.Log_OC;

-import com.owncloud.android.lib.resources.files.FileUtils;

 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.utils.FileStorageUtils;
 

-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-

 public class FileDataStorageManager {
 
     public static final int ROOT_PARENT_ID = 0;
 public class FileDataStorageManager {
 
     public static final int ROOT_PARENT_ID = 0;


@@ -715,44 +707,12 @@ public class FileDataStorageManager {
                 if (!targetFolder.exists()) {
                     targetFolder.mkdirs();
                 }
                 if (!targetFolder.exists()) {
                     targetFolder.mkdirs();
                 }

-                copied = copyFile(localFile, targetFile);
+                copied = FileStorageUtils.copyFile(localFile, targetFile);

             }
             Log_OC.d(TAG, "Local file COPIED : " + copied);
         }
     }
 
             }
             Log_OC.d(TAG, "Local file COPIED : " + copied);
         }
     }
 

-    private boolean copyFile(File src, File target) {
-        boolean ret = true;
-
-        InputStream in = null;
-        OutputStream out = null;
-
-        try {
-            in = new FileInputStream(src);
-            out = new FileOutputStream(target);
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-        } catch (IOException ex) {
-            ret = false;
-        } finally {
-            if (in != null) try {
-                in.close();
-            } catch (IOException e) {
-                e.printStackTrace(System.err);
-            }
-            if (out != null) try {
-                out.close();
-            } catch (IOException e) {
-                e.printStackTrace(System.err);
-            }
-        }
-
-        return ret;
-    }
-

     public void migrateStoredFiles(String srcPath, String dstPath) throws Exception {
         Cursor c = null;
         if (getContentResolver() != null) {
     public void migrateStoredFiles(String srcPath, String dstPath) throws Exception {
         Cursor c = null;
         if (getContentResolver() != null) {

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 05adf9f..78c61c7 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -248,7 +248,7 @@ public class Preferences extends PreferenceActivity
         PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");
         
         boolean helpEnabled = getResources().getBoolean(R.bool.help_enabled);
         PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");
         
         boolean helpEnabled = getResources().getBoolean(R.bool.help_enabled);

-        Preference pHelp =  findPreference("help");
+        Preference pHelp = findPreference("help");

         if (pHelp != null ){
             if (helpEnabled) {
                 pHelp.setOnPreferenceClickListener(new OnPreferenceClickListener() {
         if (pHelp != null ){
             if (helpEnabled) {
                 pHelp.setOnPreferenceClickListener(new OnPreferenceClickListener() {


@@ -270,7 +270,7 @@ public class Preferences extends PreferenceActivity
         }
 
         if (BuildConfig.DEBUG) {
         }
 
         if (BuildConfig.DEBUG) {

-            Preference pLog =  findPreference("log");
+            Preference pLog = findPreference("log");

             if (pLog != null ){
                 pLog.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
             if (pLog != null ){
                 pLog.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override


@@ -313,7 +313,7 @@ public class Preferences extends PreferenceActivity
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);
                         startActivity(intent);
 
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);
                         startActivity(intent);
 

-                        return(true);
+                        return true;

 
                     }
                 });
 
                     }
                 });


@@ -330,9 +330,10 @@ public class Preferences extends PreferenceActivity
                 pFeedback.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
                 pFeedback.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {

-                        String feedbackMail   =(String) getText(R.string.mail_feedback);
-                        String feedback   =(String) getText(R.string.prefs_feedback) + " - android v" + appVersion;
-                        Intent intent = new Intent(Intent.ACTION_SENDTO); 
+                        String feedbackMail = (String) getText(R.string.mail_feedback);
+                        String feedback     = String.format("%s - android v%s", getText(R.string.prefs_feedback),  appVersion);
+                        Intent intent       = new Intent(Intent.ACTION_SENDTO);
+

                         intent.setType("text/plain");
                         intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
                         
                         intent.setType("text/plain");
                         intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
                         


@@ -413,7 +414,7 @@ public class Preferences extends PreferenceActivity
         mPrefInstantUploadCategory =
                 (PreferenceCategory) findPreference("instant_uploading_category");
         
         mPrefInstantUploadCategory =
                 (PreferenceCategory) findPreference("instant_uploading_category");
         

-        mPrefInstantUploadPathWiFi =  findPreference("instant_upload_on_wifi");
+        mPrefInstantUploadPathWiFi = findPreference("instant_upload_on_wifi");

         mPrefInstantUpload = findPreference("instant_uploading");
         
         toggleInstantPictureOptions(((CheckBoxPreference) mPrefInstantUpload).isChecked());
         mPrefInstantUpload = findPreference("instant_uploading");
         
         toggleInstantPictureOptions(((CheckBoxPreference) mPrefInstantUpload).isChecked());


@@ -459,7 +460,7 @@ public class Preferences extends PreferenceActivity
         });
             
         /* About App */
         });
             
         /* About App */

-       pAboutApp = (Preference) findPreference("about_app");
+       pAboutApp = findPreference("about_app");

        if (pAboutApp != null) { 
                pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
                pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
        if (pAboutApp != null) { 
                pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
                pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));


@@ -585,8 +586,7 @@ public class Preferences extends PreferenceActivity
 
         if (requestCode == ACTION_SELECT_UPLOAD_PATH && resultCode == RESULT_OK){
 
 
         if (requestCode == ACTION_SELECT_UPLOAD_PATH && resultCode == RESULT_OK){
 

-            OCFile folderToUpload =
-                    (OCFile) data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
+            OCFile folderToUpload =  data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);

 
             mUploadPath = folderToUpload.getRemotePath();
 
 
             mUploadPath = folderToUpload.getRemotePath();
 


@@ -599,8 +599,7 @@ public class Preferences extends PreferenceActivity
 
         } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK) {
 
 
         } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK) {
 

-            OCFile folderToUploadVideo =
-                    (OCFile) data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
+            OCFile folderToUploadVideo = data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);

 
             mUploadVideoPath = folderToUploadVideo.getRemotePath();
 
 
             mUploadVideoPath = folderToUploadVideo.getRemotePath();
 


@@ -887,7 +886,7 @@ public class Preferences extends PreferenceActivity
         editor.commit();
     }
 
         editor.commit();
     }
 

-    // Methods for ComponetsGetter
+    // Methods for ComponentsGetter

     @Override
     public FileDownloader.FileDownloaderBinder getFileDownloaderBinder() {
         return mDownloaderBinder;
     @Override
     public FileDownloader.FileDownloaderBinder getFileDownloaderBinder() {
         return mDownloaderBinder;


@@ -926,14 +925,10 @@ public class Preferences extends PreferenceActivity
 
             if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
                 mDownloaderBinder = (FileDownloader.FileDownloaderBinder) service;
 
             if (component.equals(new ComponentName(Preferences.this, FileDownloader.class))) {
                 mDownloaderBinder = (FileDownloader.FileDownloaderBinder) service;

-

             } else if (component.equals(new ComponentName(Preferences.this, FileUploader.class))) {
                 Log_OC.d(TAG, "Upload service connected");
                 mUploaderBinder = (FileUploader.FileUploaderBinder) service;
             } else if (component.equals(new ComponentName(Preferences.this, FileUploader.class))) {
                 Log_OC.d(TAG, "Upload service connected");
                 mUploaderBinder = (FileUploader.FileUploaderBinder) service;

-            } else {
-                return;

             }
             }

-

         }
 
         @Override
         }
 
         @Override

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index dc73fcc..bc05179 100644 (file)
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -37,13 +37,9 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.lib.common.utils.Log_OC;

+import com.owncloud.android.utils.FileStorageUtils;

 
 import java.io.File;
 
 import java.io.File;

-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;

 
 /**
  * Created by Bartosz Przybylski on 07.11.2015.
 
 /**
  * Created by Bartosz Przybylski on 07.11.2015.


@@ -154,7 +150,7 @@ public class StorageMigrationActivity extends AppCompatActivity {
                                rollback();
                                return e.getResId();
                        } catch (MigrationCleanupException e) {
                                rollback();
                                return e.getResId();
                        } catch (MigrationCleanupException e) {

-                               Log_OC.w(TAG, "Migration mleanup step failed");
+                               Log_OC.w(TAG, "Migration cleanup step failed");

                                return 0;
                        } finally {
                                publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
                                return 0;
                        } finally {
                                publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);


@@ -205,7 +201,7 @@ public class StorageMigrationActivity extends AppCompatActivity {
                        if (new File(dstFile, MainApp.getDataFolder()).exists())
                                throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
 
                        if (new File(dstFile, MainApp.getDataFolder()).exists())
                                throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
 

-                       if (dstFile.getFreeSpace() < calculateUsedSpace(new File(srcFile, MainApp.getDataFolder())))
+                       if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))

                                throw new MigrationException(R.string.file_migration_failed_not_enough_space);
                }
 
                                throw new MigrationException(R.string.file_migration_failed_not_enough_space);
                }
 


@@ -218,38 +214,6 @@ public class StorageMigrationActivity extends AppCompatActivity {
                        publishProgress(mProgress);
                }
 
                        publishProgress(mProgress);
                }
 

-               private boolean copyFile(File src, File target) {
-                       boolean ret = true;
-
-                       InputStream in = null;
-                       OutputStream out = null;
-
-                       try {
-                               in = new FileInputStream(src);
-                               out = new FileOutputStream(target);
-                               byte[] buf = new byte[1024];
-                               int len;
-                               while ((len = in.read(buf)) > 0) {
-                                       out.write(buf, 0, len);
-                               }
-                       } catch (IOException ex) {
-                               ret = false;
-                       } finally {
-                               if (in != null) try {
-                                       in.close();
-                               } catch (IOException e) {
-                                       e.printStackTrace(System.err);
-                               }
-                               if (out != null) try {
-                                       out.close();
-                               } catch (IOException e) {
-                                       e.printStackTrace(System.err);
-                               }
-                       }
-
-                       return ret;
-               }
-

                void copyDirs(File src, File dst) throws MigrationException {
                        if (!dst.mkdirs())
                                throw new MigrationException(R.string.file_migration_failed_while_coping);
                void copyDirs(File src, File dst) throws MigrationException {
                        if (!dst.mkdirs())
                                throw new MigrationException(R.string.file_migration_failed_while_coping);


@@ -261,7 +225,7 @@ public class StorageMigrationActivity extends AppCompatActivity {
 
                                if (f.isDirectory())
                                        copyDirs(f, new File(dst, f.getName()));
 
                                if (f.isDirectory())
                                        copyDirs(f, new File(dst, f.getName()));

-                               else if (!copyFile(f, new File(dst, f.getName())))
+                               else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))

                                        throw new MigrationException(R.string.file_migration_failed_while_coping);
                        }
 
                                        throw new MigrationException(R.string.file_migration_failed_while_coping);
                        }
 


@@ -290,19 +254,6 @@ public class StorageMigrationActivity extends AppCompatActivity {
                                        Log_OC.w(TAG, "Rollback step failed");
                }
 
                                        Log_OC.w(TAG, "Rollback step failed");
                }
 

-               long calculateUsedSpace(File dir) {
-                       long result = 0;
-
-                       for (File f : dir.listFiles()) {
-                               if (f.isDirectory())
-                                       result += calculateUsedSpace(f);
-                               else
-                                       result += f.length();
-                       }
-
-                       return result;
-               }
-

                void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
                        for (int i = 0; i < accounts.length; ++i)
                                syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);
                void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
                        for (int i = 0; i < accounts.length; ++i)
                                syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 999d490..e93ead0 100644 (file)
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -21,6 +21,11 @@
 package com.owncloud.android.utils;
 
 import java.io.File;
 package com.owncloud.android.utils;
 
 import java.io.File;

+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;

 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Vector;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Vector;


@@ -38,7 +43,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.net.Uri;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.net.Uri;

-import android.os.Environment;

 import android.os.StatFs;
 import android.webkit.MimeTypeMap;
 
 import android.os.StatFs;
 import android.webkit.MimeTypeMap;
 


@@ -274,13 +278,11 @@ public class FileStorageUtils {
     public static long getFolderSize(File dir) {
         if (dir.exists()) {
             long result = 0;
     public static long getFolderSize(File dir) {
         if (dir.exists()) {
             long result = 0;

-            File[] fileList = dir.listFiles();
-            for(int i = 0; i < fileList.length; i++) {
-                if(fileList[i].isDirectory()) {
-                    result += getFolderSize(fileList[i]);
-                } else {
-                    result += fileList[i].length();
-                }
+            for (File f : dir.listFiles()) {
+                if (f.isDirectory())
+                    result += getFolderSize(f);
+                else
+                    result += f.length();

             }
             return result;
         }
             }
             return result;
         }


@@ -330,4 +332,36 @@ public class FileStorageUtils {
         }
     }
 
         }
     }
 

+    public static boolean copyFile(File src, File target) {
+        boolean ret = true;
+
+        InputStream in = null;
+        OutputStream out = null;
+
+        try {
+            in = new FileInputStream(src);
+            out = new FileOutputStream(target);
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0) {
+                out.write(buf, 0, len);
+            }
+        } catch (IOException ex) {
+            ret = false;
+        } finally {
+            if (in != null) try {
+                in.close();
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+            if (out != null) try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+        }
+
+        return ret;
+    }
+

 }
 }