vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:igniterealtime/Smack

This commit is contained in:
Florian Schmaus 2019-09-18 09:59:57 +02:00
parent 3318a44016 65b6a7bfa2
commit b83dacc60a
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smack-android/build.gradle
View File

@ -24,5 +24,5 @@ dependencies {
}
// Add the Android jar to the Eclipse .classpath.
compile files(androidBootClasspath)
compileOnly files(androidBootClasspath)
}

24
smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
View File

@ -66,15 +66,23 @@ public class AbstractError {
* @return the descriptive text or null.
*/
public String getDescriptiveText() {
String defaultLocale = Locale.getDefault().getLanguage();
String descriptiveText = getDescriptiveText(defaultLocale);
if (descriptiveText == null) {
descriptiveText = getDescriptiveText("en");
if (descriptiveText == null) {
descriptiveText = getDescriptiveText("");
}
if (descriptiveTexts.isEmpty())
return null;
// attempt to obtain the text in the user's locale, the English text, or the "" default
Locale l = Locale.getDefault();
String[] tags = new String[] {
l.getLanguage() + "-" + l.getCountry() + "-" + l.getVariant(),
l.getLanguage() + "-" + l.getCountry(),
l.getLanguage(),
"en",
""
};
for (String tag : tags) {
String descriptiveText = getDescriptiveText(tag);
if (descriptiveText != null)
return descriptiveText;
}
return descriptiveText;
return descriptiveTexts.values().iterator().next();
}
/**

11
smack-experimental/src/main/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdManager.java
View File

@ -51,6 +51,8 @@ public final class StableUniqueStanzaIdManager extends Manager {
private static final Map<XMPPConnection, StableUniqueStanzaIdManager> INSTANCES = new WeakHashMap<>();
private static boolean enabledByDefault = true;
// Filter for outgoing stanzas.
private static final StanzaFilter OUTGOING_FILTER = new AndFilter(
MessageTypeFilter.NORMAL_OR_CHAT_OR_HEADLINE,
@ -72,7 +74,9 @@ public final class StableUniqueStanzaIdManager extends Manager {
XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
@Override
public void connectionCreated(XMPPConnection connection) {
getInstanceFor(connection);
if (enabledByDefault) {
getInstanceFor(connection).enable();
}
}
});
}
@ -83,7 +87,10 @@ public final class StableUniqueStanzaIdManager extends Manager {
*/
private StableUniqueStanzaIdManager(XMPPConnection connection) {
super(connection);
enable();
}
public static void setEnabledByDefault(boolean enabled) {
enabledByDefault = enabled;
}
/**