diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java index b7356f00a..082c371d3 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java @@ -4,6 +4,7 @@ import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.system.SystemClock; +import org.briarproject.bramble.test.ArrayClock; import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; @@ -11,8 +12,6 @@ import java.util.HashSet; import java.util.Set; import static junit.framework.TestCase.assertTrue; - -import org.briarproject.bramble.test.ArrayClock; import static org.briarproject.bramble.test.TestUtils.getRandomBytes; import static org.briarproject.bramble.util.StringUtils.getRandomString; import static org.junit.Assert.assertEquals; diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestRunner.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestRunner.java index a2a01638b..bc28e0c7e 100644 --- a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestRunner.java +++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestRunner.java @@ -2,6 +2,7 @@ package org.briarproject.briar.android; import android.app.Application; import android.content.Context; + import androidx.test.runner.AndroidJUnitRunner; public class BriarTestRunner extends AndroidJUnitRunner { diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/ViewActions.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/ViewActions.java index ea437fc4a..dc71aded2 100644 --- a/briar-android/src/androidTest/java/org/briarproject/briar/android/ViewActions.java +++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/ViewActions.java @@ -1,17 +1,18 @@ package org.briarproject.briar.android; import android.app.Activity; +import android.view.View; + +import org.hamcrest.Matcher; + +import java.util.concurrent.TimeoutException; + import androidx.test.espresso.PerformException; import androidx.test.espresso.UiController; import androidx.test.espresso.ViewAction; import androidx.test.runner.lifecycle.ActivityLifecycleMonitor; import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; import androidx.test.runner.lifecycle.Stage; -import android.view.View; - -import org.hamcrest.Matcher; - -import java.util.concurrent.TimeoutException; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.util.HumanReadables.describe; diff --git a/briar-android/src/main/java/im/delight/android/identicons/Identicon.java b/briar-android/src/main/java/im/delight/android/identicons/Identicon.java index a3fd39308..ea1a5fce8 100644 --- a/briar-android/src/main/java/im/delight/android/identicons/Identicon.java +++ b/briar-android/src/main/java/im/delight/android/identicons/Identicon.java @@ -19,6 +19,7 @@ package im.delight.android.identicons; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; + import androidx.annotation.NonNull; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/im/delight/android/identicons/IdenticonDrawable.java b/briar-android/src/main/java/im/delight/android/identicons/IdenticonDrawable.java index 355ac20d2..2e5513cce 100644 --- a/briar-android/src/main/java/im/delight/android/identicons/IdenticonDrawable.java +++ b/briar-android/src/main/java/im/delight/android/identicons/IdenticonDrawable.java @@ -20,6 +20,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; + import androidx.annotation.NonNull; import androidx.annotation.UiThread; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index 094f39c4b..987984985 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android; -import androidx.lifecycle.ViewModelProvider; - import org.briarproject.bramble.BrambleAndroidEagerSingletons; import org.briarproject.bramble.BrambleAndroidModule; import org.briarproject.bramble.BrambleCoreEagerSingletons; @@ -61,6 +59,7 @@ import java.util.concurrent.Executor; import javax.inject.Singleton; +import androidx.lifecycle.ViewModelProvider; import dagger.Component; @Singleton diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java index dfd4e1b6c..08a1e191d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java @@ -9,11 +9,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; -import androidx.core.app.NotificationCompat; -import androidx.core.app.TaskStackBuilder; import org.briarproject.bramble.api.Multiset; import org.briarproject.bramble.api.contact.ContactId; @@ -56,6 +51,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.concurrent.ThreadSafe; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; + import static android.app.Notification.DEFAULT_LIGHTS; import static android.app.Notification.DEFAULT_SOUND; import static android.app.Notification.DEFAULT_VIBRATE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java index 935c70dd2..355df4b8a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java @@ -13,7 +13,6 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.Binder; import android.os.IBinder; -import androidx.core.app.NotificationCompat; import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.crypto.SecretKey; @@ -32,6 +31,8 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.core.app.NotificationCompat; + import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/NotificationCleanupService.java b/briar-android/src/main/java/org/briarproject/briar/android/NotificationCleanupService.java index 9326985f3..7055668a8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/NotificationCleanupService.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/NotificationCleanupService.java @@ -3,12 +3,13 @@ package org.briarproject.briar.android; import android.app.IntentService; import android.content.Intent; import android.net.Uri; -import androidx.annotation.Nullable; import org.briarproject.briar.api.android.AndroidNotificationManager; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.BLOG_URI; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.CONTACT_ADDED_URI; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.CONTACT_URI; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java index a8bcf9218..1cdbb126f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java @@ -11,7 +11,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -36,6 +35,8 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; + import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.content.Intent.ACTION_PACKAGE_ADDED; import static android.content.Intent.ACTION_PACKAGE_CHANGED; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java index 7903ca7a5..d92a2b58d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java @@ -3,8 +3,6 @@ package org.briarproject.briar.android; import android.app.NotificationManager; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -14,6 +12,9 @@ import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.fragment.ErrorFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import static java.util.Objects.requireNonNull; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult; import static org.briarproject.briar.android.BriarService.EXTRA_NOTIFICATION_ID; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java index ac5cbd688..1df351d55 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java @@ -1,14 +1,15 @@ package org.briarproject.briar.android.account; import android.os.Bundle; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java index f2ba999a4..454b8bd3a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java @@ -3,7 +3,6 @@ package org.briarproject.briar.android.account; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +16,8 @@ import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.util.UiUtils; +import androidx.annotation.Nullable; + import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java index 3ed74b6a5..c036f657b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java @@ -2,13 +2,14 @@ package org.briarproject.briar.android.account; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import android.util.AttributeSet; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java index 9aec170e9..54b4f4831 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java @@ -5,8 +5,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; import android.util.AttributeSet; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -16,6 +14,9 @@ import java.util.List; import javax.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; + import static android.os.Build.VERSION.SDK_INT; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java index fb745021b..0d4edd6d2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java @@ -3,11 +3,8 @@ package org.briarproject.briar.android.account; import android.app.AlarmManager; import android.app.Application; import android.app.PendingIntent; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; import android.content.Context; import android.content.Intent; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; @@ -30,6 +27,10 @@ import java.util.logging.Logger; import javax.annotation.concurrent.ThreadSafe; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static android.app.AlarmManager.ELAPSED_REALTIME; import static android.app.PendingIntent.getService; import static android.content.Context.ALARM_SERVICE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java b/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java index 2b5de177e..4fd4d167c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java @@ -3,10 +3,6 @@ package org.briarproject.briar.android.account; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; -import androidx.constraintlayout.widget.ConstraintLayout; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +14,11 @@ import android.widget.TextView; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.constraintlayout.widget.ConstraintLayout; + import static android.content.Context.LAYOUT_INFLATER_SERVICE; import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java index b3ea3a7a1..854971c4e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.account; import android.os.Bundle; import android.os.IBinder; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +9,9 @@ import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.ProgressBar; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java index c36da16e2..0b814420d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.account; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; import org.briarproject.bramble.api.lifecycle.IoExecutor; @@ -14,6 +12,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; + @NotNullByDefault public class SetupControllerImpl implements SetupController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java index 44da73bcb..bf7215fe6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.account; -import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -18,6 +17,8 @@ import org.briarproject.briar.android.fragment.BaseFragment; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT; import static org.briarproject.briar.android.util.UiUtils.enterPressed; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java index cf3d0d866..807a2396f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java @@ -8,8 +8,6 @@ import android.hardware.biometrics.BiometricPrompt.AuthenticationResult; import android.hardware.biometrics.BiometricPrompt.Builder; import android.os.Bundle; import android.os.CancellationSignal; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import android.widget.Toast; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -23,6 +21,9 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + import static android.hardware.biometrics.BiometricPrompt.BIOMETRIC_ERROR_CANCELED; import static android.hardware.biometrics.BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED; import static android.os.Build.VERSION.SDK_INT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java index 0f13d0900..60edec57d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java @@ -20,10 +20,10 @@ import org.briarproject.briar.android.blog.ReblogFragment; import org.briarproject.briar.android.blog.RssFeedImportActivity; import org.briarproject.briar.android.blog.RssFeedManageActivity; import org.briarproject.briar.android.blog.WriteBlogPostActivity; -import org.briarproject.briar.android.contact.add.remote.AddContactActivity; -import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment; import org.briarproject.briar.android.contact.ContactListFragment; import org.briarproject.briar.android.contact.ContactModule; +import org.briarproject.briar.android.contact.add.remote.AddContactActivity; +import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment; import org.briarproject.briar.android.contact.add.remote.NicknameFragment; import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity; import org.briarproject.briar.android.conversation.AliasDialogFragment; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityModule.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityModule.java index 52b8582f4..1986eb1af 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityModule.java @@ -2,14 +2,14 @@ package org.briarproject.briar.android.activity; import android.app.Activity; +import org.briarproject.briar.android.account.SetupController; +import org.briarproject.briar.android.account.SetupControllerImpl; import org.briarproject.briar.android.controller.BriarController; import org.briarproject.briar.android.controller.BriarControllerImpl; import org.briarproject.briar.android.controller.DbController; import org.briarproject.briar.android.controller.DbControllerImpl; import org.briarproject.briar.android.login.ChangePasswordController; import org.briarproject.briar.android.login.ChangePasswordControllerImpl; -import org.briarproject.briar.android.account.SetupController; -import org.briarproject.briar.android.account.SetupControllerImpl; import org.briarproject.briar.android.navdrawer.NavDrawerController; import org.briarproject.briar.android.navdrawer.NavDrawerControllerImpl; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java index a1fe8ba1d..95d18184c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java @@ -1,10 +1,6 @@ package org.briarproject.briar.android.activity; import android.content.Intent; -import androidx.annotation.RequiresApi; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.Toolbar; import android.transition.Transition; import android.view.Window; import android.widget.CheckBox; @@ -25,6 +21,11 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java index 4cd48a1b8..cdeea6c5d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java @@ -4,7 +4,6 @@ import android.content.ContentResolver; import android.graphics.Bitmap; import android.graphics.BitmapFactory.Options; import android.net.Uri; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; @@ -22,6 +21,8 @@ import java.io.InputStream; import java.util.Collection; import java.util.logging.Logger; +import androidx.annotation.Nullable; + import static android.graphics.Bitmap.CompressFormat.JPEG; import static android.graphics.BitmapFactory.decodeStream; import static java.util.logging.Level.INFO; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java index a67909a6e..c8d9d617e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.attachment; -import androidx.lifecycle.LiveData; import android.net.Uri; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -13,6 +11,9 @@ import org.briarproject.briar.api.messaging.AttachmentHeader; import java.util.Collection; import java.util.List; +import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; + @NotNullByDefault public interface AttachmentCreator { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java index 296d0aa5e..882ef569f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java @@ -2,11 +2,7 @@ package org.briarproject.briar.android.attachment; import android.app.Application; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; import android.net.Uri; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.IoExecutor; @@ -30,6 +26,11 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java index d953647c9..36e83644a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentDimensions.java @@ -1,13 +1,14 @@ package org.briarproject.briar.android.attachment; import android.content.res.Resources; -import androidx.annotation.VisibleForTesting; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import javax.annotation.concurrent.Immutable; +import androidx.annotation.VisibleForTesting; + @Immutable @NotNullByDefault class AttachmentDimensions { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java index 93daf32ee..a72c31948 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentItem.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.attachment; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; @@ -12,6 +11,8 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.concurrent.Immutable; +import androidx.annotation.Nullable; + import static java.util.Objects.requireNonNull; @Immutable diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java index c5531e1bc..db7f0e850 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.attachment; -import androidx.lifecycle.LiveData; import android.net.Uri; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.messaging.AttachmentHeader; @@ -10,6 +8,9 @@ import org.briarproject.briar.api.messaging.AttachmentHeader; import java.util.Collection; import java.util.List; +import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; + @UiThread @NotNullByDefault public interface AttachmentManager { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java index c2b0c1892..33d709ab7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.attachment; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; @@ -11,6 +9,8 @@ import org.briarproject.briar.api.messaging.AttachmentHeader; import java.io.InputStream; import java.util.List; +import androidx.annotation.Nullable; + @NotNullByDefault public interface AttachmentRetriever { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java index 109d030ca..53a376aea 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.attachment; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; @@ -18,6 +16,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelper.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelper.java index 7fa7de417..eb16cbe01 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelper.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelper.java @@ -1,11 +1,11 @@ package org.briarproject.briar.android.attachment; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.io.InputStream; +import androidx.annotation.Nullable; + @NotNullByDefault public interface ImageHelper { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelperImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelperImpl.java index 9c3d84047..f7f2435eb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelperImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageHelperImpl.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.attachment; import android.graphics.BitmapFactory; -import androidx.annotation.Nullable; import android.webkit.MimeTypeMap; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -11,6 +10,8 @@ import java.io.InputStream; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; +import androidx.annotation.Nullable; + @Immutable @NotNullByDefault class ImageHelperImpl implements ImageHelper { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageSizeCalculator.java b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageSizeCalculator.java index ee5dd17b0..daccea2f5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageSizeCalculator.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/attachment/ImageSizeCalculator.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.attachment; -import androidx.exifinterface.media.ExifInterface; - import com.bumptech.glide.util.MarkEnforcingInputStream; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -11,6 +9,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.logging.Logger; +import androidx.exifinterface.media.ExifInterface; + import static androidx.exifinterface.media.ExifInterface.ORIENTATION_ROTATE_270; import static androidx.exifinterface.media.ExifInterface.ORIENTATION_ROTATE_90; import static androidx.exifinterface.media.ExifInterface.ORIENTATION_TRANSPOSE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseController.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseController.java index f6d21ffb6..d204c7f21 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.blog; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; @@ -14,6 +12,8 @@ import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + @NotNullByDefault interface BaseController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java index 6d3b82c74..a287df57f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.blog; -import androidx.annotation.CallSuper; - import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.EventBus; @@ -32,6 +30,8 @@ import java.util.logging.Logger; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java index c3e98816b..35d0ea653 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java @@ -4,8 +4,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import androidx.annotation.CallSuper; -import androidx.annotation.UiThread; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -21,6 +19,9 @@ import java.util.logging.Logger; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.UiThread; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java index bd5ebfc4e..23a7ff252 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.blog; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.widget.Toolbar; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -16,6 +15,8 @@ import org.briarproject.briar.android.sharing.BlogSharingStatusActivity; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.widget.Toolbar; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class BlogActivity extends BriarActivity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java index b4a28b27c..6c36fc4e6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.blog; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -11,6 +9,8 @@ import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault public interface BlogController extends BaseController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java index 16ea60d87..0f933e25e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java @@ -4,11 +4,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.UiThread; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView.LayoutManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -41,10 +36,16 @@ import java.util.Collection; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView.LayoutManager; + import static android.app.Activity.RESULT_OK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static android.widget.Toast.LENGTH_SHORT; +import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SHARE_BLOG; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java index f41e29326..edddb09c9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostAdapter.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.blog; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +10,9 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.util.BriarAdapter; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; + @MethodsNotNullByDefault @ParametersNotNullByDefault class BlogPostAdapter extends BriarAdapter { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java index af3e8841c..ee37858a4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.blog; import android.os.Bundle; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -14,6 +13,8 @@ import org.briarproject.briar.api.blog.BlogPostHeader; import javax.inject.Inject; +import androidx.annotation.UiThread; + @UiThread @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java index fe0ca1007..7f5ef0de5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.blog; -import androidx.annotation.NonNull; - import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorInfo; import org.briarproject.bramble.api.sync.GroupId; @@ -11,6 +9,8 @@ import org.briarproject.briar.api.blog.BlogPostHeader; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.NonNull; + @NotThreadSafe public class BlogPostItem implements Comparable { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java index d25127ee3..e10af04b9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java @@ -2,11 +2,6 @@ package org.briarproject.briar.android.blog; import android.content.Context; import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.annotation.UiThread; -import androidx.fragment.app.FragmentManager; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.RecyclerView; import android.text.Spanned; import android.view.LayoutInflater; import android.view.View; @@ -22,6 +17,12 @@ import org.briarproject.briar.api.blog.BlogPostHeader; import javax.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; +import androidx.core.view.ViewCompat; +import androidx.fragment.app.FragmentManager; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedController.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedController.java index 4eec273ce..6a8cdd7cd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.blog; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; @@ -9,6 +7,8 @@ import org.briarproject.briar.api.blog.Blog; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault public interface FeedController extends BaseController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java index 36224734a..2896fded4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java @@ -3,8 +3,6 @@ package org.briarproject.briar.android.blog; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -31,6 +29,9 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import static android.app.Activity.RESULT_OK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedPostFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedPostFragment.java index 9b2aeb234..032445c0e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedPostFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedPostFragment.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.blog; import android.os.Bundle; -import androidx.annotation.UiThread; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +16,8 @@ import org.briarproject.briar.android.controller.handler.UiResultExceptionHandle import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; + import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java index d92e42e1a..7ec60e0b6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.blog; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,6 +12,8 @@ import org.briarproject.briar.android.util.BriarAdapter; import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.api.feed.Feed; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java index 94082a179..08ac68ace 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.blog; import android.os.Bundle; -import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.util.Patterns; @@ -27,6 +26,8 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java index dc92091fc..1c840f68e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java @@ -3,13 +3,12 @@ package org.briarproject.briar.android.blog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import com.google.android.material.snackbar.Snackbar; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.db.DbException; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; @@ -24,6 +23,9 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static java.util.logging.Level.WARNING; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java index 293b77be1..2ddac95bc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.contact; import android.content.Context; -import androidx.annotation.NonNull; import android.view.View; import org.briarproject.bramble.api.contact.ContactId; @@ -9,6 +8,8 @@ import org.briarproject.briar.android.util.BriarAdapter; import javax.annotation.Nullable; +import androidx.annotation.NonNull; + import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java index e355f1333..154287f47 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.contact; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -14,6 +12,8 @@ import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactCl import javax.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.RecyclerView; import im.delight.android.identicons.IdenticonDrawable; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java index 2e9f4430f..ff7f89cf7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java @@ -2,18 +2,14 @@ package org.briarproject.briar.android.contact; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.UiThread; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.snackbar.Snackbar; -import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.util.Pair; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -54,13 +50,18 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.util.Pair; +import androidx.recyclerview.widget.LinearLayoutManager; import io.github.kobakei.materialfabspeeddial.FabSpeedDial; import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener; import static android.os.Build.VERSION.SDK_INT; -import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation; import static androidx.core.view.ViewCompat.getTransitionName; +import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; import static java.util.Objects.requireNonNull; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java index ad527e26b..9b109d66f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListItemViewHolder.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.contact; -import androidx.annotation.UiThread; import android.view.View; import android.widget.TextView; @@ -14,6 +13,8 @@ import java.util.Locale; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + import static androidx.core.view.ViewCompat.setTransitionName; import static org.briarproject.briar.android.util.UiUtils.formatDate; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java index 0a1b15a95..f93d0167a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java @@ -1,10 +1,7 @@ package org.briarproject.briar.android.contact.add.remote; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import android.view.MenuItem; import android.widget.Toast; @@ -18,6 +15,10 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.ActionBar; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.content.Intent.ACTION_SEND; import static android.content.Intent.ACTION_VIEW; import static android.content.Intent.EXTRA_TEXT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java index 2b7b7b764..3e665d19f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java @@ -1,10 +1,6 @@ package org.briarproject.briar.android.contact.add.remote; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UnsupportedVersionException; @@ -24,6 +20,11 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java index 6b61c114d..2e4cad254 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java @@ -1,14 +1,9 @@ package org.briarproject.briar.android.contact.add.remote; import android.animation.ObjectAnimator; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.ClipData; import android.content.ClipboardManager; import android.os.Bundle; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.core.app.ShareCompat.IntentBuilder; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,6 +13,9 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; @@ -29,6 +27,10 @@ import java.util.regex.Matcher; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.core.app.ShareCompat.IntentBuilder; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.content.Context.CLIPBOARD_SERVICE; import static android.widget.Toast.LENGTH_SHORT; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java index a12167d8d..634c45462 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java @@ -1,16 +1,10 @@ package org.briarproject.briar.android.contact.add.remote; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.StringRes; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.appcompat.app.AlertDialog.Builder; import android.text.Editable; import android.view.LayoutInflater; import android.view.View; @@ -19,6 +13,9 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.Toast; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.UnsupportedVersionException; import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.db.ContactExistsException; @@ -33,12 +30,17 @@ import org.briarproject.briar.android.fragment.BaseFragment; import javax.annotation.Nullable; import javax.inject.Inject; -import static androidx.core.content.ContextCompat.getColor; -import static androidx.core.content.ContextCompat.getDrawable; -import static androidx.core.graphics.drawable.DrawableCompat.setTint; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static android.widget.Toast.LENGTH_LONG; +import static androidx.core.content.ContextCompat.getColor; +import static androidx.core.content.ContextCompat.getDrawable; +import static androidx.core.graphics.drawable.DrawableCompat.setTint; import static java.util.Objects.requireNonNull; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java index 7c8bb3c06..225096dd9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java @@ -1,15 +1,11 @@ package org.briarproject.briar.android.contact.add.remote; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; -import com.google.android.material.snackbar.Snackbar; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.MenuItem; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -24,6 +20,12 @@ import java.util.Collection; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; +import androidx.recyclerview.widget.LinearLayoutManager; + import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; import static org.briarproject.bramble.api.contact.PendingContactState.FAILED; import static org.briarproject.briar.android.contact.add.remote.PendingContactItem.POLL_DURATION_MS; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java index b506f1165..b9e97e63d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.contact.add.remote; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.contact.ContactManager; @@ -29,6 +26,10 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.contact.PendingContactState.OFFLINE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java index 06ee94d97..488e1d211 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java @@ -1,8 +1,5 @@ package org.briarproject.briar.android.contact.add.remote; -import androidx.core.content.ContextCompat; -import androidx.appcompat.widget.AppCompatImageButton; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.widget.TextView; @@ -11,6 +8,10 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.TextAvatarView; +import androidx.appcompat.widget.AppCompatImageButton; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import static org.briarproject.briar.android.util.UiUtils.formatDate; @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java index 78fb447e5..704bf984c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.contactselection; import android.content.Context; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -25,6 +23,9 @@ import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.recyclerview.widget.LinearLayoutManager; + import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.contactselection.ContactSelectorActivity.CONTACTS; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java index 41b40a7b6..df10f082c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseSelectableContactHolder.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.contactselection; -import androidx.annotation.UiThread; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; @@ -12,6 +11,8 @@ import org.briarproject.briar.android.contact.ContactItemViewHolder; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + import static org.briarproject.briar.android.util.UiUtils.GREY_OUT; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java index 54521fb88..8f9002f59 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorActivity.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.contactselection; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.LayoutRes; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -19,6 +16,10 @@ import java.util.List; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.LayoutRes; +import androidx.annotation.UiThread; + @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class ContactSelectorActivity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java index 1002efbff..b9dc45d2a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorListener.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.contactselection; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault public interface ContactSelectorListener { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java index cda343781..cf0d2cdab 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/SelectableContactHolder.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.contactselection; -import androidx.annotation.UiThread; import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -8,6 +7,8 @@ import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactCl import javax.annotation.Nullable; +import androidx.annotation.UiThread; + import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java index 0bd807107..2e4479716 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java @@ -3,7 +3,6 @@ package org.briarproject.briar.android.controller; import android.app.Activity; import android.content.Intent; import android.os.IBinder; -import androidx.annotation.CallSuper; import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.db.DatabaseExecutor; @@ -21,6 +20,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.CallSuper; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java index 8f9d5a6a8..c098e82b5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.controller; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault public interface SharingController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java index 19d72a6b8..9cdc47cdb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.controller; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; @@ -18,6 +16,8 @@ import java.util.Set; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; + @NotNullByDefault public class SharingControllerImpl implements SharingController, EventListener { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java index c977b15d1..abf7d2712 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiExceptionHandler.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.controller.handler; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.DestroyableContext; import javax.annotation.concurrent.Immutable; +import androidx.annotation.UiThread; + @Immutable @NotNullByDefault public abstract class UiExceptionHandler diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java index 0c991a25a..d2cd5c04f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultExceptionHandler.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.controller.handler; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.DestroyableContext; import javax.annotation.concurrent.Immutable; +import androidx.annotation.UiThread; + @Immutable @NotNullByDefault public abstract class UiResultExceptionHandler diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultHandler.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultHandler.java index 8941405a6..e0d3ebdcf 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultHandler.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/handler/UiResultHandler.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.controller.handler; -import androidx.annotation.UiThread; - import org.briarproject.briar.android.DestroyableContext; +import androidx.annotation.UiThread; + public abstract class UiResultHandler implements ResultHandler { private final DestroyableContext listener; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java index 9cf2565c7..4144ca31d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java @@ -1,18 +1,15 @@ package org.briarproject.briar.android.conversation; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputLayout; -import androidx.appcompat.app.AppCompatDialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -21,6 +18,11 @@ import org.briarproject.briar.android.activity.BaseActivity; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE; import static java.util.Objects.requireNonNull; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index c0d8df980..7e858cfb2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -1,23 +1,10 @@ package org.briarproject.briar.android.conversation; import android.annotation.SuppressLint; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import com.google.android.material.snackbar.Snackbar; -import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.content.ContextCompat; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.ActionMenuView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.appcompat.widget.Toolbar; import android.transition.Slide; import android.transition.Transition; import android.util.SparseArray; @@ -29,6 +16,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.FeatureFlags; import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.contact.ContactId; @@ -96,18 +85,30 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; +import androidx.recyclerview.widget.LinearLayoutManager; import de.hdodenhof.circleimageview.CircleImageView; import im.delight.android.identicons.IdenticonDrawable; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.PromptStateChangeListener; -import static androidx.lifecycle.Lifecycle.State.STARTED; import static android.os.Build.VERSION.SDK_INT; -import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation; -import static androidx.core.view.ViewCompat.setTransitionName; -import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; import static android.view.Gravity.RIGHT; import static android.widget.Toast.LENGTH_SHORT; +import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation; +import static androidx.core.view.ViewCompat.setTransitionName; +import static androidx.lifecycle.Lifecycle.State.STARTED; +import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.Collections.sort; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java index 382b6c8a0..13bde921a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.conversation; import android.content.Context; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView.RecycledViewPool; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +15,10 @@ import org.briarproject.briar.android.util.ItemReturningAdapter; import javax.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView.RecycledViewPool; + @NotNullByDefault class ConversationAdapter extends BriarAdapter diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java index f3b00339f..f70ce35bc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.LayoutRes; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; @@ -10,6 +8,8 @@ import org.briarproject.briar.api.conversation.ConversationMessageHeader; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; + @NotThreadSafe @NotNullByDefault abstract class ConversationItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java index de9e207cb..77b1b9156 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java @@ -1,15 +1,16 @@ package org.briarproject.briar.android.conversation; +import android.view.View; +import android.widget.TextView; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.R; + import androidx.annotation.CallSuper; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import android.view.View; -import android.widget.TextView; - -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.briar.R; import static org.briarproject.bramble.util.StringUtils.trim; import static org.briarproject.briar.android.util.UiUtils.formatDate; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java index d873ffc2b..700608e3a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java @@ -1,11 +1,12 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.UiThread; import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; +import androidx.annotation.UiThread; + @UiThread @NotNullByDefault interface ConversationListener { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java index c552651c9..b3e20b3f7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.LayoutRes; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.api.messaging.PrivateMessageHeader; @@ -10,6 +8,8 @@ import java.util.List; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; + @NotThreadSafe @NotNullByDefault class ConversationMessageItem extends ConversationItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java index 1e08a751a..4d5f11561 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java @@ -1,9 +1,5 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.UiThread; -import androidx.constraintlayout.widget.ConstraintSet; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.RecycledViewPool; import android.view.View; import android.view.ViewGroup; @@ -11,6 +7,11 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.attachment.AttachmentItem; +import androidx.annotation.UiThread; +import androidx.constraintlayout.widget.ConstraintSet; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.RecycledViewPool; + import static androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT; import static androidx.core.content.ContextCompat.getColor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java index 602f3d954..0694a0762 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.LayoutRes; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationResponse; @@ -9,6 +7,8 @@ import org.briarproject.briar.api.conversation.ConversationResponse; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; + @NotThreadSafe @NotNullByDefault class ConversationNoticeItem extends ConversationItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java index ab7d99162..1e70f0560 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java @@ -1,13 +1,14 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.CallSuper; -import androidx.annotation.UiThread; import android.view.View; import android.widget.TextView; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.CallSuper; +import androidx.annotation.UiThread; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java index 964d3226b..71984db65 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.LayoutRes; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.api.client.SessionId; @@ -12,6 +10,8 @@ import org.briarproject.briar.api.sharing.Shareable; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; + @NotThreadSafe @NotNullByDefault class ConversationRequestItem extends ConversationNoticeItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java index 5be486c48..3792ee0dc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java @@ -1,12 +1,13 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.UiThread; import android.view.View; import android.widget.Button; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.UiThread; + import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index 8de370c75..5f00472f2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -1,13 +1,7 @@ package org.briarproject.briar.android.conversation; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.Transformations; import android.net.Uri; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.contact.Contact; @@ -44,6 +38,13 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Transformations; + import static java.util.Objects.requireNonNull; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java index bbe31bbee..3d4080f03 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.conversation; -import androidx.lifecycle.LiveData; import android.content.Context; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; @@ -23,6 +21,9 @@ import java.util.List; import javax.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; + import static java.util.Collections.emptyList; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.BLOG; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.FORUM; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index 377ef61a6..749ef495c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java @@ -1,22 +1,9 @@ package org.briarproject.briar.android.conversation; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import com.google.android.material.appbar.AppBarLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.appcompat.widget.Toolbar; import android.transition.Fade; import android.transition.Transition; import android.view.Menu; @@ -26,6 +13,8 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.Window; import android.widget.TextView; +import com.google.android.material.appbar.AppBarLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; @@ -42,18 +31,31 @@ import java.util.Locale; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; +import androidx.viewpager.widget.ViewPager; + import static android.content.Intent.ACTION_CREATE_DOCUMENT; import static android.content.Intent.CATEGORY_OPENABLE; import static android.content.Intent.EXTRA_TITLE; import static android.graphics.Color.TRANSPARENT; import static android.os.Build.VERSION.SDK_INT; -import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static android.view.View.GONE; import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN; import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE; import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; +import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SAVE_ATTACHMENT; import static org.briarproject.briar.android.util.UiUtils.formatDateAbsolute; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java index 4ce6ed152..9f456f71b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.conversation; import android.content.Context; import android.content.res.Resources; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView.Adapter; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +16,9 @@ import org.briarproject.briar.android.conversation.glide.Radii; import java.util.ArrayList; import java.util.List; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView.Adapter; + import static android.content.Context.WINDOW_SERVICE; import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.util.UiUtils.isRtl; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java index 1995fa8f8..9f8ee39d4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java @@ -1,13 +1,9 @@ package org.briarproject.briar.android.conversation; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,6 +23,11 @@ import org.briarproject.briar.android.conversation.glide.GlideApp; import javax.annotation.ParametersAreNonnullByDefault; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.os.Build.VERSION.SDK_INT; import static android.widget.ImageView.ScaleType.FIT_START; import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java index a626721bc..3f1ee6568 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java @@ -3,14 +3,15 @@ package org.briarproject.briar.android.conversation; import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ItemDecoration; -import androidx.recyclerview.widget.RecyclerView.State; import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ItemDecoration; +import androidx.recyclerview.widget.RecyclerView.State; + import static org.briarproject.briar.android.conversation.ImageAdapter.isBottomRow; import static org.briarproject.briar.android.conversation.ImageAdapter.isLeft; import static org.briarproject.briar.android.conversation.ImageAdapter.isTopRow; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java index be32c74f5..76eaab5e3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.conversation; import android.graphics.Bitmap; -import androidx.annotation.DrawableRes; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import androidx.recyclerview.widget.StaggeredGridLayoutManager.LayoutParams; import android.view.View; import android.widget.ImageView; @@ -16,6 +13,10 @@ import org.briarproject.briar.android.conversation.glide.BriarImageTransformatio import org.briarproject.briar.android.conversation.glide.GlideApp; import org.briarproject.briar.android.conversation.glide.Radii; +import androidx.annotation.DrawableRes; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.StaggeredGridLayoutManager.LayoutParams; + import static android.os.Build.VERSION.SDK_INT; import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java index 4f379a29e..0c251cf60 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java @@ -1,11 +1,8 @@ package org.briarproject.briar.android.conversation; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import android.view.View; import org.briarproject.bramble.api.db.DatabaseExecutor; @@ -31,6 +28,10 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.lifecycle.AndroidViewModel; + import static android.media.MediaScannerConnection.scanFile; import static android.os.Environment.DIRECTORY_PICTURES; import static android.os.Environment.getExternalStoragePublicDirectory; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java index 1bf8ca737..5fee04f20 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java @@ -1,12 +1,13 @@ package org.briarproject.briar.android.conversation; -import androidx.annotation.UiThread; import android.view.View; import android.widget.ImageView; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.UiThread; + @UiThread @NotNullByDefault class OutItemViewHolder { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java index d7f5f224a..d208ab475 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.conversation.glide; -import androidx.annotation.Nullable; - import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; @@ -19,6 +17,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static com.bumptech.glide.load.DataSource.LOCAL; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java index 12b11e2d4..3c237be6f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java @@ -5,7 +5,6 @@ import android.graphics.BitmapShader; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import androidx.annotation.NonNull; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; @@ -16,6 +15,8 @@ import java.security.MessageDigest; import javax.annotation.concurrent.Immutable; +import androidx.annotation.NonNull; + import static android.graphics.Bitmap.Config.ARGB_8888; import static android.graphics.Shader.TileMode.CLAMP; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java index bbb63a93e..4f773edd0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.conversation.glide; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import androidx.annotation.Nullable; + @NotNullByDefault public class Radii { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java index 4c126b265..c17592e37 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.forum; import android.content.Intent; import android.os.Bundle; -import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.widget.Button; @@ -10,6 +9,8 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.Toast; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java index 83b8b5e8c..3fedef567 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java @@ -3,10 +3,6 @@ package org.briarproject.briar.android.forum; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.StringRes; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -30,6 +26,10 @@ import org.briarproject.briar.api.forum.Forum; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.widget.Toast.LENGTH_SHORT; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SHARE_FORUM; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java index eb71a5540..5f11f4e1d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.forum; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.threaded.ThreadListController; import org.briarproject.briar.api.forum.Forum; +import androidx.annotation.UiThread; + @NotNullByDefault interface ForumController extends ThreadListController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java index fb959a8f9..77cebffac 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.forum; import android.content.Context; import android.content.Intent; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,9 +14,11 @@ import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.view.TextAvatarView; import org.briarproject.briar.api.forum.Forum; -import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_NAME; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java index c464705ec..ee3b54e7d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.forum; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.UiThread; -import com.google.android.material.snackbar.Snackbar; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -13,6 +10,8 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.contact.event.ContactRemovedEvent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchGroupException; @@ -44,6 +43,9 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; import static java.util.Objects.requireNonNull; import static java.util.logging.Level.WARNING; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java index 721706a50..6f7a5cfc9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java @@ -3,10 +3,6 @@ package org.briarproject.briar.android.fragment; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.UiThread; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; import android.view.MenuItem; import org.briarproject.bramble.api.db.DbException; @@ -17,6 +13,11 @@ import org.briarproject.briar.android.activity.ActivityComponent; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.UiThread; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class BaseFragment extends Fragment diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java index 91c09a015..3b8807f0d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +10,8 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; + @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java index 3ca5b8d09..5de6feb0c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java @@ -6,8 +6,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.fragment.app.DialogFragment; -import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -27,6 +25,9 @@ import java.util.Collection; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class ScreenFilterDialogFragment extends DialogFragment { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java index 8b851b752..19c982029 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.introduction; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -31,6 +28,10 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import static java.util.Objects.requireNonNull; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index e29619450..62072e4bf 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.introduction; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -32,6 +30,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; import de.hdodenhof.circleimageview.CircleImageView; import im.delight.android.identicons.IdenticonDrawable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java index 7f78f471d..f21f4bfb8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java @@ -6,8 +6,6 @@ import android.hardware.Camera.AutoFocusCallback; import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import android.util.AttributeSet; import android.view.Display; import android.view.Surface; @@ -23,6 +21,9 @@ import java.io.IOException; import java.util.List; import java.util.logging.Logger; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + import static android.content.Context.WINDOW_SERVICE; import static android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK; import static android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java index d62f331e6..062f12059 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.keyagreement; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import androidx.annotation.UiThread; import android.widget.Toast; import org.briarproject.bramble.api.identity.Author; @@ -16,6 +13,10 @@ import org.briarproject.briar.android.activity.ActivityComponent; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.widget.Toast.LENGTH_LONG; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java index 3cbdccd36..733b50a6a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.keyagreement; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,6 +17,8 @@ import org.briarproject.briar.android.util.UiUtils; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static org.briarproject.briar.android.util.UiUtils.onSingleLinkClick; @MethodsNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java index 5feef7060..05a539d5c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java @@ -1,9 +1,8 @@ package org.briarproject.briar.android.keyagreement; -import androidx.lifecycle.ViewModel; - import org.briarproject.briar.android.viewmodel.ViewModelKey; +import androidx.lifecycle.ViewModel; import dagger.Binds; import dagger.Module; import dagger.multibindings.IntoMap; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java index b241eebf5..d37a19b84 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java @@ -1,10 +1,6 @@ package org.briarproject.briar.android.keyagreement; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactExchangeManager; @@ -25,6 +21,11 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java index 5184300ba..4b9036770 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java @@ -6,12 +6,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; -import androidx.core.app.ActivityCompat; -import androidx.fragment.app.FragmentManager; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import org.briarproject.bramble.api.event.EventBus; @@ -32,6 +26,13 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentManager; + import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.CAMERA; import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java index c1de201ba..2c5d7f1f8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java @@ -3,7 +3,6 @@ package org.briarproject.briar.android.keyagreement; import android.content.Context; import android.graphics.Bitmap; import android.os.Bundle; -import androidx.annotation.UiThread; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; @@ -47,6 +46,8 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; +import androidx.annotation.UiThread; + import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java index 86f826b51..bea7b65b8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java @@ -1,10 +1,11 @@ package org.briarproject.briar.android.keyagreement; import android.hardware.Camera; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import androidx.annotation.UiThread; + @SuppressWarnings("deprecation") @NotNullByDefault interface PreviewConsumer { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java index 60fd3ad04..91f6f9dda 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java @@ -5,7 +5,6 @@ import android.hardware.Camera.CameraInfo; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.Size; import android.os.AsyncTask; -import androidx.annotation.UiThread; import com.google.zxing.BinaryBitmap; import com.google.zxing.LuminanceSource; @@ -22,6 +21,8 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import java.util.logging.Logger; +import androidx.annotation.UiThread; + import static com.google.zxing.DecodeHintType.CHARACTER_SET; import static java.util.Collections.singletonMap; import static java.util.logging.Level.WARNING; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java index 3da4d0d1a..7c4b4f36b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.login; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -15,6 +13,8 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; import android.widget.Toast; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; @@ -23,6 +23,8 @@ import org.briarproject.briar.android.util.UiUtils; import javax.inject.Inject; +import androidx.annotation.NonNull; + import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java index b536a8a85..ad8843cbd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseFragment.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.login; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,6 +15,10 @@ import org.briarproject.briar.android.fragment.BaseFragment; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static org.briarproject.briar.android.login.StartupViewModel.State; import static org.briarproject.briar.android.login.StartupViewModel.State.COMPACTING; import static org.briarproject.briar.android.login.StartupViewModel.State.MIGRATING; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java index 1a932ce73..778259c76 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java @@ -1,11 +1,6 @@ package org.briarproject.briar.android.login; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -14,6 +9,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ProgressBar; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; @@ -23,6 +21,10 @@ import org.briarproject.briar.android.fragment.BaseFragment; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java index 8b6eeffc1..faf469c28 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java @@ -1,10 +1,7 @@ package org.briarproject.briar.android.login; -import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -18,6 +15,10 @@ import org.briarproject.briar.android.login.StartupViewModel.State; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.lifecycle.ViewModelProviders; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java index 47edac511..192c085f3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupViewModel.java @@ -1,10 +1,6 @@ package org.briarproject.briar.android.login; import android.app.Application; -import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.event.Event; @@ -23,6 +19,11 @@ import java.util.concurrent.Executor; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.COMPACTING_DATABASE; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.MIGRATING_DATABASE; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java index b68e9c313..dcd80c2a3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java @@ -7,10 +7,11 @@ import android.graphics.drawable.ClipDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.ShapeDrawable; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.ProgressBar; +import androidx.annotation.Nullable; + import static android.graphics.Color.BLACK; import static android.graphics.Paint.Style.FILL; import static android.graphics.Paint.Style.STROKE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index 6e26debe5..11f0cdc76 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -5,19 +5,6 @@ import android.content.Intent; import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import com.google.android.material.navigation.NavigationView; -import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener; -import androidx.core.app.ActivityCompat; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.core.content.ContextCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -27,6 +14,9 @@ import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener; + import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -55,11 +45,23 @@ import java.util.logging.Logger; import javax.inject.Inject; -import static androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE; -import static androidx.core.view.GravityCompat.START; -import static androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static androidx.core.view.GravityCompat.START; +import static androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED; +import static androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE; import static java.util.Objects.requireNonNull; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportStateListener.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportStateListener.java index b30932ad6..f47e311e3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportStateListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportStateListener.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.navdrawer; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.plugin.TransportId; +import androidx.annotation.UiThread; + interface TransportStateListener { @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesActivity.java index 95731a080..6017e50ae 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesActivity.java @@ -1,13 +1,14 @@ package org.briarproject.briar.android.panic; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import android.view.MenuItem; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import androidx.appcompat.app.ActionBar; + public class PanicPreferencesActivity extends BriarActivity { @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java index a415c35e6..2f4f1ac6a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java @@ -8,10 +8,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; -import androidx.preference.SwitchPreference; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceFragmentCompat; import android.text.TextUtils; import org.briarproject.briar.R; @@ -21,6 +17,10 @@ import java.util.logging.Logger; import javax.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.SwitchPreference; import info.guardianproject.panic.PanicResponder; import static android.app.Activity.RESULT_CANCELED; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java index 602b7b9a2..b1ca57ee6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java @@ -3,7 +3,6 @@ package org.briarproject.briar.android.panic; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import androidx.preference.PreferenceManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -17,6 +16,7 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.preference.PreferenceManager; import info.guardianproject.GuardianProjectRSA4096; import info.guardianproject.panic.Panic; import info.guardianproject.panic.PanicResponder; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/VisibilityHelper.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/VisibilityHelper.java index 805b571da..1b8920e7c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/VisibilityHelper.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/VisibilityHelper.java @@ -1,11 +1,12 @@ package org.briarproject.briar.android.privategroup; import android.content.Context; -import androidx.annotation.DrawableRes; import org.briarproject.briar.R; import org.briarproject.briar.api.privategroup.Visibility; +import androidx.annotation.DrawableRes; + import static org.briarproject.briar.api.privategroup.Visibility.INVISIBLE; public class VisibilityHelper { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java index be90b0742..eca22abf5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java @@ -4,9 +4,6 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -33,6 +30,10 @@ import org.briarproject.briar.api.privategroup.Visibility; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_GROUP_INVITE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java index 25c47c730..571f55bf1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.conversation; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.AuthorId; @@ -11,6 +9,8 @@ import org.briarproject.briar.android.threaded.ThreadListController; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.Visibility; +import androidx.annotation.UiThread; + public interface GroupController extends ThreadListController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java index 6a25a18cb..3b67f8b94 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java @@ -1,8 +1,5 @@ package org.briarproject.briar.android.privategroup.conversation; -import androidx.annotation.LayoutRes; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,6 +12,10 @@ import org.briarproject.briar.android.threaded.ThreadItemAdapter; import org.briarproject.briar.android.threaded.ThreadPostViewHolder; import org.briarproject.briar.api.privategroup.Visibility; +import androidx.annotation.LayoutRes; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java index 8a9c561c1..315beff27 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java @@ -1,8 +1,5 @@ package org.briarproject.briar.android.privategroup.conversation; -import androidx.annotation.LayoutRes; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorInfo; import org.briarproject.bramble.api.sync.GroupId; @@ -14,6 +11,9 @@ import org.briarproject.briar.api.privategroup.GroupMessageHeader; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; +import androidx.annotation.UiThread; + @UiThread @NotThreadSafe class GroupMessageItem extends ThreadItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItem.java index a681cd086..592962371 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItem.java @@ -1,14 +1,14 @@ package org.briarproject.briar.android.privategroup.conversation; -import androidx.annotation.LayoutRes; -import androidx.annotation.UiThread; - import org.briarproject.briar.R; import org.briarproject.briar.api.privategroup.JoinMessageHeader; import org.briarproject.briar.api.privategroup.Visibility; import javax.annotation.concurrent.NotThreadSafe; +import androidx.annotation.LayoutRes; +import androidx.annotation.UiThread; + @UiThread @NotThreadSafe class JoinMessageItem extends GroupMessageItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java index 5d94e1f33..e6c1e9c98 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.privategroup.conversation; import android.content.Context; -import androidx.annotation.UiThread; import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -9,6 +8,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; +import androidx.annotation.UiThread; + import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java index de839d281..ffd605c98 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.creation; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -12,6 +10,8 @@ import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; import java.util.Collection; +import androidx.annotation.Nullable; + @NotNullByDefault public interface CreateGroupController extends ContactSelectorController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java index 8e1cd3e93..88355a63b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.creation; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -34,6 +32,8 @@ import java.util.logging.Logger; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java index 2f5e1f451..141091fdd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.privategroup.creation; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -13,6 +11,8 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.util.StringUtils; @@ -20,6 +20,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import androidx.annotation.Nullable; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java index fb147b861..19e8fefee 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java @@ -1,12 +1,12 @@ package org.briarproject.briar.android.privategroup.creation; -import androidx.annotation.StringRes; - import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.sharing.BaseMessageFragment; +import androidx.annotation.StringRes; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class CreateGroupMessageFragment extends BaseMessageFragment { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java index 42aa82077..afc963b83 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.privategroup.creation; import android.os.Bundle; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -14,6 +13,8 @@ import org.briarproject.briar.android.contactselection.SelectableContactItem; import javax.inject.Inject; +import androidx.annotation.Nullable; + import static java.util.Objects.requireNonNull; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListController.java index 197809d2f..5c030c0f0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.list; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; @@ -12,6 +10,8 @@ import org.briarproject.briar.api.privategroup.GroupMessageHeader; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault interface GroupListController extends DbController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListControllerImpl.java index bccb5b254..75fa033c3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListControllerImpl.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.list; -import androidx.annotation.CallSuper; - import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; @@ -40,6 +38,8 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.CallSuper; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java index aeac5a116..1fe13900d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.privategroup.list; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.UiThread; -import com.google.android.material.snackbar.Snackbar; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -13,6 +10,8 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; @@ -36,6 +35,9 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java index 236d2fd82..f1c50eefb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.privategroup.list; import android.content.Context; import android.content.Intent; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.Button; @@ -16,6 +15,8 @@ import org.briarproject.briar.android.privategroup.conversation.GroupActivity; import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.view.TextAvatarView; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java index 72acebc1b..6a6fe5a7a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.privategroup.memberlist; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.MenuItem; import android.widget.TextView; @@ -27,6 +26,8 @@ import java.util.Collection; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.recyclerview.widget.LinearLayoutManager; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class GroupMemberListActivity extends BriarActivity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java index 320a5f7be..cec23eea1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.privategroup.memberlist; import android.content.Context; -import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,6 +8,8 @@ import android.view.ViewGroup; import org.briarproject.briar.R; import org.briarproject.briar.android.util.BriarAdapter; +import androidx.annotation.NonNull; + import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; class MemberListAdapter extends diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java index 54d544236..c0713a0cd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.privategroup.memberlist; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -10,6 +8,9 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.AuthorView; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java index 1082ecce3..2e906f5e4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.privategroup.reveal; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.LayoutRes; -import androidx.appcompat.app.AlertDialog; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -27,6 +25,9 @@ import java.util.Collection; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.LayoutRes; +import androidx.appcompat.app.AlertDialog; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class RevealContactsActivity extends ContactSelectorActivity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java index e2bb301d7..87edf059c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.privategroup.reveal; -import androidx.annotation.UiThread; import android.view.View; import android.widget.ImageView; @@ -11,6 +10,8 @@ import org.briarproject.briar.android.contactselection.BaseSelectableContactHold import javax.annotation.Nullable; +import androidx.annotation.UiThread; + import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon; import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; import static org.briarproject.briar.android.util.UiUtils.GREY_OUT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java index 6b4e71c10..827838cb6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java @@ -12,7 +12,6 @@ import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.annotation.NonNull; import org.acra.builder.ReportBuilder; import org.acra.builder.ReportPrimer; @@ -33,6 +32,8 @@ import java.util.concurrent.FutureTask; import java.util.logging.Formatter; import java.util.logging.LogRecord; +import androidx.annotation.NonNull; + import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE; import static android.content.Context.ACTIVITY_SERVICE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java index 4b8d0b638..312ab6b51 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.reporting; import android.content.Context; -import androidx.annotation.NonNull; import org.acra.collector.CrashReportData; import org.acra.sender.ReportSender; @@ -15,6 +14,8 @@ import java.io.FileNotFoundException; import javax.inject.Inject; +import androidx.annotation.NonNull; + import static org.acra.ReportField.REPORT_ID; public class BriarReportSender implements ReportSender { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSenderFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSenderFactory.java index f446da79b..365948952 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSenderFactory.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSenderFactory.java @@ -1,13 +1,14 @@ package org.briarproject.briar.android.reporting; import android.content.Context; -import androidx.annotation.NonNull; import org.acra.config.ACRAConfiguration; import org.acra.sender.ReportSender; import org.acra.sender.ReportSenderFactory; import org.briarproject.briar.android.BriarApplication; +import androidx.annotation.NonNull; + public class BriarReportSenderFactory implements ReportSenderFactory { @NonNull diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java index 9abdb03ca..beaf7f3c5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.reporting; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +9,9 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import static java.util.Objects.requireNonNull; @MethodsNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java index 45ccaa0c1..9014a7dfd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java @@ -4,10 +4,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.appcompat.widget.Toolbar; import org.acra.dialog.BaseCrashReportDialog; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -19,6 +15,11 @@ import org.briarproject.briar.android.util.UserFeedback; import java.io.File; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java index ee6bfe7ad..32edfede3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.reporting; import android.os.AsyncTask; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -35,6 +33,9 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import static android.view.MenuItem.SHOW_AS_ACTION_ALWAYS; import static android.view.View.GONE; import static android.view.View.INVISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java index 28a8ef220..311711b1b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java @@ -1,13 +1,14 @@ package org.briarproject.briar.android.settings; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import android.view.MenuItem; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import androidx.appcompat.app.ActionBar; + public class SettingsActivity extends BriarActivity { @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 7e6aa4be5..527a75489 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -9,15 +9,6 @@ import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.StringRes; -import androidx.preference.SwitchPreference; -import androidx.core.content.ContextCompat; -import androidx.core.text.TextUtilsCompat; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceGroup; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -50,6 +41,16 @@ import java.util.logging.Logger; import javax.inject.Inject; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.core.text.TextUtilsCompat; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceGroup; +import androidx.preference.SwitchPreference; + import static android.app.Activity.RESULT_OK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; @@ -67,8 +68,8 @@ import static android.provider.Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS; import static android.provider.Settings.EXTRA_APP_PACKAGE; import static android.provider.Settings.EXTRA_CHANNEL_ID; import static android.provider.Settings.System.DEFAULT_NOTIFICATION_URI; -import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_LTR; import static android.widget.Toast.LENGTH_SHORT; +import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_LTR; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_BT_ENABLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index 84077f1c3..1d33fd83e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.sharing; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -22,6 +19,10 @@ import org.briarproject.briar.api.messaging.AttachmentHeader; import java.util.List; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; + @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class BaseMessageFragment extends BaseFragment diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java index 08c85f8aa..ab83a50a1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationActivity.java @@ -2,8 +2,6 @@ package org.briarproject.briar.android.sharing; import android.content.Context; import android.os.Bundle; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; import android.widget.Toast; import org.briarproject.bramble.api.db.DbException; @@ -22,6 +20,9 @@ import java.util.logging.Logger; import javax.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.LinearLayoutManager; + import static android.widget.Toast.LENGTH_SHORT; import static org.briarproject.briar.android.sharing.InvitationAdapter.InvitationClickListener; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java index dc81db762..3a75313a2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.sharing; import android.content.Context; -import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +9,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.util.BriarAdapter; import org.briarproject.briar.api.sharing.InvitationItem; +import androidx.annotation.NonNull; + public abstract class InvitationAdapter> extends BriarAdapter { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java index 685160d55..47b0ba5b7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationControllerImpl.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.sharing; import android.app.Activity; -import androidx.annotation.CallSuper; import org.briarproject.bramble.api.contact.event.ContactRemovedEvent; import org.briarproject.bramble.api.db.DatabaseExecutor; @@ -24,6 +23,8 @@ import java.util.Collection; import java.util.concurrent.Executor; import java.util.logging.Logger; +import androidx.annotation.CallSuper; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationViewHolder.java index 04202b446..c9c0d233b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationViewHolder.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.sharing; -import androidx.annotation.CallSuper; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -13,6 +11,9 @@ import org.briarproject.briar.api.sharing.InvitationItem; import javax.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.recyclerview.widget.RecyclerView; + import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java index cb6b70fb5..dbba270a2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.sharing; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.UiThread; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -15,6 +14,8 @@ import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class ShareActivity extends ContactSelectorActivity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java index 46c950ec3..e2ed19bc3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.sharing; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +9,9 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class ShareBlogMessageFragment extends BaseMessageFragment { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java index 93f7c72f4..b86bcb0fe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumMessageFragment.java @@ -1,8 +1,6 @@ package org.briarproject.briar.android.sharing; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +9,9 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + @MethodsNotNullByDefault @ParametersNotNullByDefault public class ShareForumMessageFragment extends BaseMessageFragment { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java index 4b4c9cc87..a6dcd9516 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.sharing; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.MenuItem; import android.widget.TextView; @@ -33,6 +30,10 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.CallSuper; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.LinearLayoutManager; + import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java index 6c404a045..7db01bf85 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java @@ -3,12 +3,13 @@ package org.briarproject.briar.android.splash; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.View.OnClickListener; import org.briarproject.briar.R; +import androidx.appcompat.app.AppCompatActivity; + import static android.content.Intent.ACTION_VIEW; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java index 2d57e87dc..85aa5bb42 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java @@ -25,8 +25,8 @@ import static android.os.Build.VERSION.SDK_INT; import static androidx.preference.PreferenceManager.setDefaultValues; import static java.lang.System.currentTimeMillis; import static java.util.logging.Logger.getLogger; -import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY; +import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; @MethodsNotNullByDefault @ParametersNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java index 865010133..f9f98185b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.test; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; import android.view.MenuItem; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; @@ -15,6 +14,8 @@ import org.briarproject.briar.api.test.TestDataCreator; import javax.inject.Inject; +import androidx.appcompat.app.ActionBar; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java index 6136505b7..ee31ff5e6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java @@ -4,9 +4,6 @@ import android.animation.Animator; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.Context; -import androidx.annotation.CallSuper; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; @@ -18,6 +15,10 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; import org.briarproject.briar.android.view.AuthorView; +import androidx.annotation.CallSuper; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.RecyclerView; + import static androidx.core.content.ContextCompat.getColor; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java index 440f5cf12..40e211270 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.threaded; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.api.client.MessageTree; @@ -13,6 +11,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import androidx.annotation.UiThread; + @UiThread @NotNullByDefault public class NestedTreeList implements Iterable { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java index b4407973a..c293f7858 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java @@ -1,9 +1,5 @@ package org.briarproject.briar.android.threaded; -import androidx.annotation.NonNull; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +13,11 @@ import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index b9c7d99c3..b01248782 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -3,14 +3,10 @@ package org.briarproject.briar.android.threaded; import android.content.Intent; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.CallSuper; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; -import com.google.android.material.snackbar.Snackbar; -import androidx.appcompat.app.ActionBar; -import androidx.recyclerview.widget.LinearLayoutManager; import android.view.MenuItem; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -41,6 +37,12 @@ import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; +import androidx.annotation.CallSuper; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.LinearLayoutManager; + import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java index a7b2178c0..f8eb71bed 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.threaded; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -16,6 +14,8 @@ import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + @NotNullByDefault public interface ThreadListController extends ActivityLifecycleController { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java index fe5f8d210..61eeb2a9e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.threaded; import android.app.Activity; -import androidx.annotation.CallSuper; import org.briarproject.bramble.api.crypto.CryptoExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor; @@ -34,6 +33,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.logging.Logger; +import androidx.annotation.CallSuper; + import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java index 14dbe0731..71c028b14 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadPostViewHolder.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.threaded; -import androidx.annotation.UiThread; import android.view.View; import android.widget.TextView; @@ -10,6 +9,8 @@ import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListe import java.util.Locale; +import androidx.annotation.UiThread; + import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java index 2f3865037..2181d6de3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java @@ -1,13 +1,13 @@ package org.briarproject.briar.android.threaded; -import androidx.recyclerview.widget.LinearLayoutManager; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.view.BriarRecyclerViewScrollListener; import org.briarproject.briar.android.view.UnreadMessageButton; import java.util.logging.Logger; +import androidx.recyclerview.widget.LinearLayoutManager; + import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; import static java.util.Objects.requireNonNull; import static java.util.logging.Level.INFO; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java index 049229172..62b4a741f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java @@ -1,15 +1,16 @@ package org.briarproject.briar.android.util; import android.content.Context; -import androidx.annotation.UiThread; -import androidx.recyclerview.widget.SortedList; -import androidx.recyclerview.widget.RecyclerView.Adapter; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; import java.util.Collection; import javax.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.recyclerview.widget.RecyclerView.Adapter; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.SortedList; + import static androidx.recyclerview.widget.SortedList.INVALID_POSITION; public abstract class BriarAdapter diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java index bdb85a234..7783dbe41 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java @@ -1,12 +1,13 @@ package org.briarproject.briar.android.util; import android.content.Context; + +import org.briarproject.briar.R; + import androidx.annotation.ColorRes; import androidx.core.app.NotificationCompat; import androidx.core.content.ContextCompat; -import org.briarproject.briar.R; - import static android.os.Build.VERSION.SDK_INT; import static androidx.core.app.NotificationCompat.VISIBILITY_PRIVATE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java index 441ca97c3..785befbeb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java @@ -1,21 +1,23 @@ package org.briarproject.briar.android.util; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import com.google.android.material.snackbar.Snackbar; -import com.google.android.material.snackbar.Snackbar.Callback; import android.view.View; import android.view.View.OnClickListener; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.snackbar.Snackbar.Callback; + import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + import static android.os.Build.VERSION.SDK_INT; -import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; -import static androidx.core.content.ContextCompat.getColor; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static androidx.core.content.ContextCompat.getColor; +import static com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE; @NotNullByDefault public class BriarSnackbarBuilder { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java index 09971b1cd..61de039ee 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java @@ -3,9 +3,6 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Typeface; -import androidx.annotation.DimenRes; -import androidx.annotation.UiThread; -import androidx.constraintlayout.widget.ConstraintLayout; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.ImageView; @@ -18,6 +15,9 @@ import org.briarproject.briar.android.util.UiUtils; import javax.annotation.Nullable; +import androidx.annotation.DimenRes; +import androidx.annotation.UiThread; +import androidx.constraintlayout.widget.ConstraintLayout; import de.hdodenhof.circleimageview.CircleImageView; import im.delight.android.identicons.IdenticonDrawable; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java index 9910d6ce2..4dc6c6b3a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java @@ -5,11 +5,6 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.Adapter; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -21,6 +16,12 @@ import org.briarproject.briar.R; import javax.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; + import static org.briarproject.briar.android.util.UiUtils.MIN_DATE_RESOLUTION; public class BriarRecyclerView extends FrameLayout { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java index 3df5ea5f4..7c23c894b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java @@ -1,13 +1,13 @@ package org.briarproject.briar.android.view; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.android.util.ItemReturningAdapter; + import androidx.annotation.CallSuper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.OnScrollListener; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.briar.android.util.ItemReturningAdapter; - import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java index 4c2fce49a..273a250c5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.view; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -12,6 +9,10 @@ import android.widget.ProgressBar; import org.briarproject.briar.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageButton; + import static android.content.Context.LAYOUT_INFLATER_SERVICE; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java index c3384e16d..a3393213c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java @@ -4,9 +4,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; import android.os.IBinder; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.appcompat.widget.AppCompatImageButton; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; @@ -23,6 +20,10 @@ import org.briarproject.briar.android.BriarApplication; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.AppCompatImageButton; + import static android.content.Context.INPUT_METHOD_SERVICE; import static android.content.Context.LAYOUT_INFLATER_SERVICE; import static android.view.KeyEvent.KEYCODE_ENTER; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java index 9966dae6f..cb379b3d3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.view; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -13,10 +10,14 @@ import org.briarproject.briar.android.attachment.AttachmentItemResult; import java.util.Collection; +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.recyclerview.widget.RecyclerView; + import static android.content.Context.LAYOUT_INFLATER_SERVICE; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static androidx.core.content.ContextCompat.getColor; import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static java.util.Objects.requireNonNull; @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java index fd8c544ca..c11a70363 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java @@ -1,7 +1,5 @@ package org.briarproject.briar.android.view; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.RecyclerView.Adapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,6 +12,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView.Adapter; + import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java index 8ca1fcec9..ea4893ed7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java @@ -3,14 +3,15 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ItemDecoration; -import androidx.recyclerview.widget.RecyclerView.State; import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ItemDecoration; +import androidx.recyclerview.widget.RecyclerView.State; + @NotNullByDefault class ImagePreviewDecoration extends ItemDecoration { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java index 43bbf5aca..004b5fd48 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewItem.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.view; import android.net.Uri; -import androidx.annotation.Nullable; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.attachment.AttachmentItem; @@ -10,6 +9,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import androidx.annotation.Nullable; + @NotNullByDefault class ImagePreviewItem { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java index b3122a9d1..f78c4f9fc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java @@ -1,9 +1,6 @@ package org.briarproject.briar.android.view; import android.graphics.drawable.Drawable; -import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.widget.ImageView; import android.widget.ProgressBar; @@ -17,6 +14,10 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.conversation.glide.GlideApp; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java index 7de8e4b28..d3f34fa4f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.UiThread; import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.Button; @@ -13,6 +12,8 @@ import org.briarproject.briar.R; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + import static android.view.Gravity.BOTTOM; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java index c8a9b7e9d..8050438e3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/PullDownLayout.java @@ -25,9 +25,6 @@ package org.briarproject.briar.android.view; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; -import androidx.customview.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -36,6 +33,10 @@ import android.widget.FrameLayout; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; + @NotNullByDefault public class PullDownLayout extends FrameLayout { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java index cb6487c4c..008f9ab5f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.graphics.Bitmap; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.animation.AlphaAnimation; @@ -13,6 +10,10 @@ import android.widget.ImageView; import org.briarproject.briar.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + public class QrCodeView extends FrameLayout { private final ImageView qrCodeImageView; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java index dc8801827..7444c9557 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java @@ -1,15 +1,17 @@ package org.briarproject.briar.android.view; import android.content.Context; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior; -import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams; -import com.google.android.material.snackbar.Snackbar.SnackbarLayout; import android.util.AttributeSet; import android.view.View; +import com.google.android.material.snackbar.Snackbar.SnackbarLayout; + import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior; +import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams; + /** * This behavior makes room for a snackbar at the bottom of the screen. The * proper solution is to use layout_dodgeInsetEdges="bottom", but when used on diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index 12ec83336..3645ec72d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -1,19 +1,12 @@ package org.briarproject.briar.android.view; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.Observer; import android.content.ClipData; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import androidx.customview.view.AbsSavedState; -import androidx.appcompat.app.AlertDialog.Builder; import android.widget.Toast; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -27,20 +20,27 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.customview.view.AbsSavedState; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.Observer; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.PromptStateChangeListener; -import static androidx.lifecycle.Lifecycle.State.DESTROYED; import static android.content.Intent.ACTION_GET_CONTENT; import static android.content.Intent.ACTION_OPEN_DOCUMENT; import static android.content.Intent.CATEGORY_OPENABLE; import static android.content.Intent.EXTRA_ALLOW_MULTIPLE; import static android.content.Intent.EXTRA_MIME_TYPES; import static android.os.Build.VERSION.SDK_INT; -import static androidx.core.content.ContextCompat.getColor; -import static androidx.customview.view.AbsSavedState.EMPTY_STATE; import static android.view.View.GONE; import static android.widget.Toast.LENGTH_LONG; +import static androidx.core.content.ContextCompat.getColor; +import static androidx.customview.view.AbsSavedState.EMPTY_STATE; +import static androidx.lifecycle.Lifecycle.State.DESTROYED; import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute; import static org.briarproject.briar.api.messaging.MessagingConstants.IMAGE_MIME_TYPES; import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACHMENTS_PER_MESSAGE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java index 93b4e6d75..3c4b9d1d9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java @@ -3,8 +3,6 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import androidx.annotation.UiThread; -import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.FrameLayout; @@ -16,6 +14,8 @@ import java.util.Locale; import javax.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.appcompat.widget.AppCompatTextView; import de.hdodenhof.circleimageview.CircleImageView; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 58fa7a622..18c7521ba 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -5,10 +5,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Parcelable; -import androidx.annotation.LayoutRes; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.UiThread; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; @@ -18,6 +14,11 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.EmojiTextInputView.OnKeyboardShownListener; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; + import static android.content.Context.LAYOUT_INFLATER_SERVICE; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index 6361ca986..ae2ac2313 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -1,11 +1,10 @@ package org.briarproject.briar.android.view; import android.os.Parcelable; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import com.google.android.material.snackbar.Snackbar; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener; @@ -13,6 +12,9 @@ import org.briarproject.briar.api.messaging.AttachmentHeader; import java.util.List; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; + import static com.google.android.material.snackbar.Snackbar.LENGTH_SHORT; import static java.util.Collections.emptyList; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java index da9cabee5..fb045db00 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java @@ -1,14 +1,15 @@ package org.briarproject.briar.android.view; import android.content.Context; -import androidx.annotation.UiThread; -import androidx.core.content.ContextCompat; -import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import org.briarproject.bramble.api.identity.AuthorInfo.Status; import org.briarproject.briar.R; +import androidx.annotation.UiThread; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.core.content.ContextCompat; + @UiThread public class TrustIndicatorView extends AppCompatImageView { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java index fd9494d73..24a1df1c4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java @@ -2,13 +2,13 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.UiThread; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.FrameLayout; import android.widget.TextView; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; @@ -16,6 +16,8 @@ import java.util.Locale; import javax.annotation.Nullable; +import androidx.annotation.UiThread; + @UiThread @NotNullByDefault public class UnreadMessageButton extends FrameLayout { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java index 622396e3d..d7ff0cef5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java @@ -1,14 +1,14 @@ package org.briarproject.briar.android.viewmodel; -import androidx.lifecycle.LifecycleOwner; -import androidx.lifecycle.LiveData; -import androidx.lifecycle.Observer; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; +import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.Observer; + @NotNullByDefault public class LiveEvent extends LiveData> { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java index a3bfc3bb5..2d2d09da6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveResult.java @@ -1,9 +1,9 @@ package org.briarproject.briar.android.viewmodel; -import androidx.annotation.Nullable; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import androidx.annotation.Nullable; + @NotNullByDefault public class LiveResult { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java index 72aae5c89..19ee29469 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java @@ -15,9 +15,6 @@ */ package org.briarproject.briar.android.viewmodel; -import androidx.lifecycle.ViewModel; -import androidx.lifecycle.ViewModelProvider; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.util.Map; @@ -27,6 +24,9 @@ import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; + @Singleton @NotNullByDefault class ViewModelFactory implements ViewModelProvider.Factory { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelKey.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelKey.java index 3c81d72cb..bf1a27382 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelKey.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelKey.java @@ -1,13 +1,12 @@ package org.briarproject.briar.android.viewmodel; -import androidx.lifecycle.ViewModel; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import androidx.lifecycle.ViewModel; import dagger.MapKey; @Documented diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java index dbd3cba33..4e4c9bb4c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java @@ -1,8 +1,5 @@ package org.briarproject.briar.android.viewmodel; -import androidx.lifecycle.ViewModel; -import androidx.lifecycle.ViewModelProvider; - import org.briarproject.briar.android.contact.add.remote.AddContactViewModel; import org.briarproject.briar.android.contact.add.remote.PendingContactListViewModel; import org.briarproject.briar.android.conversation.ConversationViewModel; @@ -11,6 +8,8 @@ import org.briarproject.briar.android.login.StartupViewModel; import javax.inject.Singleton; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import dagger.Binds; import dagger.Module; import dagger.multibindings.IntoMap; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java index 7de2bcad8..b07cc07fe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java @@ -5,8 +5,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,6 +17,9 @@ import org.briarproject.briar.R; import java.util.List; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + import static android.content.Intent.ACTION_VIEW; import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY; import static java.util.Objects.requireNonNull; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java index 135211776..9215b75dc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/TapSafeFrameLayout.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.widget; import android.content.Context; -import androidx.annotation.AttrRes; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; @@ -11,6 +10,8 @@ import org.briarproject.briar.android.util.UiUtils; import javax.annotation.Nullable; +import androidx.annotation.AttrRes; + import static android.view.MotionEvent.FLAG_WINDOW_IS_OBSCURED; @NotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java b/briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java index 676637613..d8e4b4148 100644 --- a/briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java @@ -1,8 +1,9 @@ package org.briarproject.briar.api.android; import android.app.Activity; -import androidx.lifecycle.LiveData; + import androidx.annotation.UiThread; +import androidx.lifecycle.LiveData; public interface LockManager { diff --git a/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java b/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java index 11c2ded58..b9abd669c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/api/android/ScreenFilterMonitor.java @@ -1,11 +1,11 @@ package org.briarproject.briar.api.android; -import androidx.annotation.UiThread; - import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.util.Collection; +import androidx.annotation.UiThread; + @NotNullByDefault public interface ScreenFilterMonitor { diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java index 711e1140d..27945abd6 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java @@ -1,9 +1,10 @@ package org.briarproject.briar.android.login; -import com.google.android.material.textfield.TextInputLayout; import android.widget.Button; import android.widget.EditText; +import com.google.android.material.textfield.TextInputLayout; + import org.briarproject.briar.R; import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.controller.handler.ResultHandler; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java b/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java index 4d43715f5..c04f210f3 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java @@ -1,8 +1,8 @@ package org.briarproject.briar.api.sharing; +import org.briarproject.bramble.api.Nameable; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.bramble.api.Nameable; @NotNullByDefault public interface Shareable extends Nameable { diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java index 192a9a550..22acc4231 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java @@ -13,12 +13,12 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.briar.api.client.MessageTracker; +import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumInvitationResponse; import org.briarproject.briar.api.forum.ForumManager; import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent; import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; -import org.briarproject.briar.api.conversation.ConversationRequest; import javax.annotation.concurrent.Immutable; import javax.inject.Inject;