Merge pull request #6423 from nextcloud/noNotNull

do not user NotNull, but NonNull

src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -40,7 +40,6 @@ import junit.framework.TestCase;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -52,6 +51,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
+import androidx.annotation.NonNull;
 import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -284,7 +284,7 @@ public abstract class AbstractIT {
         };
 
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
-            @NotNull
+            @NonNull
             @Override
             public BatteryStatus getBattery() {
                 return new BatteryStatus();

src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -35,11 +35,11 @@ import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static junit.framework.TestCase.assertFalse;
@@ -80,7 +80,7 @@ public class UploadIT extends AbstractIT {
             return false;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public BatteryStatus getBattery() {
             return new BatteryStatus(false, 0);
@@ -206,7 +206,7 @@ public class UploadIT extends AbstractIT {
                 return false;
             }
 
-            @NotNull
+            @NonNull
             @Override
             public BatteryStatus getBattery() {
                 return new BatteryStatus(true, 100);

src/main/java/com/owncloud/android/ui/adapter/SendButtonAdapter.java

@@ -28,8 +28,6 @@ import android.view.ViewGroup;
 import com.owncloud.android.databinding.SendButtonBinding;
 import com.owncloud.android.ui.components.SendButtonData;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 import androidx.annotation.NonNull;
@@ -68,7 +66,7 @@ public class SendButtonAdapter extends RecyclerView.Adapter<SendButtonAdapter.Vi
         private ClickListener clickListener;
         private SendButtonData sendButtonDataData;
 
-        public ViewHolder(@NotNull SendButtonBinding binding, ClickListener clickListener) {
+        public ViewHolder(@NonNull SendButtonBinding binding, ClickListener clickListener) {
             super(binding.getRoot());
             this.binding = binding;
             this.clickListener = clickListener;

src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -73,8 +73,6 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeType;
 import com.owncloud.android.utils.MimeTypeUtil;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -342,7 +340,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
      * {@inheritDoc}
      */
     @Override
-    public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.item_file, menu);
 
@@ -363,7 +361,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
      * {@inheritDoc}
      */
     @Override
-    public void onPrepareOptionsMenu(@NotNull Menu menu) {
+    public void onPrepareOptionsMenu(@NonNull Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
         if (containerActivity.getStorageManager() != null && getFile() != null) {

src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java

@@ -19,8 +19,6 @@
  */
 package com.owncloud.android.ui.preview;
 
-import android.accounts.Account;
-import android.graphics.Matrix;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
@@ -33,8 +31,6 @@ import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -147,7 +143,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
     }
 
 
-    @NotNull
+    @NonNull
     public Fragment getItem(int i) {
         OCFile file = getFileAt(i);
         Fragment fragment;

src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

@@ -44,7 +44,6 @@ import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
-import org.jetbrains.annotations.NotNull;
 import org.mozilla.universalchardet.ReaderFactory;
 
 import java.io.BufferedWriter;
@@ -237,7 +236,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
      * {@inheritDoc}
      */
     @Override
-    public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.item_file, menu);
 
@@ -257,7 +256,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
      * {@inheritDoc}
      */
     @Override
-    public void onPrepareOptionsMenu(@NotNull Menu menu) {
+    public void onPrepareOptionsMenu(@NonNull Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
         if (containerActivity.getStorageManager() != null) {

src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java

@@ -43,8 +43,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
-import org.jetbrains.annotations.NotNull;
-
 import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
@@ -123,7 +121,7 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
      * {@inheritDoc}
      */
     @Override
-    public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
 
         MenuItem menuItem = menu.findItem(R.id.action_search);