Browse Source

Migrate from Android Support Library to AndroidX

Unignored gradle.properties since androidX requires additions there
See also https://developer.android.com/jetpack/androidx/migrate
remotes/github/develop
Ferdinand Pöll 9 months ago
parent
commit
453ca7c0ed
  1. 1
      .gitignore
  2. 24
      build.gradle
  3. 2
      gradle.properties
  4. 2
      src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java
  5. 2
      src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java
  6. 4
      src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java
  7. 4
      src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java
  8. 10
      src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java
  9. 4
      src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java
  10. 6
      src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java
  11. 6
      src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java
  12. 10
      src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java
  13. 6
      src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java
  14. 8
      src/conversations/res/layout/activity_import_backup.xml
  15. 4
      src/conversations/res/layout/dialog_enter_password.xml
  16. 11
      src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java
  17. 2
      src/main/AndroidManifest.xml
  18. 2
      src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
  19. 4
      src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
  20. 4
      src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
  21. 4
      src/main/java/eu/siacs/conversations/entities/Bookmark.java
  22. 2
      src/main/java/eu/siacs/conversations/entities/Contact.java
  23. 4
      src/main/java/eu/siacs/conversations/entities/Conversation.java
  24. 4
      src/main/java/eu/siacs/conversations/entities/MucOptions.java
  25. 2
      src/main/java/eu/siacs/conversations/entities/Presence.java
  26. 2
      src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java
  27. 2
      src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
  28. 2
      src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
  29. 2
      src/main/java/eu/siacs/conversations/parser/IqParser.java
  30. 4
      src/main/java/eu/siacs/conversations/persistance/FileBackend.java
  31. 2
      src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java
  32. 2
      src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java
  33. 2
      src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java
  34. 2
      src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
  35. 6
      src/main/java/eu/siacs/conversations/services/AvatarService.java
  36. 2
      src/main/java/eu/siacs/conversations/services/BarcodeProvider.java
  37. 2
      src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java
  38. 2
      src/main/java/eu/siacs/conversations/services/EventReceiver.java
  39. 2
      src/main/java/eu/siacs/conversations/services/ExportBackupService.java
  40. 2
      src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java
  41. 18
      src/main/java/eu/siacs/conversations/services/NotificationService.java
  42. 2
      src/main/java/eu/siacs/conversations/services/ShortcutService.java
  43. 8
      src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
  44. 2
      src/main/java/eu/siacs/conversations/ui/AboutActivity.java
  45. 4
      src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java
  46. 4
      src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java
  47. 7
      src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
  48. 4
      src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
  49. 2
      src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
  50. 4
      src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
  51. 10
      src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
  52. 6
      src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
  53. 8
      src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
  54. 4
      src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
  55. 15
      src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
  56. 13
      src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
  57. 14
      src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
  58. 8
      src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java
  59. 8
      src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java
  60. 14
      src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
  61. 8
      src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
  62. 10
      src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java
  63. 4
      src/main/java/eu/siacs/conversations/ui/LocationActivity.java
  64. 4
      src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java
  65. 4
      src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java
  66. 4
      src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java
  67. 12
      src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
  68. 6
      src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
  69. 2
      src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
  70. 3
      src/main/java/eu/siacs/conversations/ui/RecordingActivity.java
  71. 8
      src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
  72. 4
      src/main/java/eu/siacs/conversations/ui/ScanActivity.java
  73. 4
      src/main/java/eu/siacs/conversations/ui/SearchActivity.java
  74. 6
      src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
  75. 8
      src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
  76. 4
      src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
  77. 2
      src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java
  78. 6
      src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
  79. 26
      src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
  80. 6
      src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
  81. 4
      src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
  82. 14
      src/main/java/eu/siacs/conversations/ui/XmppActivity.java
  83. 14
      src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
  84. 10
      src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java
  85. 6
      src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
  86. 2
      src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
  87. 2
      src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
  88. 10
      src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
  89. 6
      src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java
  90. 8
      src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
  91. 2
      src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java
  92. 10
      src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java
  93. 8
      src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java
  94. 2
      src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java
  95. 4
      src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java
  96. 2
      src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java
  97. 2
      src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java
  98. 2
      src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
  99. 2
      src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java
  100. 6
      src/main/java/eu/siacs/conversations/ui/util/GridManager.java

