thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

update libraries (Christian Schneppe)

Browse source
This commit is contained in:
Christian Schneppe 2022-09-27 17:47:31 +02:00 committed by Arne
parent 7aea46ca7f
commit fd8a406e5b
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build.gradle
View file

@ -60,10 +60,10 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.exifinterface:exifinterface:1.3.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "androidx.emoji2:emoji2:1.2.0"
implementation 'androidx.emoji2:emoji2:1.2.0'
gitImplementation "androidx.emoji2:emoji2-bundled:1.2.0"
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.google.android.material:material:1.6.1'
@ -74,20 +74,20 @@ dependencies {
implementation 'com.google.android.exoplayer:extension-mediasession:2.18.1'
implementation 'pub.devrel:easypermissions:3.0.0' // version >= 3.0.0 needs android X libraries
implementation 'com.wefika:flowlayout:0.4.1'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
implementation 'org.jxmpp:jxmpp-jid:1.0.3'
implementation 'org.hsluv:hsluv:0.2'
implementation 'org.conscrypt:conscrypt-android:2.5.2'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
implementation 'me.drakeet.support:toastcompat:1.1.0'
implementation 'org.osmdroid:osmdroid-android:6.1.11'
implementation 'com.leinardi.android:speed-dial:3.2.0'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'org.osmdroid:osmdroid-android:6.1.14'
implementation 'com.leinardi.android:speed-dial:3.3.0'
implementation 'com.squareup.picasso:picasso:2.8'
implementation "com.squareup.okhttp3:okhttp:4.10.0"
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.google.guava:guava:31.1-android'
implementation 'com.github.AppIntro:AppIntro:6.1.0'
implementation 'com.github.AppIntro:AppIntro:6.2.0'
implementation 'androidx.browser:browser:1.4.0'
implementation 'com.otaliastudios:transcoder:0.9.1' // 0.10.4 seems to be buggy
implementation project(':libs:AXML')

6
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -670,8 +670,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
public boolean mergeable(final Message message) {
try {
boolean mergeAllowed = conversation.getAccount().getXmppConnection().getXmppConnectionService().allowMergeMessages();
return mergeAllowed && message != null &&
boolean mergeAllowed = this.conversation.getAccount().getXmppConnection().getXmppConnectionService().allowMergeMessages();
return mergeAllowed && (message != null &&
(message.getType() == Message.TYPE_TEXT &&
this.getTransferable() == null &&
message.getTransferable() == null &&
@ -707,7 +707,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
UIHelper.sameDay(message.getTimeSent(), this.getTimeSent()) &&
this.getReadByMarkers().equals(message.getReadByMarkers()) &&
!this.conversation.getJid().asBareJid().equals(Config.BUG_REPORTS)
);
));
} catch (Exception e) {
e.printStackTrace();
}

36
src/main/java/eu/siacs/conversations/ui/IntroActivity.java
View file

@ -1,5 +1,7 @@
package eu.siacs.conversations.ui;
import static eu.siacs.conversations.ui.util.IntroHelper.SaveIntroShown;
import android.content.Intent;
import android.os.Bundle;
@ -12,8 +14,6 @@ import com.github.appintro.model.SliderPage;
import eu.siacs.conversations.R;
import static eu.siacs.conversations.ui.util.IntroHelper.SaveIntroShown;
public class IntroActivity extends AppIntro2 {
public static final String ACTIVITY = "activity";
public static final String MULTICHAT = "multi_chat";
@ -57,14 +57,14 @@ public class IntroActivity extends AppIntro2 {
welcome.setDescription(getString(R.string.intro_desc_main));
welcome.setImageDrawable(R.drawable.logo_800);
welcome.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(welcome));
addSlide(AppIntroFragment.createInstance(welcome));
SliderPage privacy = new SliderPage();
privacy.setTitle(getString(R.string.intro_privacy));
privacy.setDescription(getString(R.string.intro_desc_privacy));
privacy.setImageDrawable(R.drawable.intro_security_icon);
privacy.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(privacy));
addSlide(AppIntroFragment.createInstance(privacy));
SliderPage xmpp = new SliderPage();
@ -72,28 +72,28 @@ public class IntroActivity extends AppIntro2 {
xmpp.setDescription(getString(R.string.intro_desc_whats_xmpp));
xmpp.setImageDrawable(R.drawable.intro_xmpp_icon);
xmpp.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(xmpp));
addSlide(AppIntroFragment.createInstance(xmpp));
SliderPage permissions = new SliderPage();
permissions.setTitle(getString(R.string.intro_required_permissions));
permissions.setDescription(getString(R.string.intro_desc_required_permissions));
permissions.setImageDrawable(R.drawable.intro_memory_icon);
permissions.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(permissions));
addSlide(AppIntroFragment.createInstance(permissions));
SliderPage permissions2 = new SliderPage();
permissions2.setTitle(getString(R.string.intro_optional_permissions));
permissions2.setDescription(getString(R.string.intro_desc_optional_permissions));
permissions2.setImageDrawable(R.drawable.intro_contacts_icon);
permissions2.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(permissions2));
addSlide(AppIntroFragment.createInstance(permissions2));
SliderPage permissions3 = new SliderPage();
permissions3.setTitle(getString(R.string.intro_optional_permissions));
permissions3.setDescription(getString(R.string.intro_desc_optional_permissions2));
permissions3.setImageDrawable(R.drawable.intro_location_icon);
permissions3.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(permissions3));
addSlide(AppIntroFragment.createInstance(permissions3));
break;
case WELCOME_ACTIVITY:
SliderPage account = new SliderPage();
@ -101,21 +101,21 @@ public class IntroActivity extends AppIntro2 {
account.setDescription(getString(R.string.intro_desc_account));
account.setImageDrawable(R.drawable.intro_account_icon);
account.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(account));
addSlide(AppIntroFragment.createInstance(account));
SliderPage account2 = new SliderPage();
account2.setTitle(getString(R.string.intro_account));
account2.setDescription(getString(R.string.intro_desc_account2));
account2.setImageDrawable(R.drawable.intro_account_icon);
account2.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(account2));
addSlide(AppIntroFragment.createInstance(account2));
SliderPage account3 = new SliderPage();
account3.setTitle(getString(R.string.intro_account));
account3.setDescription(getString(R.string.intro_desc_account3));
account3.setImageDrawable(R.drawable.intro_account_icon);
account3.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(account3));
addSlide(AppIntroFragment.createInstance(account3));
break;
case START_CONVERSATION_ACTIVITY:
SliderPage startChatting = new SliderPage();
@ -123,21 +123,21 @@ public class IntroActivity extends AppIntro2 {
startChatting.setDescription(getString(R.string.intro_desc_start_chatting));
startChatting.setImageDrawable(R.drawable.intro_start_chat_icon);
startChatting.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(startChatting));
addSlide(AppIntroFragment.createInstance(startChatting));
SliderPage startChatting2 = new SliderPage();
startChatting2.setTitle(getString(R.string.intro_start_chatting));
startChatting2.setDescription(getString(R.string.intro_desc_start_chatting2));
startChatting2.setImageDrawable(R.drawable.intro_start_chat_icon);
startChatting2.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(startChatting2));
addSlide(AppIntroFragment.createInstance(startChatting2));
SliderPage startChatting3 = new SliderPage();
startChatting3.setTitle(getString(R.string.intro_start_chatting));
startChatting3.setDescription(getString(R.string.intro_desc_start_chatting3));
startChatting3.setImageDrawable(R.drawable.intro_start_chat_icon);
startChatting3.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(startChatting3));
addSlide(AppIntroFragment.createInstance(startChatting3));
break;
case CONVERSATIONS_ACTIVITY:
SliderPage openChat = new SliderPage();
@ -145,14 +145,14 @@ public class IntroActivity extends AppIntro2 {
openChat.setDescription(getString(R.string.intro_desc_open_chat));
openChat.setImageDrawable(R.drawable.intro_start_chat_icon);
openChat.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(openChat));
addSlide(AppIntroFragment.createInstance(openChat));
SliderPage chatDetails = new SliderPage();
chatDetails.setTitle(getString(R.string.intro_chat_details));
chatDetails.setDescription(getString(R.string.intro_desc_chat_details));
chatDetails.setImageDrawable(R.drawable.intro_account_details_icon);
chatDetails.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(chatDetails));
addSlide(AppIntroFragment.createInstance(chatDetails));
if (mode_multi) {
SliderPage highlightUser = new SliderPage();
@ -160,7 +160,7 @@ public class IntroActivity extends AppIntro2 {
highlightUser.setDescription(getString(R.string.intro_desc_highlight_user));
highlightUser.setImageDrawable(R.drawable.intro_account_details_icon);
highlightUser.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(highlightUser));
addSlide(AppIntroFragment.createInstance(highlightUser));
}
break;
case CONTACT_DETAILS_ACTIVITY:
@ -170,7 +170,7 @@ public class IntroActivity extends AppIntro2 {
openChatDetails.setDescription(getString(R.string.intro_desc_open_chat_details));
openChatDetails.setImageDrawable(R.drawable.intro_account_details_icon);
openChatDetails.setBackgroundColor(backgroundColor);
addSlide(AppIntroFragment.newInstance(openChatDetails));
addSlide(AppIntroFragment.createInstance(openChatDetails));
}
}