Browse Source

changes due to codacy

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 6 years ago
parent
commit
86da82f7b7

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java

@@ -123,7 +123,7 @@ public class ActivityAndVersionListAdapter extends ActivityListAdapter {
 
 
                         @Override
                         @Override
                         public void onError(String error) {
                         public void onError(String error) {
-
+                            versionListInterface.onError(error);
                         }
                         }
                     }));
                     }));
         } else {
         } else {

+ 9 - 6
src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -392,6 +392,11 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
         fetchAndSetData(null);
         fetchAndSetData(null);
     }
     }
 
 
+    @Override
+    public void onError(String message) {
+        Snackbar.make(recyclerView, message, Snackbar.LENGTH_LONG).show();
+    }
+
     @Override
     @Override
     public void onRestoreClicked(FileVersion fileVersion, VersionListInterface.Callback callback) {
     public void onRestoreClicked(FileVersion fileVersion, VersionListInterface.Callback callback) {
         new RestoreFileVersionTask(fileVersion, userId, ownCloudClient, storageManager, operationsHelper, file,
         new RestoreFileVersionTask(fileVersion, userId, ownCloudClient, storageManager, operationsHelper, file,
@@ -430,12 +435,10 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
 
 
             RemoteOperationResult result = restoreFileVersionOperation.execute(client);
             RemoteOperationResult result = restoreFileVersionOperation.execute(client);
 
 
-            if (result.isSuccess()) {
-                if (ocFile.isDown()) {
-                    List<OCFile> list = new ArrayList<>();
-                    list.add(ocFile);
-                    operationsHelper.removeFiles(list, true, true);
-                }
+            if (result.isSuccess() && ocFile.isDown()) {
+                List<OCFile> list = new ArrayList<>();
+                list.add(ocFile);
+                operationsHelper.removeFiles(list, true, true);
             }
             }
             
             
             return result.isSuccess();
             return result.isSuccess();

+ 2 - 0
src/main/java/com/owncloud/android/ui/interfaces/VersionListInterface.java

@@ -29,6 +29,8 @@ public interface VersionListInterface {
         void onRestoreClicked(FileVersion fileVersion, Callback callback);
         void onRestoreClicked(FileVersion fileVersion, Callback callback);
 
 
         void onSuccess(String message);
         void onSuccess(String message);
+
+        void onError(String message);
     }
     }
     
     
     interface Callback {
     interface Callback {

+ 0 - 1
src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -46,7 +46,6 @@ import android.support.v7.widget.AppCompatCheckBox;
 import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.SwitchCompat;
 import android.text.Html;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.Spanned;
-import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.SeekBar;