1
.gitignore

@ -9,7 +9,6 @@ src/quicksyPlaystore/res/values/push.xml
# https://github.com/github/gitignore/blob/master/Gradle.gitignore
.gradle/
build/
gradle.properties
captures/
signing.properties
# Ignore Gradle GUI config

24
build.gradle

@ -30,11 +30,9 @@ configurations {
quicksyImplementation
}
ext {
supportLibVersion = '28.0.0'
}
dependencies {
implementation 'androidx.viewpager:viewpager:1.0.0'
//should remain that low because later versions introduce dependency to androidx (not sure exactly from what version)
playstoreImplementation('com.google.firebase:firebase-messaging:17.3.4') {
exclude group: 'com.google.firebase', module: 'firebase-core'
@ -48,15 +46,15 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'exifinterface'
}
implementation "com.android.support:support-v13:$supportLibVersion"
implementation "com.android.support:appcompat-v7:$supportLibVersion"
implementation "com.android.support:exifinterface:$supportLibVersion"
implementation "com.android.support:cardview-v7:$supportLibVersion"
implementation "com.android.support:support-emoji:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion"
compatImplementation "com.android.support:support-emoji-appcompat:$supportLibVersion"
conversationsFreeCompatImplementation "com.android.support:support-emoji-bundled:$supportLibVersion"
quicksyFreeCompatImplementation "com.android.support:support-emoji-bundled:$supportLibVersion"
//implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.emoji:emoji:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
compatImplementation 'androidx.emoji:emoji-appcompat:1.0.0'
conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.0.0'
quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.0.0'
implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
//zxing stopped supporting Java 7 so we have to stick with 3.3.3
//https://github.com/zxing/zxing/issues/1170

2
gradle.properties

@ -0,0 +1,2 @@
android.useAndroidX=true
android.enableJetifier=true

2
src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java

@ -1,7 +1,7 @@
package eu.siacs.conversations.ui.widget;
import android.content.Context;
import android.support.text.emoji.widget.EmojiAppCompatEditText;
import androidx.emoji.widget.EmojiAppCompatEditText;
import android.util.AttributeSet;
public class EmojiWrapperEditText extends EmojiAppCompatEditText {

2
src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java

@ -29,7 +29,7 @@
package eu.siacs.conversations.utils;
import android.support.text.emoji.EmojiCompat;
import androidx.emoji.text.EmojiCompat;
public class EmojiWrapper {

4
src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java

@ -12,8 +12,8 @@ import android.net.Uri;
import android.os.Binder;
import android.os.IBinder;
import android.provider.OpenableColumns;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import android.util.Log;
import com.google.common.base.Charsets;

4
src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java

@ -2,11 +2,11 @@ package eu.siacs.conversations.ui;
import android.app.Activity;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Bitmap;
import android.graphics.Point;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;

10
src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java

@ -5,15 +5,15 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import com.google.android.material.snackbar.Snackbar;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;

4
src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java

@ -2,9 +2,9 @@ package eu.siacs.conversations.ui;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;

6
src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java

@ -5,9 +5,9 @@ import android.content.Intent;
import android.os.Bundle;
import android.security.KeyChain;
import android.security.KeyChainAliasCallback;
import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import android.util.Pair;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;

6
src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java

@ -2,10 +2,10 @@ package eu.siacs.conversations.ui;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import java.util.List;

10
src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java

@ -4,15 +4,15 @@ import android.Manifest;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Bundle;
import android.security.KeyChain;
import android.security.KeyChainAliasCallback;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;

6
src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java

@ -1,13 +1,13 @@
package eu.siacs.conversations.ui.adapter;
import android.content.res.Resources;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.text.format.DateUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;

8
src/conversations/res/layout/activity_import_backup.xml

@ -26,20 +26,20 @@
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/color_background_primary">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/color_background_primary"
android:orientation="vertical"
app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
</android.support.design.widget.CoordinatorLayout>
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>
</layout>

4
src/conversations/res/layout/dialog_enter_password.xml

@ -22,7 +22,7 @@
android:text="@string/restore_warning"
android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/account_password_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -42,6 +42,6 @@
android:textColor="?attr/edit_text_color"
style="@style/Widget.Conversations.EditText"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</layout>

11
src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java

@ -2,14 +2,9 @@ package eu.siacs.conversations.ui.service;
import android.content.Context;
import android.os.Build;
import android.support.text.emoji.EmojiCompat;
import android.support.text.emoji.FontRequestEmojiCompatConfig;
import android.support.text.emoji.bundled.BundledEmojiCompatConfig;
import android.support.v4.provider.FontRequest;
import android.util.Log;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import androidx.emoji.text.EmojiCompat;
import androidx.emoji.text.FontRequestEmojiCompatConfig;
import androidx.emoji.bundled.BundledEmojiCompatConfig;
public class EmojiService {

2
src/main/AndroidManifest.xml

@ -266,7 +266,7 @@
</service>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.files"
android:exported="false"
android:grantUriPermissions="true">

2
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java

@ -2,7 +2,7 @@ package eu.siacs.conversations.crypto;
import android.app.PendingIntent;
import android.content.Intent;
import android.support.annotation.StringRes;
import androidx.annotation.StringRes;
import android.util.Log;
import org.openintents.openpgp.OpenPgpError;

4
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java

@ -2,8 +2,8 @@ package eu.siacs.conversations.crypto.axolotl;
import android.os.Bundle;
import android.security.KeyChain;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import android.util.Pair;

4
src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java

@ -1,7 +1,7 @@
package eu.siacs.conversations.crypto.axolotl;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import org.whispersystems.libsignal.SignalProtocolAddress;

4
src/main/java/eu/siacs/conversations/entities/Bookmark.java

@ -1,8 +1,8 @@
package eu.siacs.conversations.entities;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;

2
src/main/java/eu/siacs/conversations/entities/Contact.java

@ -4,7 +4,7 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import org.json.JSONArray;

4
src/main/java/eu/siacs/conversations/entities/Conversation.java

@ -2,8 +2,8 @@ package eu.siacs.conversations.entities;
import android.content.ContentValues;
import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.common.collect.ComparisonChain;

4
src/main/java/eu/siacs/conversations/entities/MucOptions.java

@ -1,7 +1,7 @@
package eu.siacs.conversations.entities;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import java.util.ArrayList;

2
src/main/java/eu/siacs/conversations/entities/Presence.java

@ -1,6 +1,6 @@
package eu.siacs.conversations.entities;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.lang.Comparable;
import java.util.Locale;

2
src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java

@ -1,6 +1,6 @@
package eu.siacs.conversations.entities;
import android.support.annotation.DrawableRes;
import androidx.annotation.DrawableRes;
import com.google.common.base.Strings;

2
src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java

@ -2,7 +2,7 @@ package eu.siacs.conversations.entities;
import android.content.ContentValues;
import android.database.Cursor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Base64;
import android.util.Log;

2
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java

@ -1,7 +1,7 @@
package eu.siacs.conversations.http;
import android.os.PowerManager;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import com.google.common.base.Strings;

2
src/main/java/eu/siacs/conversations/parser/IqParser.java

@ -1,6 +1,6 @@
package eu.siacs.conversations.parser;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;

4
src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@ -20,8 +20,8 @@ import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
import android.support.annotation.RequiresApi;
import android.support.v4.content.FileProvider;
import androidx.annotation.RequiresApi;
import androidx.core.content.FileProvider;
import android.system.Os;
import android.system.StructStat;
import android.util.Base64;

2
src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java

@ -20,7 +20,7 @@ import android.media.AudioManager;
import android.media.AudioRecord;
import android.media.MediaRecorder;
import android.os.Build;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import org.webrtc.ThreadUtils;

2
src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java

@ -23,7 +23,7 @@ import android.media.AudioManager;
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import java.util.List;

2
src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java

@ -15,7 +15,7 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Build;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import org.webrtc.ThreadUtils;

2
src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java

@ -6,7 +6,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.preference.PreferenceManager;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.util.Log;
import net.ypresto.androidtranscoder.MediaTranscoder;

6
src/main/java/eu/siacs/conversations/services/AvatarService.java

@ -12,9 +12,9 @@ import android.graphics.Typeface;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import android.support.v4.content.res.ResourcesCompat;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;

2
src/main/java/eu/siacs/conversations/services/BarcodeProvider.java

@ -13,7 +13,7 @@ import android.net.Uri;
import android.os.CancellationSignal;
import android.os.IBinder;
import android.os.ParcelFileDescriptor;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import com.google.zxing.BarcodeFormat;

2
src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java

@ -1,6 +1,6 @@
package eu.siacs.conversations.services;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import com.google.common.cache.Cache;

2
src/main/java/eu/siacs/conversations/services/EventReceiver.java

@ -5,7 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.util.Log;
import com.google.common.base.Strings;

2
src/main/java/eu/siacs/conversations/services/ExportBackupService.java

@ -11,7 +11,7 @@ import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.IBinder;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import com.google.common.base.Strings;

2
src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java

@ -34,7 +34,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Base64;
import android.util.Log;
import android.util.SparseArray;

18
src/main/java/eu/siacs/conversations/services/NotificationService.java

@ -17,15 +17,15 @@ import android.net.Uri;
import android.os.Build;
import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.support.annotation.RequiresApi;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationCompat.BigPictureStyle;
import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.app.Person;
import android.support.v4.app.RemoteInput;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.IconCompat;
import androidx.annotation.RequiresApi;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationCompat.BigPictureStyle;
import androidx.core.app.NotificationCompat.Builder;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.app.Person;
import androidx.core.app.RemoteInput;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.IconCompat;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.util.DisplayMetrics;

2
src/main/java/eu/siacs/conversations/services/ShortcutService.java

@ -8,7 +8,7 @@ import android.graphics.Bitmap;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import java.util.ArrayList;

8
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@ -32,10 +32,10 @@ import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.provider.ContactsContract;
import android.security.KeyChain;
import android.support.annotation.BoolRes;
import android.support.annotation.IntegerRes;
import android.support.v4.app.RemoteInput;
import android.support.v4.content.ContextCompat;
import androidx.annotation.BoolRes;
import androidx.annotation.IntegerRes;
import androidx.core.app.RemoteInput;
import androidx.core.content.ContextCompat;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.text.TextUtils;

2
src/main/java/eu/siacs/conversations/ui/AboutActivity.java

@ -2,7 +2,7 @@ package eu.siacs.conversations.ui;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import eu.siacs.conversations.R;
import eu.siacs.conversations.utils.ThemeHelper;

4
src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java

@ -1,9 +1,9 @@
package eu.siacs.conversations.ui;
import android.content.Context;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.KeyEvent;

4
src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java

@ -1,7 +1,7 @@
package eu.siacs.conversations.ui;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import android.view.MenuItem;

7
src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java

@ -1,8 +1,8 @@
package eu.siacs.conversations.ui;
import android.databinding.DataBindingUtil;
import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog;
import androidx.databinding.DataBindingUtil;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Toast;
@ -11,7 +11,6 @@ import eu.siacs.conversations.databinding.DialogBlockContactBinding;
import eu.siacs.conversations.entities.Blockable;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.ui.util.JidDialog;
import eu.siacs.conversations.xmpp.Jid;
public final class BlockContactDialog {
public static void show(final XmppActivity xmppActivity, final Blockable blockable) {

4
src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java

@ -1,8 +1,8 @@
package eu.siacs.conversations.ui;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import android.text.Editable;
import android.widget.Toast;

2
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java

@ -2,7 +2,7 @@ package eu.siacs.conversations.ui;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
import com.google.android.material.textfield.TextInputLayout;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;

4
src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java

@ -4,11 +4,11 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.KeyEvent;

10
src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java

@ -5,11 +5,11 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.ActionBar;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.appcompat.app.ActionBar;
import android.view.ActionMode;
import android.view.KeyEvent;
import android.view.Menu;

6
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

@ -3,10 +3,10 @@ package eu.siacs.conversations.ui;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.TextWatcher;

8
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java

@ -6,7 +6,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -14,9 +14,9 @@ import android.preference.PreferenceManager;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.RelativeSizeSpan;

4
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java

@ -2,8 +2,8 @@ package eu.siacs.conversations.ui;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
public class ConversationActivity extends AppCompatActivity {

15
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@ -6,15 +6,15 @@ import android.app.Activity;
import android.app.FragmentManager;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Build;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import android.app.Fragment;
import android.app.PendingIntent;
import android.content.Context;
@ -24,15 +24,14 @@ import android.content.IntentSender.SendIntentException;
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.support.v13.view.inputmethod.InputConnectionCompat;
import android.support.v13.view.inputmethod.InputContentInfoCompat;
import androidx.core.view.inputmethod.InputConnectionCompat;
import androidx.core.view.inputmethod.InputContentInfoCompat;
import android.text.Editable;
import android.text.TextUtils;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;

13
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java

@ -39,15 +39,15 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
@ -76,7 +76,6 @@ import eu.siacs.conversations.ui.util.ActivityResult;
import eu.siacs.conversations.ui.util.ConversationMenuConfigurator;
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
import eu.siacs.conversations.ui.util.PendingItem;
import eu.siacs.conversations.utils.AccountUtils;
import eu.siacs.conversations.utils.EmojiWrapper;
import eu.siacs.conversations.utils.ExceptionHelper;
import eu.siacs.conversations.utils.SignupUtils;

14
src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java

@ -33,14 +33,14 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.Fragment;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
import com.google.android.material.snackbar.Snackbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@ -74,8 +74,8 @@ import eu.siacs.conversations.utils.AccountUtils;
import eu.siacs.conversations.utils.EasyOnboardingInvite;
import eu.siacs.conversations.utils.ThemeHelper;
import static android.support.v7.widget.helper.ItemTouchHelper.LEFT;
import static android.support.v7.widget.helper.ItemTouchHelper.RIGHT;
import static androidx.recyclerview.widget.ItemTouchHelper.LEFT;
import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT;
public class ConversationsOverviewFragment extends XmppFragment {

8
src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java

@ -2,11 +2,11 @@ package eu.siacs.conversations.ui;
import android.app.Dialog;
import android.content.Context;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.widget.Spinner;
import java.util.ArrayList;

8
src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java

@ -4,11 +4,11 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;

14
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java

@ -6,7 +6,7 @@ import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.IntentSender;
import android.content.SharedPreferences;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
@ -16,11 +16,11 @@ import android.preference.PreferenceManager;
import android.provider.Settings;
import android.security.KeyChain;
import android.security.KeyChainAliasCallback;
import android.support.design.widget.TextInputLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AlertDialog.Builder;
import android.support.v7.widget.Toolbar;
import com.google.android.material.textfield.TextInputLayout;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@ -42,7 +42,6 @@ import java.net.URL;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import eu.siacs.conversations.Config;
@ -65,7 +64,6 @@ import eu.siacs.conversations.ui.util.AvatarWorkerTask;
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
import eu.siacs.conversations.ui.util.PendingItem;
import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
import eu.siacs.conversations.utils.CharSequenceUtils;
import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.utils.Resolver;
import eu.siacs.conversations.utils.SignupUtils;

8
src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java

@ -2,11 +2,11 @@ package eu.siacs.conversations.ui;
import android.app.Activity;
import android.app.Dialog;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;

10
src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java

@ -2,14 +2,14 @@ package eu.siacs.conversations.ui;
import android.app.Activity;
import android.app.Dialog;
import android.databinding.DataBindingUtil;
import android.support.annotation.NonNull;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.DialogFragment;
import androidx.databinding.DataBindingUtil;
import androidx.annotation.NonNull;
import com.google.android.material.textfield.TextInputLayout;
import androidx.fragment.app.DialogFragment;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.view.KeyEvent;
import android.widget.AutoCompleteTextView;
import android.widget.Spinner;

4
src/main/java/eu/siacs/conversations/ui/LocationActivity.java

@ -14,8 +14,8 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.BoolRes;
import android.support.annotation.NonNull;
import androidx.annotation.BoolRes;
import androidx.annotation.NonNull;
import android.util.Log;
import android.view.MenuItem;

4
src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java

@ -2,9 +2,9 @@ package eu.siacs.conversations.ui;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import java.util.List;

4
src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java

@ -31,8 +31,8 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import java.util.logging.Level;
import java.util.logging.Logger;

4
src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java

@ -2,9 +2,9 @@ package eu.siacs.conversations.ui;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;

12
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java

@ -1,23 +1,17 @@
package eu.siacs.conversations.ui;
import android.databinding.DataBindingUtil;
import android.net.Uri;
import android.support.v7.app.AlertDialog;
import androidx.databinding.DataBindingUtil;
import androidx.appcompat.app.AlertDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.view.ContextMenu;
import android.view.MenuItem;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;

6
src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java

@ -30,12 +30,12 @@
package eu.siacs.conversations.ui;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.v7.widget.Toolbar;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.View;
import android.widget.Toast;

2
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java

@ -6,7 +6,7 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.StringRes;
import androidx.annotation.StringRes;
import android.util.Log;
import android.view.View;
import android.view.View.OnLongClickListener;

3
src/main/java/eu/siacs/conversations/ui/RecordingActivity.java

@ -1,10 +1,9 @@
package eu.siacs.conversations.ui;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.media.MediaRecorder;
import android.net.Uri;
import android.os.Bundle;

8
src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java

@ -7,15 +7,15 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.annotation.StringRes;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.StringRes;
import android.util.Log;
import android.util.Rational;
import android.view.Menu;

4
src/main/java/eu/siacs/conversations/ui/ScanActivity.java

@ -45,8 +45,8 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.Process;
import android.os.Vibrator;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Surface;

4
src/main/java/eu/siacs/conversations/ui/SearchActivity.java

@ -30,9 +30,9 @@
package eu.siacs.conversations.ui;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;

6
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

@ -1,9 +1,9 @@
package eu.siacs.conversations.ui;
import android.preference.CheckBoxPreference;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.content.Intent;

8
src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java

@ -3,14 +3,14 @@ package eu.siacs.conversations.ui;
import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.location.Location;
import android.location.LocationListener;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import com.google.android.material.snackbar.Snackbar;
import androidx.appcompat.widget.Toolbar;
import android.view.View;
import org.osmdroid.api.IGeoPoint;

4
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java

@ -4,8 +4,8 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;

2
src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java

@ -4,7 +4,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import androidx.appcompat.app.ActionBar;
import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;

6
src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java

@ -5,13 +5,13 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.location.Location;
import android.location.LocationListener;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;

26
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@ -9,22 +9,22 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;