mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4925 from nextcloud/NotNull

Browse source 
replace org.jetbrains.annotations with androidx.annotations
This commit is contained in:
Tobias Kaminsky 2019-12-03 15:49:40 +01:00 committed by GitHub
commit 7cf3ba93c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -283,7 +283,7 @@ dependencies {
implementation "androidx.work:work-runtime:2.2.0"
implementation "androidx.work:work-runtime-ktx:2.2.0"
implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
implementation 'com.google.code.findbugs:annotations:2.0.1'
compileOnly 'com.google.code.findbugs:annotations:2.0.1'
implementation 'commons-io:commons-io:2.6'
implementation 'com.github.tobiaskaminsky:android-job:v1.2.6.1' // 'com.github.evernote:android-job:v1.2.5'
implementation 'com.jakewharton:butterknife:10.2.0'
@ -306,7 +306,6 @@ dependencies {
implementation 'com.caverock:androidsvg:1.4'
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'org.jetbrains:annotations:18.0.0'
implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:2.5.1'

4
src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
View file

@ -42,8 +42,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;
import org.jetbrains.annotations.NotNull;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@ -216,7 +214,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
*
* @return User instance
*/
@NotNull
@NonNull
@Override
public User getUser() {
Account account = getCurrentAccount();

4
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -54,8 +54,6 @@ import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeType;
import com.owncloud.android.utils.MimeTypeUtil;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@ -1970,7 +1968,7 @@ public class FileDataStorageManager {
return capability;
}
@NotNull
@NonNull
private ContentValues createContentValues(String accountName, OCCapability capability) {
ContentValues cv = new ContentValues();
cv.put(ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME, accountName);

4
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file

@ -66,7 +66,6 @@ import com.owncloud.android.utils.MimeTypeUtil;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.io.FileNotFoundException;
@ -76,6 +75,7 @@ import java.net.URLEncoder;
import java.util.List;
import java.util.Locale;
import androidx.annotation.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
@ -868,7 +868,7 @@ public final class ThumbnailsCacheManager {
return Math.round(r.getDimension(R.dimen.file_avatar_size));
}
private @NotNull
private @NonNull
Drawable doAvatarInBackground() {
Bitmap avatar;

10
src/main/java/com/owncloud/android/files/services/FileUploader.java
View file

@ -76,8 +76,6 @@ import com.owncloud.android.ui.notifications.NotificationUtils;
import com.owncloud.android.utils.ErrorMessageAdapter;
import com.owncloud.android.utils.ThemeUtils;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.AbstractList;
import java.util.HashMap;
@ -396,10 +394,10 @@ public class FileUploader extends Service
public void retryFailedUploads(
@NonNull final Context context,
@Nullable final Account account,
@NotNull final UploadsStorageManager uploadsStorageManager,
@NotNull final ConnectivityService connectivityService,
@NotNull final UserAccountManager accountManager,
@NotNull final PowerManagementService powerManagementService,
@NonNull final UploadsStorageManager uploadsStorageManager,
@NonNull final ConnectivityService connectivityService,
@NonNull final UserAccountManager accountManager,
@NonNull final PowerManagementService powerManagementService,
@Nullable final UploadResult uploadResult
) {
OCUpload[] failedUploads = uploadsStorageManager.getFailedUploads();

5
src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java
View file

@ -61,14 +61,13 @@ import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.PushUtils;
import org.greenrobot.eventbus.EventBus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import static android.content.Context.ACCOUNT_SERVICE;
import static com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL;
@ -93,7 +92,7 @@ public class AccountRemovalJob extends Job implements AccountManagerCallback<Boo
@NonNull
@Override
protected Result onRunJob(@NotNull Params params) {
protected Result onRunJob(@NonNull Params params) {
Context context = MainApp.getAppContext();
PersistableBundleCompat bundle = params.getExtras();
Account account = userAccountManager.getAccountByName(bundle.getString(ACCOUNT, ""));

4
src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
View file

@ -27,8 +27,6 @@ import com.owncloud.android.ui.helpers.FileOperationsHelper;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.ThemeUtils;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
@ -106,7 +104,7 @@ public class SendShareDialog extends BottomSheetDialogFragment {
@Nullable
@Override
public View onCreateView(@NotNull LayoutInflater inflater,
public View onCreateView(@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {

4
src/main/java/com/owncloud/android/ui/fragment/PhotoFragment.java
View file

@ -34,8 +34,6 @@ import com.owncloud.android.ui.asynctasks.PhotoSearchTask;
import com.owncloud.android.ui.events.ChangeMenuEvent;
import com.owncloud.android.ui.events.SearchEvent;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import androidx.annotation.NonNull;
@ -94,7 +92,7 @@ public class PhotoFragment extends OCFileListFragment {
getRecyclerView().addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NotNull RecyclerView recyclerView, int dx, int dy) {
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
loadMoreWhenEndReached(recyclerView, dy);
}
});

3
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
View file

@ -80,7 +80,6 @@ import com.owncloud.android.utils.ThemeUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.io.IOException;
@ -498,7 +497,7 @@ public class ContactListFragment extends FileFragment implements Injectable {
}
}
@NotNull
@NonNull
@Override
public String toString() {
return displayName;

7
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
View file

@ -25,7 +25,6 @@ import android.accounts.Account;
import android.app.DatePickerDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
@ -55,8 +54,6 @@ import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.PermissionUtil;
import com.owncloud.android.utils.ThemeUtils;
import org.jetbrains.annotations.NotNull;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
@ -108,7 +105,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
@Override
public View onCreateView(@NotNull final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
public View onCreateView(@NonNull final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// use grey as fallback for elements where custom theming is not available
if (ThemeUtils.themingEnabled(getContext())) {
@ -465,7 +462,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
}
@Override
public void onSaveInstanceState(@NotNull Bundle outState) {
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
if (datePickerDialog != null) {
outState.putBoolean(KEY_CALENDAR_PICKER_OPEN, datePickerDialog.isShowing());