diff options
Diffstat (limited to 'app/src')
5 files changed, 18 insertions, 25 deletions
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java index f29736aa0..91043e44b 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java @@ -39,8 +39,6 @@ import com.nextcloud.talk.users.UserManager; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.webrtc.WebSocketConnectionHelper; -import org.jetbrains.annotations.NotNull; - import java.net.CookieManager; import java.util.HashMap; import java.util.List; @@ -105,12 +103,12 @@ public class AccountRemovalWorker extends Worker { ApiUtils.getUrlNextcloudPush(user.getBaseUrl())) .blockingSubscribe(new Observer<GenericOverall>() { @Override - public void onSubscribe(@NotNull Disposable d) { + public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) { // unused atm } @Override - public void onNext(@NotNull GenericOverall genericOverall) { + public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) { GenericMeta meta = Objects.requireNonNull(genericOverall.getOcs()).getMeta(); int statusCode = Objects.requireNonNull(meta).getStatusCode(); @@ -126,7 +124,7 @@ public class AccountRemovalWorker extends Worker { } @Override - public void onError(@NotNull Throwable e) { + public void onError(@io.reactivex.annotations.NonNull Throwable e) { Log.e(TAG, "error while trying to unregister Device For Notifications", e); } diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java index ada79fd7c..f6a28dab8 100644 --- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java +++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java @@ -41,8 +41,6 @@ import com.nextcloud.talk.users.UserManager; import com.nextcloud.talk.utils.ApiUtils; import com.otaliastudios.autocomplete.RecyclerViewPresenter; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -57,6 +55,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter; import eu.davidea.flexibleadapter.items.AbstractFlexibleItem; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; @@ -137,12 +136,12 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention> .retry(3) .subscribe(new Observer<MentionOverall>() { @Override - public void onSubscribe(@NotNull Disposable d) { + public void onSubscribe(@NonNull Disposable d) { // no actions atm } @Override - public void onNext(@NotNull MentionOverall mentionOverall) { + public void onNext(@NonNull MentionOverall mentionOverall) { List<Mention> mentionsList = mentionOverall.getOcs().getData(); if (mentionsList.size() == 0) { @@ -168,7 +167,7 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention> @SuppressLint("LongLogTag") @Override - public void onError(@NotNull Throwable e) { + public void onError(@NonNull Throwable e) { adapter.clear(); Log.e(TAG, "failed to get MentionAutocompleteSuggestions", e); } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java index 5bd21b2ef..d3744072a 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java @@ -39,8 +39,6 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils; import com.nextcloud.talk.utils.FileSortOrder; import com.nextcloud.talk.utils.preferences.AppPreferences; -import org.jetbrains.annotations.NotNull; - import javax.inject.Inject; import androidx.annotation.NonNull; @@ -70,7 +68,7 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O private View[] taggedViews; private String currentSortOrderName; - public static SortingOrderDialogFragment newInstance(@NotNull FileSortOrder sortOrder) { + public static SortingOrderDialogFragment newInstance(@NonNull FileSortOrder sortOrder) { SortingOrderDialogFragment dialogFragment = new SortingOrderDialogFragment(); Bundle args = new Bundle(); diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index cac2501cd..c12c04572 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -34,11 +34,10 @@ import com.nextcloud.talk.data.user.model.User; import com.nextcloud.talk.models.RetrofitBucket; import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew; -import org.jetbrains.annotations.NotNull; - import java.util.HashMap; import java.util.Map; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import okhttp3.Credentials; @@ -471,8 +470,8 @@ public class ApiUtils { return baseUrl + ocsApiVersion + spreedApiVersion + "/reaction/" + roomToken + "/" + messageId; } - @NotNull - public static String getUrlForUnifiedSearch(@NotNull String baseUrl, @NotNull String providerId) { + @NonNull + public static String getUrlForUnifiedSearch(@NonNull String baseUrl, @NonNull String providerId) { return baseUrl + ocsApiVersion + "/search/providers/" + providerId + "/search"; } diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java index b38ee30c7..9e891efec 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java @@ -39,8 +39,6 @@ import com.nextcloud.talk.utils.UserIdUtils; import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew; import com.yarolegovich.mp.io.StorageModule; -import org.jetbrains.annotations.NotNull; - import java.util.Set; import javax.inject.Inject; @@ -48,6 +46,7 @@ import javax.inject.Inject; import autodagger.AutoInjector; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; @@ -91,17 +90,17 @@ public class DatabaseStorageModule implements StorageModule { .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer<GenericOverall>() { @Override - public void onSubscribe(@NotNull Disposable d) { + public void onSubscribe(@NonNull Disposable d) { // unused atm } @Override - public void onNext(@NotNull GenericOverall genericOverall) { + public void onNext(@NonNull GenericOverall genericOverall) { Log.d(TAG, "Toggled notification calls"); } @Override - public void onError(@NotNull Throwable e) { + public void onError(@NonNull Throwable e) { Log.e(TAG, "Error when trying to toggle notification calls", e); } @@ -144,17 +143,17 @@ public class DatabaseStorageModule implements StorageModule { .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer<GenericOverall>() { @Override - public void onSubscribe(@NotNull Disposable d) { + public void onSubscribe(@NonNull Disposable d) { // unused atm } @Override - public void onNext(@NotNull GenericOverall genericOverall) { + public void onNext(@NonNull GenericOverall genericOverall) { messageExpiration = valueInt; } @Override - public void onError(@NotNull Throwable e) { + public void onError(@NonNull Throwable e) { Log.e(TAG, "Error when trying to set message expiration", e); } |