Browse Source

codacy: This for loop can be replaced by a foreach loop

AndyScherzinger 6 years ago
parent
commit
7308f3464b

+ 2 - 2
src/main/java/com/owncloud/android/jobs/ContactsImportJob.java

@@ -88,8 +88,8 @@ public class ContactsImportJob extends Job {
             }
 
 
-            for (int i = 0; i < intArray.length; i++) {
-                VCard vCard = vCards.get(intArray[i]);
+            for (int checkedItem : intArray) {
+                VCard vCard = vCards.get(checkedItem);
                 if (ContactListFragment.getDisplayName(vCard).length() != 0) {
                     if (!ownContactList.containsKey(vCard)) {
                         operations.insertContact(vCard);

+ 9 - 6
src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java

@@ -40,7 +40,6 @@ import java.io.File;
 public class ManageSpaceActivity extends AppCompatActivity {
 
     private static final String TAG = ManageSpaceActivity.class.getSimpleName();
-
     private static final String LIB_FOLDER = "lib";
 
     @Override
@@ -167,13 +166,13 @@ public class ManageSpaceActivity extends AppCompatActivity {
             if (dir != null && dir.isDirectory()) {
                 String[] children = dir.list();
                 if (children != null) {
-                    for (int i = 0; i < children.length; i++) {
-                        boolean success = deleteDir(new File(dir, children[i]));
+                    for (String child : children) {
+                        boolean success = deleteDir(new File(dir, child));
                         if (!success) {
-                            Log_OC.w(TAG, "File NOT deleted " + children[i]);
+                            Log_OC.w(TAG, "File NOT deleted " + child);
                             return false;
                         } else {
-                            Log_OC.d(TAG, "File deleted " + children[i]);
+                            Log_OC.d(TAG, "File deleted " + child);
                         }
                     }
                 } else {
@@ -181,7 +180,11 @@ public class ManageSpaceActivity extends AppCompatActivity {
                 }
             }
 
-            return dir.delete();
+            if (dir != null) {
+                return dir.delete();
+            } else {
+                return false;
+            }
         }
     }
 }

+ 4 - 4
src/main/java/com/owncloud/android/ui/activity/StorageMigration.java

@@ -251,14 +251,14 @@ public class StorageMigration {
         }
 
         protected void stopAccountsSyncing() {
-            for (int i = 0; i < mOcAccounts.length; ++i) {
-                ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, false);
+            for (Account ocAccount : mOcAccounts) {
+                ContentResolver.setSyncAutomatically(ocAccount, mAuthority, false);
             }
         }
 
         protected void waitForUnfinishedSynchronizations() {
-            for (int i = 0; i < mOcAccounts.length; ++i) {
-                while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority)) {
+            for (Account ocAccount : mOcAccounts) {
+                while (ContentResolver.isSyncActive(ocAccount, mAuthority)) {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {

+ 4 - 2
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -163,14 +163,16 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     public void setFavoriteAttributeForItemID(String fileId, boolean favorite) {
-        for (int i = 0; i < mFiles.size(); i++) {
+        int filesSize = mFiles.size();
+        for (int i = 0; i < filesSize; i++) {
             if (mFiles.get(i).getRemoteId().equals(fileId)) {
                 mFiles.get(i).setFavorite(favorite);
                 break;
             }
         }
 
-        for (int i = 0; i < mFilesAll.size(); i++) {
+        filesSize = mFilesAll.size();
+        for (int i = 0; i < filesSize; i++) {
             if (mFilesAll.get(i).getRemoteId().equals(fileId)) {
                 mFilesAll.get(i).setFavorite(favorite);
                 break;

+ 5 - 5
src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java

@@ -321,11 +321,11 @@ public class SslValidatorDialog extends Dialog {
         Map<String, String> result = new HashMap<>();
         String toParse = principal.getName();
         String[] pieces = toParse.split(",");
-        String[] tokens = {"CN", "O", "OU", "C", "ST", "L"}; 
-        for (int i=0; i < pieces.length ; i++) {
-            for (int j=0; j<tokens.length; j++) {
-                if (pieces[i].startsWith(tokens[j] + "=")) {
-                    result.put(tokens[j], pieces[i].substring(tokens[j].length()+1));
+        String[] tokens = {"CN", "O", "OU", "C", "ST", "L"};
+        for (String piece : pieces) {
+            for (String token : tokens) {
+                if (piece.startsWith(token + "=")) {
+                    result.put(token, piece.substring(token.length() + 1));
                 }
             }
         }

+ 3 - 4
src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java

@@ -290,12 +290,11 @@ public class EditShareFragment extends Fragment {
                         if (isChecked) {
                             if (!isFederated) {
                                 /// not federated shares -> enable all the subpermisions
-                                for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
+                                for (int subordinateCheckBoxId : sSubordinateCheckBoxIds) {
                                     //noinspection ConstantConditions, prevented in the method beginning
-                                    subordinate = getView().findViewById(sSubordinateCheckBoxIds[i]);
+                                    subordinate = getView().findViewById(subordinateCheckBoxId);
                                     subordinate.setVisibility(View.VISIBLE);
-                                    if (!subordinate.isChecked() &&
-                                            !mFile.isSharedWithMe()) {          // see (1)
+                                    if (!subordinate.isChecked() && !mFile.isSharedWithMe()) { // see (1)
                                         toggleDisablingListener(subordinate);
                                     }
                                 }

+ 4 - 2
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java

@@ -188,8 +188,10 @@ public class ContactListFragment extends FileFragment {
         } else {
             Set<Integer> checkedItems = new HashSet<>();
             int[] itemsArray = savedInstanceState.getIntArray(CHECKED_ITEMS_ARRAY_KEY);
-            for (int i = 0; i < itemsArray.length; i++) {
-                checkedItems.add(itemsArray[i]);
+            if (itemsArray != null) {
+                for (int checkedItem : itemsArray) {
+                    checkedItems.add(checkedItem);
+                }
             }
             if (checkedItems.size() > 0) {
                 onMessageEvent(new VCardToggleEvent(true));

+ 3 - 3
src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java

@@ -53,7 +53,6 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
     private Set<Integer> mObsoletePositions;
     private Set<Integer> mDownloadErrors;
     private FileDataStorageManager mStorageManager;
-
     private SparseArray<FileFragment> mCachedFragments;
 
     /**
@@ -240,12 +239,13 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
      * Reset the image zoom to default value for each CachedFragments
      */
     public void resetZoom() {
+        Matrix matrix = new Matrix();
         for (int i = 0; i < mCachedFragments.size(); i++) {
             FileFragment fileFragment = mCachedFragments.valueAt(i);
 
             if (fileFragment instanceof PreviewImageFragment) {
-                ((PreviewImageFragment) fileFragment).getImageView().setDisplayMatrix(new Matrix());
-                ((PreviewImageFragment) fileFragment).getImageView().setSuppMatrix(new Matrix());
+                ((PreviewImageFragment) fileFragment).getImageView().setDisplayMatrix(matrix);
+                ((PreviewImageFragment) fileFragment).getImageView().setSuppMatrix(matrix);
             }
         }
     }