Commit 14813817 authored by Grigory Fedorov's avatar Grigory Fedorov

Merge branch 'release/1.0.30'

parents 76954930 2a8929c5
......@@ -62,13 +62,9 @@ The Jabber logo is licensed under the Creative Commons Attribution License
app/src/main/res/drawable*/ic_vcard_jabber_24dp.png
Xabber, Redsolution logo are trademarks of Redsolution Inc., and are licensed under Creative Commons Attribution-NoDerivs license:
app/src/main/res/drawable*/ic_connect.png
app/src/vip/res/drawable*/ic_connect.png
app/src/main/res/drawable*/ic_disconnect.png
app/src/vip/res/drawable*/ic_disconnect.png
app/src/main/res/drawable*/ic_launcher.png
app/src/vip/res/drawable*/ic_launcher.png
app/src/main/res/drawable*/redsolution_logo*.9.png
app/src/*/res/drawable*/xabber_logo*.png
app/src/main/res/drawable*/redsolution_logo*.png
app/src/*/res/mipmap*/ic_launcher.png
Following file is part of The Android Open Source Project licensed under the Apache License, Version 2.0 (the "License") (see assets/LICENSE-Apache2.txt):
app/src/main/res/layout/preference.xml
......
......@@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 22
versionCode 201
versionName '1.0.29'
versionCode 202
versionName '1.0.30'
}
compileOptions {
......
......@@ -29,7 +29,7 @@
<application
android:name="com.xabber.android.data.Application"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/application_title_full"
android:theme="@style/Theme">
<activity
......
......@@ -143,6 +143,8 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
AbstractChat abstractChat = MessageManager.getInstance().getChat(account, user);
securityButton = (ImageButton) view.findViewById(R.id.button_security);
View spacer = view.findViewById(R.id.button_security_spacer);
if (abstractChat instanceof RegularChat) {
securityButton.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -152,6 +154,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
});
} else {
securityButton.setVisibility(View.GONE);
spacer.setVisibility(View.VISIBLE);
}
chatMessageAdapter = new ChatMessageAdapter(getActivity(), account, user, this);
......
......@@ -34,7 +34,9 @@ public class ReconnectionActivity extends Activity {
super.onCreate(savedInstanceState);
LogManager.i(this, "onReconnect");
ConnectionManager.getInstance().updateConnections(false);
startActivity(ContactList.createPersistentIntent(this));
Intent intent = ContactList.createIntent(this);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent);
finish();
}
......
......@@ -114,7 +114,13 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
case VIEW_TYPE_ACTION_MESSAGE:
ChatAction action = messageItem.getAction();
String time = StringUtils.getSmartTimeText(context, messageItem.getTimestamp());
String name = RosterManager.getInstance().getBestContact(account, messageItem.getChat().getUser()).getName();
String name;
if (isMUC) {
name = messageItem.getResource();
} else {
name = RosterManager.getInstance().getBestContact(account, messageItem.getChat().getUser()).getName();
}
((BasicMessage)holder).messageText.setText(time + ": "
+ action.getText(context, name, messageItem.getSpannable().toString()));
......
......@@ -63,7 +63,7 @@
android:layout_gravity="bottom"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:src="@drawable/ic_connect" />
android:src="@drawable/xabber_logo_80dp" />
<TextView
android:layout_width="wrap_content"
......
......@@ -73,6 +73,13 @@
android:src="@drawable/ic_security_grey_24dp"
/>
<Space
android:id="@+id/button_security_spacer"
android:layout_width="16dp"
android:layout_height="match_parent"
android:visibility="gone"
/>
<EditText
android:id="@+id/chat_input"
android:layout_width="0dp"
......
......@@ -29,7 +29,7 @@
android:layout_height="64dp"
android:layout_marginLeft="8dp"
android:src="@drawable/ic_connect" />
android:src="@drawable/xabber_logo_80dp" />
<LinearLayout
android:layout_width="wrap_content"
......
......@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_connect"
android:src="@drawable/xabber_logo_80dp"
tools:ignore="ContentDescription" />
<ImageView
......@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_disconnect"
android:src="@drawable/xabber_logo_grey_80dp"
tools:ignore="ContentDescription" />
<TextView
......
......@@ -24,14 +24,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_connect"
android:src="@drawable/xabber_logo_80dp"
/>
<ImageView
android:id="@+id/disconnected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_disconnect"
android:src="@drawable/xabber_logo_grey_80dp"
/>
<TextView
android:id="@+id/text"
......
......@@ -29,11 +29,14 @@
<string name="account_custom_summary">Utiliser les paramètres d\'hôte personnalisés au lieu des données SRV</string>
<string name="account_enabled_summary">Cochez pour activer le compte</string>
<string name="account_invalid_port">Le port doit être un nombre (défaut : 5222)</string>
<string name="account_invalid_port_range">Le port doit être compris entre 1 et 65535 (défaut : 5222)</string>
<string name="account_invalid_priority">La priorité doit être un nombre compris entre -128 et 128 (défaut : 10)</string>
<string name="account_oauth">Autorisation</string>
<string name="account_oauth_invalidated">Autorisation refusée</string>
<string name="account_oauth_summary">Paramètres OAuth</string>
<string name="account_proxy_host">Adresse du proxy</string>
<string name="account_proxy_invalid_port_range">Le port du proxy doit être compris entre 1 et 65535 (défaut : 8080)</string>
<string name="account_proxy_invalid_port">Le port du proxy doit être un nombre (défaut : 8080)</string>
<string name="account_proxy_password">Mot de passe du proxy</string>
<string name="account_proxy_port">Port du proxy</string>
<string name="account_proxy_type">Type de proxy</string>
......
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="otr_fingerprint_description">Pour confirmer l\'identité de votre interlocuteur, demandez lui de fournir son empreinte et comparez-la à celle ci-dessous. N\'échangez surtout pas vos empreintes via XMPP.</string>
<string name="otr_fingerprint_description">Pour confirmer l\'identité de votre interlocuteur, demandez-lui de fournir son empreinte et comparez-la à celle ci-dessous. N\'échangez surtout pas vos empreintes via XMPP.</string>
<string name="otr_is_verified">Ce contact est digne de confiance</string>
<string name="otr_local_fingerprint">Votre empreinte :</string>
<string name="otr_remote_fingerprint">L\'empreinte de votre interlocuteur :</string>
......
......@@ -65,6 +65,7 @@
<string name="events_message_none">Ne pas notifier</string>
<string name="events_show_text">Afficher les messages dans la barre des tâches\nAffiche le texte des messages dans la zone de notification</string>
<string name="events_visible_chat">Notifier pour la conversation affichée\nNotifier lorsqu\'un message est reçu dans la conversation affichée</string>
<string name="events_suppress_100">Masquer certaines notifications\nMasque les messages \"Cette conférence n\'est pas anonyme\"</string>
<string name="negative_priotiry_summary">%s (Vous ne recevrez aucun message)</string>
<string name="preference_accounts">Comptes XMPP\nGérer les comptes</string>
<string name="preference_security">Sécurité\nParamètres de sécurité</string>
......
......@@ -14,7 +14,7 @@
-->
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/sync_account_type"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/application_title_full"
android:smallIcon="@drawable/ic_launcher"
android:smallIcon="@mipmap/ic_launcher"
/>
......@@ -14,5 +14,5 @@
<resources>
<string name="application_title_short">Xabber</string>
<string name="application_title_full">Xabber VIP</string>
<string name="client_name">Xabber</string>
<string name="client_name">Xabber VIP</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment