Эх сурвалжийг харах

Reduce spotbugs

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 жил өмнө
parent
commit
314a28f4a2

+ 1 - 1
app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -1758,7 +1758,7 @@ public class FileDataStorageManager {
                             ProviderTableMeta.CONTENT_URI_FILE,
                             projection,
                             whereForDescencentsInConflict,
-                            new String[]{user.getAccountName(), parentPath + "%"},
+                            new String[]{user.getAccountName(), parentPath + '%'},
                             null
                         );
                     } else {

+ 6 - 2
app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -360,7 +360,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     }
 
     public String getFileNameWithoutExtension(String fileName) {
-        int dotIndex = fileName.lastIndexOf(".");
+        int dotIndex = fileName.lastIndexOf('.');
         if (dotIndex > 0) {
             return fileName.substring(0, dotIndex);
         } else {
@@ -552,7 +552,11 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
      */
     public String getParentRemotePath() {
         String parentPath = new File(this.getRemotePath()).getParent();
-        return parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
+        if (parentPath != null) {
+            return parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
+        } else {
+            return null;
+        }
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -201,7 +201,7 @@ public class UploadsStorageManager extends Observable {
                     TAG,
                     "Updating " + path + " with status:" + status + " and result:"
                             + (result == null ? "null" : result.toString()) + " (old:"
-                            + upload.toFormattedString() + ")");
+                            + upload.toFormattedString() + ')');
 
             upload.setUploadStatus(status);
             upload.setLastResult(result);

+ 2 - 1
app/src/main/java/com/owncloud/android/media/MediaControlView.java

@@ -21,6 +21,7 @@ package com.owncloud.android.media;
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -140,7 +141,7 @@ public class MediaControlView extends LinearLayout implements OnClickListener, O
         }
     }
 
-    private final Handler handler = new Handler() {
+    private final Handler handler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             if (msg.what == SHOW_PROGRESS) {

+ 1 - 1
app/src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -295,7 +295,7 @@ public final class DisplayUtils {
             hostStart = url.indexOf('@') + "@".length();
         }
 
-        int hostEnd = url.substring(hostStart).indexOf("/");
+        int hostEnd = url.substring(hostStart).indexOf('/');
         // Handle URL which doesn't have a path (path is implicitly '/')
         hostEnd = hostEnd == -1 ? urlNoDots.length() : hostStart + hostEnd;
 

+ 1 - 1
app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java

@@ -116,7 +116,7 @@ public final class EncryptionUtils {
     public static final String ivDelimiter = "|"; // not base64 encoded
     public static final String ivDelimiterOld = "fA=="; // "|" base64 encoded
 
-    private static final String HASH_DELIMITER = "$";
+    private static final char HASH_DELIMITER = '$';
     private static final int iterationCount = 1024;
     private static final int keyStrength = 256;
     private static final String AES_CIPHER = "AES/GCM/NoPadding";

+ 0 - 3
app/src/main/res/values/dims.xml

@@ -110,9 +110,6 @@
     <dimen name="contactlist_item_icon_layout_height">40dp</dimen>
     <dimen name="empty_list_icon_layout_width">72dp</dimen>
     <dimen name="empty_list_icon_layout_height">72dp</dimen>
-    <dimen name="grid_image_shared_icon_layout_top_margin">24dp</dimen>
-    <dimen name="grid_image_local_file_indicator_layout_width">16dp</dimen>
-    <dimen name="grid_image_local_file_indicator_layout_height">16dp</dimen>
     <dimen name="grid_image_icon_margin">14dp</dimen>
     <dimen name="grid_image_icon_padding">14dp</dimen>
     <dimen name="grid_item_shared_icon_layout_top_margin">24dp</dimen>

+ 0 - 7
app/src/main/res/values/styles.xml

@@ -233,13 +233,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Button.Borderless.Destructive" parent="Widget.Material3.Button.TextButton">
-        <item name="android:textColor">@color/highlight_textColor_Warning</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="Button.Borderless.Login" parent="Widget.Material3.Button.TextButton">
         <item name="android:textColor">@color/fg_inverse</item>
         <item name="android:textAllCaps">false</item>