sendButtonDataList;
diff --git a/src/main/java/com/owncloud/android/ui/adapter/ShareUserListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
index e25d7631ea8a..cd0b956c4265 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/ShareUserListAdapter.java
@@ -21,8 +21,6 @@
package com.owncloud.android.ui.adapter;
import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,6 +35,9 @@
import java.security.NoSuchAlgorithmException;
import java.util.List;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+
/**
* Adapter to show a user/group in Share With List
*/
diff --git a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
index e7af2e555a2e..0a5d9c76b3f8 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
@@ -22,7 +22,6 @@
package com.owncloud.android.ui.adapter;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -44,6 +43,7 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
diff --git a/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
index edde6e2d3e40..d0191af114b5 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
@@ -24,8 +24,6 @@
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -48,6 +46,8 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
diff --git a/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index 4c1298ce46e7..19a864e6ded1 100755
--- a/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -26,7 +26,6 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.annotation.NonNull;
import android.text.format.DateUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -58,6 +57,7 @@
import java.util.Arrays;
import java.util.Comparator;
+import androidx.annotation.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
diff --git a/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java
index ca6b970207f8..0e278496189f 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java
@@ -24,11 +24,6 @@
import android.accounts.Account;
import android.content.Context;
import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -54,6 +49,11 @@
import java.security.NoSuchAlgorithmException;
import java.util.List;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
diff --git a/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
index 1b20382b729b..295c5573088e 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
@@ -20,7 +20,6 @@
package com.owncloud.android.ui.adapter;
import android.content.Context;
-import android.support.annotation.NonNull;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -39,6 +38,8 @@
import javax.security.auth.x500.X500Principal;
+import androidx.annotation.NonNull;
+
/**
* Show certificate information.
*/
diff --git a/src/main/java/com/owncloud/android/ui/components/CustomEditText.java b/src/main/java/com/owncloud/android/ui/components/CustomEditText.java
index fe5159b60ad4..5ab3a1d06372 100644
--- a/src/main/java/com/owncloud/android/ui/components/CustomEditText.java
+++ b/src/main/java/com/owncloud/android/ui/components/CustomEditText.java
@@ -32,7 +32,7 @@
/**
* Custom edit text to support fixed suffix or prefix
*/
-public class CustomEditText extends android.support.v7.widget.AppCompatEditText {
+public class CustomEditText extends androidx.appcompat.widget.AppCompatEditText {
private Rect fixedRect = new Rect();
private String fixedText = "";
private boolean isPrefixFixed;
diff --git a/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java b/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java
index 696b2095cdaf..3119385274f2 100644
--- a/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java
+++ b/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java
@@ -2,12 +2,13 @@
import android.annotation.SuppressLint;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
public class CustomViewPager extends ViewPager {
public CustomViewPager(@NonNull Context context) {
super(context);
diff --git a/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java b/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java
index de8bca3a1c19..27ff1829574a 100644
--- a/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java
+++ b/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java
@@ -20,10 +20,11 @@
package com.owncloud.android.ui.decoration;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ItemDecoration;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
+
/**
* Decoration for media grid items.
*/
@@ -41,4 +42,4 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, Recycle
outRect.left = space;
outRect.top = space;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java b/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java
index 1d5d0306f280..ecb58318eb03 100644
--- a/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java
+++ b/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java
@@ -25,11 +25,12 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.view.View;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* DividerItemDecoration based on {@link DividerItemDecoration} adding a 72dp left padding.
*/
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/main/java/com/owncloud/android/ui/dialog/ChangelogDialog.java
index 54108735d185..29fbba553234 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ChangelogDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ChangelogDialog.java
@@ -22,12 +22,13 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import android.webkit.WebView;
import com.owncloud.android.R;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to show the contents of res/raw/CHANGELOG.txt
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
index f36c6ce60385..f1397eca41e3 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
@@ -23,11 +23,12 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import com.owncloud.android.R;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
public class ConfirmationDialogFragment extends DialogFragment {
@@ -147,9 +148,11 @@ public void onClick(DialogInterface dialog, int which) {
public interface ConfirmationDialogFragmentListener {
- public void onConfirmation(String callerTag);
- public void onNeutral(String callerTag);
- public void onCancel(String callerTag);
+ void onConfirmation(String callerTag);
+
+ void onNeutral(String callerTag);
+
+ void onCancel(String callerTag);
}
}
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index c5560e9d34f2..5c254ff1cdbd 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -24,15 +24,16 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
import com.owncloud.android.R;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
/**
* Dialog which will be displayed to user upon keep-in-sync file conflict.
diff --git a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
index 1b450613db98..a84d059ddf43 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
@@ -24,9 +24,6 @@
import android.content.DialogInterface;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
@@ -41,6 +38,10 @@
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to input the name for a new folder to create.
*
diff --git a/src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
index da820eb91450..7da5806bb2c0 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
@@ -22,9 +22,6 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AlertDialog.Builder;
import android.text.InputType;
import android.view.Window;
import android.view.WindowManager.LayoutParams;
@@ -36,6 +33,10 @@
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.fragment.app.DialogFragment;
+
/**
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java
index 0244ebcd2064..28b9982f8f9a 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java
@@ -25,8 +25,6 @@
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
import android.text.format.DateUtils;
import android.widget.DatePicker;
@@ -37,6 +35,9 @@
import java.util.Calendar;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog requesting a date after today.
*/
diff --git a/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index e758a7f3cdec..92a278053c53 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@ -24,14 +24,15 @@
import android.content.DialogInterface;
import android.content.DialogInterface.OnKeyListener;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
import android.view.KeyEvent;
import android.widget.ProgressBar;
import com.owncloud.android.R;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
public class IndeterminateProgressDialog extends DialogFragment {
diff --git a/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java b/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
index bf8df600ba5a..f31b48354a05 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
@@ -21,8 +21,6 @@
import android.app.Dialog;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -33,6 +31,9 @@
import com.owncloud.android.R;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
public class LoadingDialog extends DialogFragment {
private String mMessage;
diff --git a/src/main/java/com/owncloud/android/ui/dialog/OwnCloudListPreference.java b/src/main/java/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
index 54ec4995c6f2..f59c61c8d014 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/OwnCloudListPreference.java
@@ -7,7 +7,6 @@
import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatDialog;
import android.util.AttributeSet;
import com.owncloud.android.R;
@@ -15,6 +14,8 @@
import java.lang.reflect.Method;
+import androidx.appcompat.app.AppCompatDialog;
+
public class OwnCloudListPreference extends ListPreference {
private static final String TAG = OwnCloudListPreference.class.getSimpleName();
@@ -51,8 +52,8 @@ protected void showDialog(Bundle state) {
int preselect = findIndexOfValue(getValue());
// same thing happens for the Standard ListPreference though
- android.support.v7.app.AlertDialog.Builder builder =
- new android.support.v7.app.AlertDialog.Builder(mContext, R.style.ownCloud_AlertDialog)
+ androidx.appcompat.app.AlertDialog.Builder builder =
+ new androidx.appcompat.app.AlertDialog.Builder(mContext, R.style.ownCloud_AlertDialog)
.setTitle(getDialogTitle())
.setIcon(getDialogIcon())
.setSingleChoiceItems(getEntries(), preselect, this);
diff --git a/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
index 443d07375fdd..4a57e5bc4e51 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
@@ -22,7 +22,6 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.view.ActionMode;
import com.owncloud.android.R;
@@ -34,6 +33,8 @@
import java.util.ArrayList;
import java.util.Collection;
+import androidx.annotation.NonNull;
+
/**
* Dialog requiring confirmation before removing a collection of given OCFiles.
*
@@ -132,7 +133,7 @@ public void onStart() {
int color = ThemeUtils.primaryAccentColor(getActivity());
- android.support.v7.app.AlertDialog alertDialog = (android.support.v7.app.AlertDialog) getDialog();
+ androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) getDialog();
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
diff --git a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
index dc3901e8eaa6..a5bff783906f 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
@@ -30,9 +30,6 @@
import android.content.DialogInterface;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
@@ -47,6 +44,10 @@
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to input a new name for a file or folder to rename.
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/main/java/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index 39d98ce67eb7..95dfa6731ca0 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -27,9 +27,6 @@
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -45,6 +42,10 @@
import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
import com.owncloud.android.lib.common.utils.Log_OC;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
* Dialog to show the WebView for SAML Authentication
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java b/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
index 5efd7b0d28ec..d7b7c99bc607 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
@@ -6,12 +6,6 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -19,6 +13,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.utils.Log_OC;
@@ -33,6 +29,11 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
/*
* Nextcloud Android client application
*
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java
index deb4f6b5b980..f1048b362294 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java
@@ -28,10 +28,6 @@
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
@@ -58,6 +54,11 @@
import java.util.List;
import java.util.Locale;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.DialogFragment;
+
/*
* Dialog to setup encryption
*/
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index f1e0ba44bb1d..afccfa87339b 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -29,10 +29,6 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -50,6 +46,11 @@
import java.util.List;
import java.util.Locale;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog showing a list activities able to resolve a given Intent,
* filtering out the activities matching give package names.
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
index c5740eb73229..cc00b1f9ebb5 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java
@@ -24,10 +24,6 @@
import android.content.DialogInterface;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -43,6 +39,11 @@
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to input the password for sharing a file/folder.
*
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java
index 7e89985e3b0c..6ea6b1a750f1 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java
@@ -24,9 +24,6 @@
import android.app.Dialog;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.AppCompatButton;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -38,6 +35,10 @@
import com.owncloud.android.utils.FileSortOrder;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to show and choose the sorting order for the file listing.
*/
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java b/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
index 04dfa40f5e81..e3248901a52a 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
@@ -24,7 +24,6 @@
import android.app.Dialog;
import android.net.http.SslError;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -46,6 +45,8 @@
import java.security.GeneralSecurityException;
import java.security.cert.X509Certificate;
+import androidx.fragment.app.DialogFragment;
+
/**
* Dialog to show information about an untrusted certificate and allow the user
* to decide trust on it or not.
@@ -138,14 +139,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
} else {
((ViewGroup)mView.getParent()).removeView(mView);
}
-
- Button ok = (Button) mView.findViewById(R.id.ok);
+
+ Button ok = mView.findViewById(R.id.ok);
ok.setOnClickListener(new OnCertificateTrusted());
-
- Button cancel = (Button) mView.findViewById(R.id.cancel);
+
+ Button cancel = mView.findViewById(R.id.cancel);
cancel.setOnClickListener(new OnCertificateNotTrusted());
-
- Button details = (Button) mView.findViewById(R.id.details_btn);
+
+ Button details = mView.findViewById(R.id.details_btn);
details.setOnClickListener(new OnClickListener() {
@Override
@@ -222,9 +223,11 @@ public void onClick(View v) {
public interface OnSslUntrustedCertListener {
- public void onSavedCertificate();
- public void onFailedSavingCertificate();
- public void onCancelCertificate();
+ void onSavedCertificate();
+
+ void onFailedSavingCertificate();
+
+ void onCancelCertificate();
}
public interface ErrorViewAdapter {
diff --git a/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
index 79bb80c9c062..1d24176989f8 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
@@ -27,13 +27,6 @@
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.SwitchCompat;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.View;
@@ -53,6 +46,14 @@
import java.io.File;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.DialogFragment;
+
import static com.owncloud.android.datamodel.SyncedFolderDisplayItem.UNPERSISTED_ID;
/**
diff --git a/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java b/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
index 1f382f9813bf..432eb3e09de4 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
@@ -23,10 +23,6 @@
import android.accounts.Account;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -46,6 +42,11 @@
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
+
public class EditShareFragment extends Fragment {
private static final String TAG = EditShareFragment.class.getSimpleName();
diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index acfc91644ee3..6cd19a1a96e0 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -29,18 +29,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
@@ -61,6 +49,8 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -82,6 +72,17 @@
import java.util.ArrayList;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
public class ExtendedListFragment extends Fragment
implements OnItemClickListener, OnEnforceableRefreshListener, SearchView.OnQueryTextListener,
SearchView.OnCloseListener {
@@ -232,7 +233,7 @@ public void run() {
});
final View mSearchEditFrame = searchView
- .findViewById(android.support.v7.appcompat.R.id.search_edit_frame);
+ .findViewById(androidx.appcompat.R.id.search_edit_frame);
ViewTreeObserver vto = mSearchEditFrame.getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java
index e4d4e3f791e0..e0a6b0c37861 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java
@@ -2,9 +2,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.BulletSpan;
@@ -20,6 +17,10 @@
import com.owncloud.android.features.FeatureItem;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
public class FeatureFragment extends Fragment {
private FeatureItem item;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java
index 5e059eaf7e96..954a1e3e8680 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java
@@ -3,9 +3,6 @@
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -14,6 +11,10 @@
import com.owncloud.android.R;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
public class FeatureWebFragment extends Fragment {
private String mWebUrl;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java
index a577b64a8799..9030c7a0c1b5 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java
@@ -28,14 +28,6 @@
import android.graphics.PorterDuff;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputEditText;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -44,6 +36,8 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -75,6 +69,12 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import butterknife.BindString;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -459,4 +459,4 @@ protected void onPostExecute(Boolean success) {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 156a5c314998..1f7ff3c54b9f 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -26,10 +26,6 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -42,6 +38,7 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import com.google.android.material.tabs.TabLayout;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -64,6 +61,9 @@
import java.lang.ref.WeakReference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
index e4295118f1aa..2dcbe23dd03b 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
@@ -27,13 +27,6 @@
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -45,6 +38,7 @@
import android.widget.PopupMenu;
import android.widget.TextView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@@ -66,6 +60,12 @@
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
index f0d00ea4606d..8e6417938b0d 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
@@ -24,14 +24,15 @@
import android.accounts.Account;
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.ui.activity.ComponentsGetter;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
import static com.owncloud.android.ui.activity.FileActivity.EXTRA_FILE;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 8095547994c8..188f9b82c494 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -23,9 +23,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -40,6 +37,10 @@
import java.io.File;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* A Fragment that lists all files and folders in a given LOCAL path.
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
index 18168c6b757a..40fecccd50aa 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
@@ -22,17 +22,17 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.owncloud.android.R;
import com.owncloud.android.utils.ThemeUtils;
+import androidx.annotation.NonNull;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 6c1da53e64dd..8708a4a24178 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -35,18 +35,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.ActionMode;
import android.view.LayoutInflater;
@@ -59,6 +47,8 @@
import android.widget.PopupMenu;
import android.widget.RelativeLayout;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -120,6 +110,17 @@
import java.util.List;
import java.util.Set;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
/**
* A Fragment that lists all files and folders in a given path.
* TODO refactor to get rid of direct dependency on FileDisplayActivity
diff --git a/src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java b/src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java
index c1426d81f97b..c127ddfbd26e 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java
@@ -26,9 +26,6 @@
import android.app.SearchManager;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.SearchView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -45,6 +42,10 @@
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.Fragment;
+
/**
* Fragment for Searching sharees (users and groups)
*
@@ -111,7 +112,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
View view = inflater.inflate(R.layout.search_users_groups_layout, container, false);
// Get the SearchView and set the searchable configuration
- SearchView searchView = (SearchView) view.findViewById(R.id.searchView);
+ SearchView searchView = view.findViewById(R.id.searchView);
SearchManager searchManager = (SearchManager) getActivity().getSystemService(Context.SEARCH_SERVICE);
searchView.setSearchableInfo(searchManager.getSearchableInfo(
getActivity().getComponentName()) // assumes parent activity is the searchable activity
@@ -177,7 +178,7 @@ private void updateListOfUserGroups() {
);
// Show data
- ListView usersList = (ListView) getView().findViewById(R.id.searchUsersListView);
+ ListView usersList = getView().findViewById(R.id.searchUsersListView);
if (mShares.size() > 0) {
usersList.setVisibility(View.VISIBLE);
diff --git a/src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 25db421e2803..e9ec27f22fd2 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -30,11 +30,6 @@
import android.graphics.PorterDuff;
import android.net.Uri;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -46,6 +41,7 @@
import android.widget.ScrollView;
import android.widget.TextView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
@@ -62,8 +58,13 @@
import com.owncloud.android.utils.ThemeUtils;
import java.text.SimpleDateFormat;
-import java.util.List;
import java.util.Date;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
/**
* Fragment for Sharing a file with sharees (users or groups) or creating
diff --git a/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java b/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java
index 819da09b242c..5a0ee90358fe 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java
@@ -20,11 +20,12 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask;
+import androidx.fragment.app.Fragment;
+
/**
* Fragment retaining a background task across configuration changes.
*/
diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
index f50945bd9065..64a2a0daff14 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
@@ -38,13 +38,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -65,6 +58,7 @@
import com.bumptech.glide.request.target.SimpleTarget;
import com.evernote.android.job.JobRequest;
import com.evernote.android.job.util.support.PersistableBundleCompat;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@@ -93,6 +87,12 @@
import java.util.List;
import java.util.Set;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import ezvcard.Ezvcard;
@@ -706,9 +706,7 @@ private void toggleVCard(ContactListFragment.ContactItemViewHolder holder, int v
.setColorFilter(ThemeUtils.primaryAccentColor(context), PorterDuff.Mode.SRC_ATOP);
}
- if (!checkedVCards.contains(verifiedPosition)) {
- checkedVCards.add(verifiedPosition);
- }
+ checkedVCards.add(verifiedPosition);
if (checkedVCards.size() == SINGLE_SELECTION) {
EventBus.getDefault().post(new VCardToggleEvent(true));
}
@@ -717,9 +715,7 @@ private void toggleVCard(ContactListFragment.ContactItemViewHolder holder, int v
holder.getName().getCheckMarkDrawable().clearColorFilter();
}
- if (checkedVCards.contains(verifiedPosition)) {
- checkedVCards.remove(verifiedPosition);
- }
+ checkedVCards.remove(verifiedPosition);
if (checkedVCards.isEmpty()) {
EventBus.getDefault().post(new VCardToggleEvent(false));
diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
index b23370e50c84..aeb5a138fe71 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
@@ -29,13 +29,6 @@
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@@ -46,6 +39,7 @@
import com.evernote.android.job.JobRequest;
import com.evernote.android.job.util.support.PersistableBundleCompat;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -66,6 +60,12 @@
import java.util.Date;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
diff --git a/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java b/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java
index dc761856d8e9..a22a97fba272 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java
@@ -22,11 +22,12 @@
import android.app.SearchManager;
import android.content.ComponentName;
-import android.support.v7.widget.SearchView;
import android.view.inputmethod.EditorInfo;
import com.owncloud.android.lib.resources.status.OCCapability;
+import androidx.appcompat.widget.SearchView;
+
/**
* Helper calls for visibility logic of the sharing fragment.
*/
diff --git a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
index eb8f3f68d838..01bfa5c38f06 100755
--- a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
+++ b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -32,11 +32,6 @@
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.FileProvider;
import android.util.Log;
import android.view.View;
import android.webkit.MimeTypeMap;
@@ -86,6 +81,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
* Helper implementation for file operations locally and remote.
*/
diff --git a/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java b/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java
index 399be1b74a34..5e26fc335834 100644
--- a/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java
+++ b/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java
@@ -22,7 +22,6 @@
import android.content.ContentResolver;
import android.net.Uri;
import android.os.Parcelable;
-import android.support.v4.app.FragmentManager;
import com.owncloud.android.R;
import com.owncloud.android.files.services.FileUploader;
@@ -37,6 +36,8 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.fragment.app.FragmentManager;
+
/**
* This class examines URIs pointing to files to upload and then requests {@link FileUploader} to upload them.
*
diff --git a/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java b/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java
index 09aa65f41714..77190f328081 100644
--- a/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java
+++ b/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java
@@ -24,12 +24,12 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Process;
-import android.support.v4.app.NotificationCompat;
import com.owncloud.android.utils.ThemeUtils;
import java.util.Random;
+import androidx.core.app.NotificationCompat;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
public final class NotificationUtils {
@@ -47,12 +47,12 @@ private NotificationUtils() {
}
/**
- * Factory method for {@link android.support.v4.app.NotificationCompat.Builder} instances.
+ * Factory method for {@link androidx.core.app.NotificationCompat.Builder} instances.
*
* Not strictly needed from the moment when the minimum API level supported by the app
* was raised to 14 (Android 4.0).
*
- * Formerly, returned a customized implementation of {@link android.support.v4.app.NotificationCompat.Builder}
+ * Formerly, returned a customized implementation of {@link androidx.core.app.NotificationCompat.Builder}
* for Android API levels >= 8 and < 14.
*
* Kept in place for the extra abstraction level; notifications in the app need a review, and they
diff --git a/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
index 2467832935e8..3a20f6a422a9 100644
--- a/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -21,8 +21,6 @@
import android.accounts.Account;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentStatePagerAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -39,6 +37,9 @@
import java.lang.ref.WeakReference;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
/**
* This Fragment is used to monitor the progress of a file downloading.
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
index bf58458b005b..196b74c3499a 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -28,9 +28,6 @@
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
import android.view.MenuItem;
import android.view.View;
@@ -55,6 +52,9 @@
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.utils.MimeTypeUtil;
+import androidx.appcompat.app.ActionBar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.viewpager.widget.ViewPager;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java
index fd1ea8cbceb2..7b0cce38c645 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java
@@ -1,7 +1,6 @@
package com.owncloud.android.ui.preview;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -9,6 +8,8 @@
import com.owncloud.android.R;
import com.owncloud.android.ui.fragment.FileFragment;
+import androidx.annotation.Nullable;
+
import static com.owncloud.android.ui.activity.FileActivity.EXTRA_FILE;
/**
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
index b4b7dc6b7b9d..1f4902c0000d 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -33,11 +33,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Process;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentStatePagerAdapter;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -54,6 +49,7 @@
import com.caverock.androidsvg.SVG;
import com.caverock.androidsvg.SVGParseException;
import com.github.chrisbanes.photoview.PhotoView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
@@ -73,6 +69,10 @@
import java.io.IOException;
import java.lang.ref.WeakReference;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentStatePagerAdapter;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import pl.droidsonroids.gif.GifDrawable;
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 98325ebb6295..82a8c1e583eb 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -22,9 +22,6 @@
import android.accounts.Account;
import android.content.Context;
import android.graphics.Matrix;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
import android.util.SparseArray;
import android.view.ViewGroup;
@@ -42,6 +39,10 @@
import javax.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
/**
* Adapter class that provides Fragment instances
*/
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 9114a7d75908..dc01b8b9b595 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -38,9 +38,6 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -78,6 +75,10 @@
import java.lang.ref.WeakReference;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
/**
* This fragment shows a preview of a downloaded media file (audio or video).
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
index 82d64e62dc19..5c2bd707671c 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -23,9 +23,6 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.widget.SearchView;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -63,6 +60,10 @@
import java.util.List;
import java.util.Scanner;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+
public class PreviewTextFragment extends FileFragment implements SearchView.OnQueryTextListener {
private static final String EXTRA_FILE = "FILE";
private static final String EXTRA_ACCOUNT = "ACCOUNT";
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index 15bba16e4741..d8a17a706009 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -29,7 +29,6 @@
import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
import android.widget.MediaController;
import android.widget.VideoView;
@@ -40,6 +39,8 @@
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.utils.MimeTypeUtil;
+import androidx.appcompat.app.AlertDialog;
+
/**
* Activity implementing a basic video player.
*
diff --git a/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java b/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java
index 5ae196a0dc9e..52f90a9497e3 100644
--- a/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java
+++ b/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java
@@ -24,7 +24,6 @@
import android.accounts.AccountManager;
import android.content.Context;
import android.os.AsyncTask;
-import android.support.annotation.NonNull;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -41,6 +40,8 @@
import java.util.List;
+import androidx.annotation.NonNull;
+
public class RemoteTrashbinRepository implements TrashbinRepository {
private static final String TAG = RemoteTrashbinRepository.class.getSimpleName();
diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java b/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java
index e5c71aa39c2d..7f9949c75bcf 100644
--- a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java
+++ b/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java
@@ -22,12 +22,6 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -35,6 +29,7 @@
import android.widget.PopupMenu;
import android.widget.TextView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.lib.resources.files.TrashbinFile;
import com.owncloud.android.ui.EmptyRecyclerView;
@@ -48,6 +43,11 @@
import java.util.List;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import butterknife.BindString;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -286,4 +286,4 @@ public void showError(int message) {
emptyContentIcon.setVisibility(View.VISIBLE);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
index b9f475850ba9..fa36999dcd7f 100644
--- a/src/main/java/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -26,9 +26,6 @@
import android.graphics.Matrix;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.support.media.ExifInterface;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
import com.owncloud.android.lib.common.utils.Log_OC;
@@ -38,6 +35,10 @@
import java.security.NoSuchAlgorithmException;
import java.util.Locale;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.exifinterface.media.ExifInterface;
+
/**
* Utility class with methods for decoding Bitmaps.
*/
diff --git a/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java b/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java
index 1052fa07ba8b..936e3d5a5556 100644
--- a/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java
+++ b/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java
@@ -20,12 +20,12 @@
*/
package com.owncloud.android.utils;
-import android.app.KeyguardManager;
+import android.Manifest;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.os.Build;
import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProperties;
-import android.support.annotation.RequiresApi;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@@ -50,6 +50,10 @@
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.ActivityCompat;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+
/**
* Utility class with methods for handling device credentials.
*/
@@ -67,14 +71,30 @@ private DeviceCredentialUtils() {
}
public static boolean areCredentialsAvailable(Context context) {
- KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-
- if (keyguardManager != null) {
- return keyguardManager.isKeyguardSecure();
- } else {
- Log_OC.e(TAG, "Keyguard manager is null");
- return false;
- }
+ return isBiometricPromptEnabled() || (isSdkVersionSupported() && isHardwareSupported(context) && isFingerprintAvailable(context) && isPermissionGranted(context));
+ }
+
+ public static boolean isBiometricPromptEnabled() {
+ return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P);
+ }
+
+ public static boolean isSdkVersionSupported() {
+ return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+ }
+
+ public static boolean isHardwareSupported(Context context) {
+ FingerprintManagerCompat fingerprintManager = FingerprintManagerCompat.from(context);
+ return fingerprintManager.isHardwareDetected();
+ }
+
+ public static boolean isFingerprintAvailable(Context context) {
+ FingerprintManagerCompat fingerprintManager = FingerprintManagerCompat.from(context);
+ return fingerprintManager.hasEnrolledFingerprints();
+ }
+
+ public static boolean isPermissionGranted(Context context) {
+ return ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) ==
+ PackageManager.PERMISSION_GRANTED;
}
/**
diff --git a/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/src/main/java/com/owncloud/android/utils/DisplayUtils.java
index 68dc91209f47..a4fe79d7bcc9 100644
--- a/src/main/java/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/main/java/com/owncloud/android/utils/DisplayUtils.java
@@ -37,12 +37,6 @@
import android.graphics.drawable.PictureDrawable;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.AppCompatDrawableManager;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
@@ -62,6 +56,8 @@
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.caverock.androidsvg.SVG;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -99,6 +95,11 @@
import java.util.Map;
import java.util.Set;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.AppCompatDrawableManager;
+
/**
* A helper class for UI/display related operations.
*/
diff --git a/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java b/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java
index f5a4952e1126..9c1758c8961c 100644
--- a/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java
+++ b/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java
@@ -22,7 +22,6 @@
import android.accounts.Account;
import android.content.res.Resources;
-import android.support.annotation.Nullable;
import android.view.Menu;
import com.owncloud.android.R;
@@ -30,6 +29,8 @@
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+import androidx.annotation.Nullable;
+
/**
* A helper class for drawer menu related operations.
*/
diff --git a/src/main/java/com/owncloud/android/utils/EncryptionUtils.java b/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
index 100ec3841d52..9c4b8e448da0 100644
--- a/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
+++ b/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
@@ -24,8 +24,6 @@
import android.accounts.Account;
import android.content.Context;
import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
import android.util.Base64;
import com.google.gson.Gson;
@@ -84,6 +82,9 @@
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
/**
* Utils for encryption
*/
diff --git a/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
index c0da4b6b78c9..fc4125345ff1 100644
--- a/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -22,8 +22,6 @@
package com.owncloud.android.utils;
import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -49,6 +47,9 @@
import java.io.File;
import java.net.SocketTimeoutException;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* Class to choose proper error messages to show to the user depending on the results of operations,
* always following the same policy
diff --git a/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java b/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
index db53ad2008e0..93e94ffb5931 100644
--- a/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
+++ b/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
@@ -30,7 +30,6 @@
import android.net.Uri;
import android.os.Build;
import android.provider.MediaStore;
-import android.support.annotation.RequiresApi;
import android.text.TextUtils;
import android.util.Log;
@@ -63,6 +62,8 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import androidx.annotation.RequiresApi;
+
/**
* Various utilities that make auto upload tick
*/
diff --git a/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java b/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
index 693e82003bac..8429298291e5 100644
--- a/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
+++ b/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.support.v4.content.ContextCompat;
import android.webkit.MimeTypeMap;
import com.owncloud.android.R;
@@ -41,6 +40,8 @@
import javax.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
/**
* Helper class for detecting the right icon for a file or folder,
* based on its mime type and file extension.
diff --git a/src/main/java/com/owncloud/android/utils/PermissionUtil.java b/src/main/java/com/owncloud/android/utils/PermissionUtil.java
index 3167ac19e629..edac63522682 100644
--- a/src/main/java/com/owncloud/android/utils/PermissionUtil.java
+++ b/src/main/java/com/owncloud/android/utils/PermissionUtil.java
@@ -3,8 +3,9 @@
import android.Manifest;
import android.app.Activity;
import android.content.Context;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
/**
* Created by scherzia on 29.12.2015.
diff --git a/src/main/java/com/owncloud/android/utils/StringUtils.java b/src/main/java/com/owncloud/android/utils/StringUtils.java
index 50888df0eff1..f6c860e84b93 100644
--- a/src/main/java/com/owncloud/android/utils/StringUtils.java
+++ b/src/main/java/com/owncloud/android/utils/StringUtils.java
@@ -20,12 +20,13 @@
package com.owncloud.android.utils;
-import android.support.annotation.ColorInt;
import android.text.TextUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import androidx.annotation.ColorInt;
+
/**
* Helper class for handling and manipulating strings.
*/
diff --git a/src/main/java/com/owncloud/android/utils/ThemeUtils.java b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
index 8fe9f43ee834..b0dae44e3c44 100644
--- a/src/main/java/com/owncloud/android/utils/ThemeUtils.java
+++ b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
@@ -30,20 +30,6 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.widget.CompoundButtonCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.SwitchCompat;
import android.text.Html;
import android.text.Spanned;
import android.view.Window;
@@ -52,6 +38,8 @@
import android.widget.ProgressBar;
import android.widget.SeekBar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@@ -59,6 +47,19 @@
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.ui.activity.ToolbarActivity;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.CompoundButtonCompat;
+import androidx.fragment.app.FragmentActivity;
+
/**
* Utility class with methods for client side theming.
*/
diff --git a/src/main/java/com/owncloud/android/widgets/ActionEditText.java b/src/main/java/com/owncloud/android/widgets/ActionEditText.java
index 5e786dc70dfe..bc1a91a4c964 100644
--- a/src/main/java/com/owncloud/android/widgets/ActionEditText.java
+++ b/src/main/java/com/owncloud/android/widgets/ActionEditText.java
@@ -25,7 +25,6 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
-import android.support.v7.widget.AppCompatEditText;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -35,6 +34,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import androidx.appcompat.widget.AppCompatEditText;
+
public class ActionEditText extends AppCompatEditText {
private String s;
private String optionOneString;
@@ -74,7 +75,7 @@ protected void onDraw(Canvas canvas) {
getDrawingRect(mButtonRect);
mButtonRect.top += 10;
mButtonRect.bottom -= 10;
- mButtonRect.left = (int) (getWidth() - mTextBounds.width() - 18);
+ mButtonRect.left = getWidth() - mTextBounds.width() - 18;
mButtonRect.right = getWidth() - 10;
btn_rect = mButtonRect;
diff --git a/src/main/res/layout-land/account_setup.xml b/src/main/res/layout-land/account_setup.xml
index 5b81e33b7ade..5cf92f626f3e 100644
--- a/src/main/res/layout-land/account_setup.xml
+++ b/src/main/res/layout-land/account_setup.xml
@@ -1,298 +1,297 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/account_setup.xml b/src/main/res/layout/account_setup.xml
index dfeaadbaa61a..94812b4353b9 100644
--- a/src/main/res/layout/account_setup.xml
+++ b/src/main/res/layout/account_setup.xml
@@ -1,281 +1,281 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/activity_list_layout.xml b/src/main/res/layout/activity_list_layout.xml
index 4df5bbfc8952..b92140408fbf 100644
--- a/src/main/res/layout/activity_list_layout.xml
+++ b/src/main/res/layout/activity_list_layout.xml
@@ -17,13 +17,13 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
-
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/activity_manage_space.xml b/src/main/res/layout/activity_manage_space.xml
index 459fed9e95d5..97f2181e3a8c 100644
--- a/src/main/res/layout/activity_manage_space.xml
+++ b/src/main/res/layout/activity_manage_space.xml
@@ -31,7 +31,7 @@
android:text="@string/manage_space_description"
/>
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/activity_sso_grant_permission.xml b/src/main/res/layout/activity_sso_grant_permission.xml
index aa137f81578a..262547cd437c 100644
--- a/src/main/res/layout/activity_sso_grant_permission.xml
+++ b/src/main/res/layout/activity_sso_grant_permission.xml
@@ -16,13 +16,13 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
-
-
+
diff --git a/src/main/res/layout/contactlist_fragment.xml b/src/main/res/layout/contactlist_fragment.xml
index 08187412234b..f8e390253178 100644
--- a/src/main/res/layout/contactlist_fragment.xml
+++ b/src/main/res/layout/contactlist_fragment.xml
@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/src/main/res/layout/contacts_backup_fragment.xml
index 6a315048567f..d149c37a6fde 100644
--- a/src/main/res/layout/contacts_backup_fragment.xml
+++ b/src/main/res/layout/contacts_backup_fragment.xml
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/contacts_preference.xml b/src/main/res/layout/contacts_preference.xml
index 1430e60b8049..5d23ba1ec2c4 100644
--- a/src/main/res/layout/contacts_preference.xml
+++ b/src/main/res/layout/contacts_preference.xml
@@ -18,13 +18,13 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/drawer.xml b/src/main/res/layout/drawer.xml
index d165e901eae5..a48326a11ae4 100644
--- a/src/main/res/layout/drawer.xml
+++ b/src/main/res/layout/drawer.xml
@@ -21,7 +21,7 @@
-
-
+
diff --git a/src/main/res/layout/edit_share_layout.xml b/src/main/res/layout/edit_share_layout.xml
index 91c74fcf2381..9f4fcd79fc90 100644
--- a/src/main/res/layout/edit_share_layout.xml
+++ b/src/main/res/layout/edit_share_layout.xml
@@ -52,7 +52,7 @@
android:layout_marginRight="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_margin">
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/externalsite_webview.xml b/src/main/res/layout/externalsite_webview.xml
index 258120246487..9ddd93b1fd4c 100644
--- a/src/main/res/layout/externalsite_webview.xml
+++ b/src/main/res/layout/externalsite_webview.xml
@@ -18,12 +18,12 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/file_details_activities_fragment.xml b/src/main/res/layout/file_details_activities_fragment.xml
index fbc965769e5e..48949e34ae1e 100644
--- a/src/main/res/layout/file_details_activities_fragment.xml
+++ b/src/main/res/layout/file_details_activities_fragment.xml
@@ -32,7 +32,7 @@
android:layout_marginStart="@dimen/standard_padding"
android:orientation="horizontal">
-
-
-
-
+
-
-
+
diff --git a/src/main/res/layout/file_details_fragment.xml b/src/main/res/layout/file_details_fragment.xml
index 4ed63cb02b51..b1cfba468bb6 100644
--- a/src/main/res/layout/file_details_fragment.xml
+++ b/src/main/res/layout/file_details_fragment.xml
@@ -181,7 +181,7 @@
android:layout_height="1dp"
android:background="@color/list_divider_background" />
-
-
diff --git a/src/main/res/layout/file_details_share_user_item.xml b/src/main/res/layout/file_details_share_user_item.xml
index 94ed069f2439..e5eb5d5343dd 100644
--- a/src/main/res/layout/file_details_share_user_item.xml
+++ b/src/main/res/layout/file_details_share_user_item.xml
@@ -53,7 +53,7 @@
android:textColor="@color/black"
android:textSize="@dimen/file_details_username_text_size" />
-
-
-
-
- .
-->
-
+
-
+
diff --git a/src/main/res/layout/files_folder_picker.xml b/src/main/res/layout/files_folder_picker.xml
index 03f9586f53c9..e7c1a1cc5a45 100644
--- a/src/main/res/layout/files_folder_picker.xml
+++ b/src/main/res/layout/files_folder_picker.xml
@@ -50,7 +50,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/first_run_activity.xml b/src/main/res/layout/first_run_activity.xml
index 643a61ed1122..dc2eb68dadd5 100644
--- a/src/main/res/layout/first_run_activity.xml
+++ b/src/main/res/layout/first_run_activity.xml
@@ -31,7 +31,7 @@
android:layout_weight="1"
android:orientation="vertical">
-
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/list_fragment.xml b/src/main/res/layout/list_fragment.xml
index 1712df951f7c..f7b87cbae372 100644
--- a/src/main/res/layout/list_fragment.xml
+++ b/src/main/res/layout/list_fragment.xml
@@ -23,12 +23,12 @@
android:layout_height="match_parent">
-
+
-
-
+
-
+
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/log_send_file.xml b/src/main/res/layout/log_send_file.xml
index 12c66558207d..5467b346c8ef 100644
--- a/src/main/res/layout/log_send_file.xml
+++ b/src/main/res/layout/log_send_file.xml
@@ -57,7 +57,7 @@
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin">
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/notifications_layout.xml b/src/main/res/layout/notifications_layout.xml
index 5a817c6fd31f..78a64015f79e 100644
--- a/src/main/res/layout/notifications_layout.xml
+++ b/src/main/res/layout/notifications_layout.xml
@@ -18,13 +18,13 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
-
-
+
-
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/participate_layout.xml b/src/main/res/layout/participate_layout.xml
index 0ffe85876ecf..a7d7c4304c9d 100755
--- a/src/main/res/layout/participate_layout.xml
+++ b/src/main/res/layout/participate_layout.xml
@@ -18,12 +18,12 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/passcodelock.xml b/src/main/res/layout/passcodelock.xml
index ae48c76add62..96d9c2362358 100644
--- a/src/main/res/layout/passcodelock.xml
+++ b/src/main/res/layout/passcodelock.xml
@@ -85,7 +85,7 @@
android:hint="@string/hidden_character"/>
-
-
@@ -39,6 +39,6 @@
android:autofillHints="password">
-
+
diff --git a/src/main/res/layout/preview_image_activity.xml b/src/main/res/layout/preview_image_activity.xml
index 5d5601f8f667..771430fd9f8a 100644
--- a/src/main/res/layout/preview_image_activity.xml
+++ b/src/main/res/layout/preview_image_activity.xml
@@ -17,11 +17,11 @@
along with this program. If not, see .
-->
-
+
-
+
diff --git a/src/main/res/layout/search_users_groups_layout.xml b/src/main/res/layout/search_users_groups_layout.xml
index 3c24adee83e6..4340ef3fa481 100644
--- a/src/main/res/layout/search_users_groups_layout.xml
+++ b/src/main/res/layout/search_users_groups_layout.xml
@@ -34,7 +34,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:padding="@dimen/standard_padding"/>
- .
-->
-
+
-
-
+
diff --git a/src/main/res/layout/share_file_layout.xml b/src/main/res/layout/share_file_layout.xml
index 8576770b4256..afeb66145b12 100644
--- a/src/main/res/layout/share_file_layout.xml
+++ b/src/main/res/layout/share_file_layout.xml
@@ -122,7 +122,7 @@
android:text="@string/share_no_users"
android:textSize="@dimen/share_file_layout_text_size"/>
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/sorting_order_fragment.xml b/src/main/res/layout/sorting_order_fragment.xml
index 380df82de3c7..32fc92a69547 100644
--- a/src/main/res/layout/sorting_order_fragment.xml
+++ b/src/main/res/layout/sorting_order_fragment.xml
@@ -290,7 +290,7 @@
android:layout_height="wrap_content"
android:gravity="end">
-
-
-
-
-
-
- .
-->
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/synced_folders_settings_layout.xml b/src/main/res/layout/synced_folders_settings_layout.xml
index af8c9abec0c9..00058f73ce14 100644
--- a/src/main/res/layout/synced_folders_settings_layout.xml
+++ b/src/main/res/layout/synced_folders_settings_layout.xml
@@ -68,7 +68,7 @@
android:paddingEnd="@dimen/zero"
android:paddingTop="@dimen/standard_padding">
-
-
-
-
-
-
- .
-->
-
+
-
-
+
diff --git a/src/main/res/layout/toolbar_user_information.xml b/src/main/res/layout/toolbar_user_information.xml
index f6c02468da0e..50b8a1974c71 100644
--- a/src/main/res/layout/toolbar_user_information.xml
+++ b/src/main/res/layout/toolbar_user_information.xml
@@ -18,7 +18,7 @@
You should have received a copy of the GNU Affero General Public
License along with this program. If not, see .
-->
-
-
-
+
diff --git a/src/main/res/layout/trashbin_activity.xml b/src/main/res/layout/trashbin_activity.xml
index e7d80022e5e5..09773de53488 100644
--- a/src/main/res/layout/trashbin_activity.xml
+++ b/src/main/res/layout/trashbin_activity.xml
@@ -19,14 +19,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see .
-->
-
+
-
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/upload_files_layout.xml b/src/main/res/layout/upload_files_layout.xml
index 3d975403eb7c..2277e2afc57c 100644
--- a/src/main/res/layout/upload_files_layout.xml
+++ b/src/main/res/layout/upload_files_layout.xml
@@ -77,7 +77,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
-
- .
-->
-
+
-
-
+
-
-
\ No newline at end of file
+
diff --git a/src/main/res/layout/uploader_layout.xml b/src/main/res/layout/uploader_layout.xml
index aebfc30dda42..2d02af9a09d8 100644
--- a/src/main/res/layout/uploader_layout.xml
+++ b/src/main/res/layout/uploader_layout.xml
@@ -62,7 +62,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
-
- .
-->
-
+
-
-
-
-
+ card_view:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
-
+
-
+
-
+
diff --git a/src/main/res/layout/whats_new_activity.xml b/src/main/res/layout/whats_new_activity.xml
index 7a512d42feca..c19a44131303 100644
--- a/src/main/res/layout/whats_new_activity.xml
+++ b/src/main/res/layout/whats_new_activity.xml
@@ -37,12 +37,12 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/primary_button_text_color"/>
-
-
+
-