random fixes

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

app/src/main/java/com/nextcloud/android/sso/PatchMethod.java

@@ -106,11 +106,10 @@ public class PatchMethod extends PostMethod {
             // as bytes allows us to keep the current charset without worrying about how
             // this charset will effect the encoding of the form url encoded string.
             String content = EncodingUtil.formUrlEncode(getParameters(), getRequestCharSet());
-            ByteArrayRequestEntity entity = new ByteArrayRequestEntity(
+            return new ByteArrayRequestEntity(
                 EncodingUtil.getAsciiBytes(content),
                 FORM_URL_ENCODED_CONTENT_TYPE
             );
-            return entity;
         } else {
             return super.generateRequestEntity();
         }

app/src/main/java/com/nextcloud/java/util/Optional.java

@@ -31,7 +31,6 @@ import java.util.NoSuchElementException;
 import androidx.core.util.Consumer;
 import androidx.core.util.ObjectsCompat;
 import androidx.core.util.Supplier;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import kotlin.jvm.functions.Function1;
 
 /**
@@ -83,11 +82,9 @@ public final class Optional<T> {
      * @param <T> Type of the non-existent value
      * @return an empty {@code Optional}
      */
+    @SuppressWarnings("unchecked")
     public static<T> Optional<T> empty() {
-        @SuppressWarnings("unchecked")
-        @SuppressFBWarnings("USBR_UNNECESSARY_STORE_BEFORE_RETURN")
-        Optional<T> t = (Optional<T>) EMPTY;
-        return t;
+        return (Optional<T>) EMPTY;
     }
 
     /**

app/src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -1081,7 +1081,7 @@ public class FileContentProvider extends ContentProvider {
 
         @VisibleForTesting
         public static void verifyColumns(@Nullable ContentValues contentValues) {
-            if (contentValues == null || contentValues.keySet().size() == 0) {
+            if (contentValues == null || contentValues.keySet().isEmpty()) {
                 return;
             }
 

app/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java

@@ -33,7 +33,6 @@ import android.view.ViewGroup;
 import com.nextcloud.client.account.CurrentAccountProvider;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.common.NextcloudClient;
-import com.owncloud.android.R;
 import com.owncloud.android.databinding.VersionListItemBinding;
 import com.owncloud.android.lib.resources.activities.model.Activity;
 import com.owncloud.android.lib.resources.files.model.FileVersion;
@@ -103,13 +102,7 @@ public class ActivityAndVersionListAdapter extends ActivityListAdapter {
 
             if (item instanceof Activity) {
                 Activity activity = (Activity) item;
-                if (activity.getDatetime() != null) {
-                    time = getHeaderDateString(context, activity.getDatetime().getTime()).toString();
-                } else if (activity.getDate() != null) {
-                    time = getHeaderDateString(context, activity.getDate().getTime()).toString();
-                } else {
-                    time = context.getString(R.string.date_unknown);
-                }
+                time = getHeaderDateString(context, activity.getDatetime().getTime()).toString();
             } else {
                 FileVersion version = (FileVersion) item;
                 time = getHeaderDateString(context, version.getModifiedTimestamp()).toString();

app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -129,13 +129,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         for (Object o : activityItems) {
             Activity activity = (Activity) o;
             String time;
-            if (activity.getDatetime() != null) {
-                time = getHeaderDateString(context, activity.getDatetime().getTime()).toString();
-            } else if (activity.getDate() != null) {
-                time = getHeaderDateString(context, activity.getDate().getTime()).toString();
-            } else {
-                time = context.getString(R.string.date_unknown);
-            }
+            time = getHeaderDateString(context, activity.getDatetime().getTime()).toString();
 
             if (sTime.equalsIgnoreCase(time)) {
                 values.add(activity);
@@ -167,18 +161,14 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         if (holder instanceof ActivityViewHolder) {
             final ActivityViewHolder activityViewHolder = (ActivityViewHolder) holder;
             Activity activity = (Activity) values.get(position);
-            if (activity.getDatetime() != null) {
-                activityViewHolder.binding.datetime.setVisibility(View.VISIBLE);
-                activityViewHolder.binding.datetime.setText(DateFormat.format("HH:mm", activity.getDatetime().getTime()));
-            } else {
-                activityViewHolder.binding.datetime.setVisibility(View.GONE);
-            }
+            activityViewHolder.binding.datetime.setVisibility(View.VISIBLE);
+            activityViewHolder.binding.datetime.setText(DateFormat.format("HH:mm", activity.getDatetime().getTime()));
 
-            if (activity.getRichSubjectElement() != null &&
-                !TextUtils.isEmpty(activity.getRichSubjectElement().getRichSubject())) {
+            if (!TextUtils.isEmpty(activity.getRichSubjectElement().getRichSubject())) {
                 activityViewHolder.binding.subject.setVisibility(View.VISIBLE);
                 activityViewHolder.binding.subject.setMovementMethod(LinkMovementMethod.getInstance());
-                activityViewHolder.binding.subject.setText(addClickablePart(activity.getRichSubjectElement()), TextView.BufferType.SPANNABLE);
+                activityViewHolder.binding.subject.setText(addClickablePart(activity.getRichSubjectElement()),
+                                                           TextView.BufferType.SPANNABLE);
                 activityViewHolder.binding.subject.setVisibility(View.VISIBLE);
             } else if (!TextUtils.isEmpty(activity.getSubject())) {
                 activityViewHolder.binding.subject.setVisibility(View.VISIBLE);
@@ -210,8 +200,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             }
 
 
-            if (activity.getRichSubjectElement() != null &&
-                activity.getRichSubjectElement().getRichObjectList().size() > 0) {
+            if (activity.getRichSubjectElement().getRichObjectList().size() > 0) {
                 activityViewHolder.binding.list.setVisibility(View.VISIBLE);
                 activityViewHolder.binding.list.removeAllViews();
 
@@ -391,8 +380,8 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     private int getThumbnailDimension() {
         // Converts dp to pixel
         Resources r = MainApp.getAppContext().getResources();
-        Double d = Math.pow(2, Math.floor(Math.log(r.getDimension(R.dimen.file_icon_size_grid)) / Math.log(2))) / 2;
-        return d.intValue();
+        double d = Math.pow(2, Math.floor(Math.log(r.getDimension(R.dimen.file_icon_size_grid)) / Math.log(2))) / 2;
+        return (int) d;
     }
 
     CharSequence getHeaderDateString(Context context, long modificationTimestamp) {

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -258,10 +258,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     public void setEncryptionAttributeForItemID(String fileId, boolean encrypted) {
-        int filesSize = mFiles.size();
-        for (int i = 0; i < filesSize; i++) {
-            if (mFiles.get(i).getRemoteId().equals(fileId)) {
-                OCFile file = mFiles.get(i);
+        for (OCFile file : mFiles) {
+            if (file.getRemoteId().equals(fileId)) {
                 file.setEncrypted(encrypted);
                 mStorageManager.saveFile(file);
 
@@ -269,11 +267,9 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
         }
 
-        filesSize = mFilesAll.size();
-        for (int i = 0; i < filesSize; i++) {
-            if (mFilesAll.get(i).getRemoteId().equals(fileId)) {
-                mFilesAll.get(i).setEncrypted(encrypted);
-                break;
+        for (OCFile file : mFilesAll) {
+            if (file.getRemoteId().equals(fileId)) {
+                file.setEncrypted(encrypted);
             }
         }
 
@@ -298,7 +294,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     public boolean isEmpty() {
-        return mFiles.size() == 0;
+        return mFiles.isEmpty();
     }
 
     @NonNull

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -826,7 +826,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     @Override
     public void onPrepareOptionsMenu(@NonNull Menu menu) {
-        if (mOriginalMenuItems.size() == 0) {
+        if (mOriginalMenuItems.isEmpty()) {
             mOriginalMenuItems.add(menu.findItem(R.id.action_search));
         }