Detailed changes
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.2'
- classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
+ classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
}
}
@@ -42,7 +42,7 @@ spotless {
dependencies {
- coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+ coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
implementation project(':libs:annotation')
annotationProcessor project(':libs:annotation-processor')
@@ -50,30 +50,30 @@ dependencies {
implementation 'androidx.viewpager:viewpager:1.1.0'
- playstoreImplementation('com.google.firebase:firebase-messaging:24.1.0') {
+ playstoreImplementation('com.google.firebase:firebase-messaging:24.1.1') {
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
}
conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2")
- quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
+ quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.2.0'
implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
implementation("com.github.CanHub:Android-Image-Cropper:2.0.0")
implementation "androidx.sharetarget:sharetarget:1.2.0"
implementation 'androidx.appcompat:appcompat:1.7.0'
- implementation 'androidx.exifinterface:exifinterface:1.3.7'
+ implementation 'androidx.exifinterface:exifinterface:1.4.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.preference:preference:1.2.1"
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
- implementation 'com.google.android.material:material:1.13.0-alpha10'
+ implementation 'com.google.android.material:material:1.13.0-alpha12'
implementation 'androidx.work:work-runtime:2.9.1'
implementation "androidx.emoji2:emoji2:1.5.0"
freeImplementation "androidx.emoji2:emoji2-bundled:1.5.0"
implementation "androidx.emoji2:emoji2-emojipicker:1.5.0"
- implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1'
+ implementation 'org.bouncycastle:bcmail-jdk18on:1.80'
implementation 'com.google.zxing:core:3.5.3'
implementation 'org.minidns:minidns-client:1.0.4'
implementation 'org.minidns:minidns-dnssec:1.0.4'
@@ -7,6 +7,7 @@ import android.view.View;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.Toast;
+import androidx.annotation.NonNull;
import androidx.databinding.DataBindingUtil;
import com.google.android.material.color.MaterialColors;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -242,7 +243,9 @@ public abstract class OmemoActivity extends XmppActivity {
@Override
public void onRequestPermissionsResult(
- int requestCode, String[] permissions, int[] grantResults) {
+ final int requestCode,
+ @NonNull final String[] permissions,
+ @NonNull final int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
ScanActivity.onRequestPermissionResult(this, requestCode, grantResults);
}
@@ -58,7 +58,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
viewHolder.binding.accountStatus.setTextColor(
MaterialColors.getColor(
viewHolder.binding.accountStatus,
- com.google.android.material.R.attr.colorPrimary));
+ androidx.appcompat.R.attr.colorPrimary));
break;
case DISABLED:
case LOGGED_OUT:
@@ -72,7 +72,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
viewHolder.binding.accountStatus.setTextColor(
MaterialColors.getColor(
viewHolder.binding.accountStatus,
- com.google.android.material.R.attr.colorError));
+ androidx.appcompat.R.attr.colorError));
break;
}
final boolean isDisabled = (account.getStatus() == Account.State.DISABLED);
@@ -6,16 +6,13 @@ import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.core.widget.ImageViewCompat;
import androidx.databinding.DataBindingUtil;
import androidx.recyclerview.widget.RecyclerView;
-
import com.google.android.material.color.MaterialColors;
import com.google.common.base.Optional;
-
import eu.siacs.conversations.R;
import eu.siacs.conversations.databinding.ItemConversationBinding;
import eu.siacs.conversations.entities.Conversation;
@@ -29,7 +26,6 @@ import eu.siacs.conversations.utils.IrregularUnicodeDetector;
import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.xmpp.Jid;
import eu.siacs.conversations.xmpp.jingle.OngoingRtpSession;
-
import java.util.List;
public class ConversationAdapter
@@ -103,14 +99,14 @@ public class ConversationAdapter
ColorStateList.valueOf(
MaterialColors.getColor(
viewHolder.binding.messageStatus,
- com.google.android.material.R.attr.colorPrimary)));
+ androidx.appcompat.R.attr.colorPrimary)));
} else {
ImageViewCompat.setImageTintList(
viewHolder.binding.messageStatus,
ColorStateList.valueOf(
MaterialColors.getColor(
viewHolder.binding.messageStatus,
- com.google.android.material.R.attr.colorControlNormal)));
+ androidx.appcompat.R.attr.colorControlNormal)));
}
viewHolder.binding.messageStatus.setVisibility(View.VISIBLE);
}
@@ -236,8 +236,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
.time()
.setTextColor(
MaterialColors.getColor(
- viewHolder.time(),
- com.google.android.material.R.attr.colorError));
+ viewHolder.time(), androidx.appcompat.R.attr.colorError));
} else {
setTextColor(viewHolder.time(), bubbleColor);
}
@@ -1397,8 +1396,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
ImageViewCompat.setImageTintList(
imageView,
ColorStateList.valueOf(
- MaterialColors.getColor(
- imageView, com.google.android.material.R.attr.colorError)));
+ MaterialColors.getColor(imageView, androidx.appcompat.R.attr.colorError)));
}
public static void setTextColor(final TextView textView, final BubbleColor bubbleColor) {
@@ -1406,8 +1404,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
textView.setTextColor(color);
if (BubbleColor.SURFACES.contains(bubbleColor)) {
textView.setLinkTextColor(
- MaterialColors.getColor(
- textView, com.google.android.material.R.attr.colorPrimary));
+ MaterialColors.getColor(textView, androidx.appcompat.R.attr.colorPrimary));
} else {
textView.setLinkTextColor(color);
}
@@ -77,14 +77,12 @@ public class IrregularUnicodeDetector {
return style(
jid,
MaterialColors.getColor(
- context,
- com.google.android.material.R.attr.colorError,
- "colorError not found"));
+ context, androidx.appcompat.R.attr.colorError, "colorError not found"));
}
- private static Spannable style(Jid jid, @ColorInt int color) {
- PatternTuple patternTuple = find(jid);
- SpannableStringBuilder builder = new SpannableStringBuilder();
+ private static Spannable style(final Jid jid, final @ColorInt int color) {
+ final var patternTuple = find(jid);
+ final var builder = new SpannableStringBuilder();
if (jid.getLocal() != null && patternTuple.local != null) {
SpannableString local = new SpannableString(jid.getLocal());
colorize(local, patternTuple.local, color);
@@ -92,7 +90,7 @@ public class IrregularUnicodeDetector {
builder.append('@');
}
if (jid.getDomain() != null) {
- String[] labels = jid.getDomain().toString().split("\\.");
+ final var labels = jid.getDomain().toString().split("\\.");
for (int i = 0; i < labels.length; ++i) {
SpannableString spannableString = new SpannableString(labels[i]);
colorize(spannableString, patternTuple.domain.get(i), color);