diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
index 48acc359b..b7643bd0c 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
@@ -387,11 +387,6 @@ public class NotificationsController {
MrChat mrChat = MrMailbox.getChat(chat_id);
boolean isGroupChat = mrChat.getType()==MrChat.MR_CHAT_GROUP;
- if( isGroupChat && mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP ) {
- if( ) {
-
- }
- }
int popup = preferences.getInt(isGroupChat ? "popupGroup" : "popupAll", 0);
/* old func:
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
index bcd8cf7f4..c709808ff 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
@@ -1157,7 +1157,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
rowCount = 0;
emptyRow = rowCount++;
- settingsNotificationsRow = rowCount++;
+
+ if( chat_id!=MrChat.MR_CHAT_ID_DEADDROP || MrMailbox.getConfigInt("show_deaddrop", 0)!=0 ) {
+ settingsNotificationsRow = rowCount++;
+ }
if( user_id!=0 || chat_id!=MrChat.MR_CHAT_ID_DEADDROP) {
changeNameRow = rowCount++;
@@ -1172,9 +1175,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
//sectionRow = rowCount++;
if( chat_id != 0 ) {
- emptyRowChat = rowCount++;
- membersSectionRow = rowCount++;
- emptyRowChat2 = rowCount++;
+ if( rowCount > 1/*first empty row is always added*/ ) {
+ emptyRowChat = rowCount++;
+ membersSectionRow = rowCount++;
+ emptyRowChat2 = rowCount++;
+ }
firstMemberRow = rowCount;
rowCount += sortedUserIds.length;
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java
index c2ae263d0..24990b9f4 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java
@@ -131,7 +131,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
builder.setTitle(LocaleController.getString("Vibrate", R.string.Vibrate));
builder.setItems(new CharSequence[]{
LocaleController.getString("VibrationDisabled", R.string.VibrationDisabled),
- LocaleController.getString("SettingsDefault", R.string.SettingsDefault),
+ LocaleController.getString("Default", R.string.Default),
LocaleController.getString("SystemDefault", R.string.SystemDefault),
LocaleController.getString("Short", R.string.Short),
LocaleController.getString("Long", R.string.Long)
@@ -282,7 +282,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setTitle(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority));
builder.setItems(new CharSequence[]{
- LocaleController.getString("SettingsDefault", R.string.SettingsDefault),
+ LocaleController.getString("Default", R.string.Default),
LocaleController.getString("NotificationsPriorityDefault", R.string.NotificationsPriorityDefault),
LocaleController.getString("NotificationsPriorityHigh", R.string.NotificationsPriorityHigh),
LocaleController.getString("NotificationsPriorityMax", R.string.NotificationsPriorityMax)
@@ -521,7 +521,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
if (i == settingsVibrateRow) {
int value = preferences.getInt("vibrate_" + dialog_id, 0);
if (value == 0) {
- textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("SettingsDefault", R.string.SettingsDefault), true);
+ textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Default", R.string.Default), true);
} else if (value == 1) {
textCell.setTextAndValue(LocaleController.getString("Vibrate", R.string.Vibrate), LocaleController.getString("Short", R.string.Short), true);
} else if (value == 2) {
@@ -574,7 +574,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
} else if (value == 2) {
textCell.setTextAndValue(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority), LocaleController.getString("NotificationsPriorityMax", R.string.NotificationsPriorityMax), true);
} else if (value == 3) {
- textCell.setTextAndValue(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority), LocaleController.getString("SettingsDefault", R.string.SettingsDefault), true);
+ textCell.setTextAndValue(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority), LocaleController.getString("Default", R.string.Default), true);
}
} else if (i == smartRow) {
int notifyMaxCount = preferences.getInt("smart_max_count_" + dialog_id, 2);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
index 5b1d41ed9..2b146361c 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
@@ -27,7 +27,6 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.AdapterView;
import android.widget.FrameLayout;
-import android.widget.LinearLayout;
import android.widget.ListView;
import com.b44t.messenger.AndroidUtilities;
@@ -35,13 +34,10 @@ import com.b44t.messenger.MediaController;
import com.b44t.messenger.MrMailbox;
import com.b44t.messenger.ApplicationLoader;
import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.FileLog;
import com.b44t.messenger.MessagesController;
import com.b44t.messenger.NotificationCenter;
import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.BottomSheet;
import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.CheckBoxCell;
import com.b44t.ui.Cells.EmptyCell;
import com.b44t.ui.Cells.HeaderCell;
import com.b44t.ui.Cells.ShadowSectionCell;
@@ -1260,7 +1256,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
if (i == enableAnimationsRow) {
- textCell.setTextAndCheck(LocaleController.getString("EnableAnimations", R.string.EnableAnimations), preferences.getBoolean("view_animations", true), false);
+ textCell.setTextAndCheck(LocaleController.getString("EnableAnimations", R.string.EnableAnimations), preferences.getBoolean("view_animations", true), true);
} else if (i == sendByEnterRow) {
textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), true);
/*} else if (i == saveToGalleryRow) {
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 571e9bb77..d2f126ec3 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -197,7 +197,7 @@
Standard
Wenn lautlos
Chat-Hintergrundbild
- Mit Enter senden
+ Mit Taste „Enter“ senden
Sprache
Hilfe
Lokalisierung löschen?
@@ -219,7 +219,6 @@
Kurz
Lang
Systemvorgabe
- Standardeinstellung
Zum Sprechen ans Ohr
Name bearbeiten
Priorität
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 7b4c23d48..0c08a98eb 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -219,7 +219,6 @@
Cortas
Largas
Según el sistema
- Según Delta Chat
Elevar para hablar
Editar nombre
Prioridad
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index f3e28e1e5..5bea89cad 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -197,7 +197,7 @@
Predefinite
Solo se silenzioso
Sfondo chat
- Invia con tasto invio
+ Invia con tasto "invio"
Lingua
Domande frequenti
Eliminare la traduzione?
@@ -219,7 +219,6 @@
Breve
Lunga
Predefinito di sistema
- Impostazioni predefinite
Alza per parlare
Modifica nome
Priorità
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index 92f4035de..785bd937d 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -197,7 +197,7 @@
Standaard
Alleen indien stil
Achtergrond kiezen
- Versturen met Enter
+ Versturen met "Enter"
Taal
Veelgestelde vragen
Vertaling verwijderen?
@@ -219,7 +219,6 @@
Kort
Lang
Systeeminstelling
- Standaardinstelling
Houd bij oor
Naam wijzigen
Prioriteit
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 10afeb33b..81c3b0cba 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -219,7 +219,6 @@
Curta
Longa
Padrão do sistema
- Configurações padrão
Levantar para Falar
Editar nome
Prioridade
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 5017ca86f..df20e8a39 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -197,7 +197,7 @@
Default
Only if silent
Chat Background
- Send by Enter
+ Send by "Enter"
Language
Help
Delete localization?
@@ -219,7 +219,6 @@
Short
Long
System default
- Settings default
Raise to Speak
Edit name
Priority