diff --git a/MessengerProj/build.gradle b/MessengerProj/build.gradle index 1a4223ac9..d91746096 100644 --- a/MessengerProj/build.gradle +++ b/MessengerProj/build.gradle @@ -129,7 +129,7 @@ android { defaultConfig { minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun) targetSdkVersion 23 - versionName "0.1.8" + versionName "0.1.9" } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java index 75b506056..d73df2c6d 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java @@ -1263,7 +1263,7 @@ public class ImageLoader { }); } - public HashMap createMediaPaths() { + public HashMap createMediaPaths() { // not sure, but it seems as if these paths are not needed HashMap mediaDirs = new HashMap<>(); File cachePath = AndroidUtilities.getCacheDir(); if (!cachePath.isDirectory()) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java index fb4edcba0..bcf1d5beb 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java @@ -2994,7 +2994,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, editor.commit(); } - public void checkSaveToGalleryFiles() { + public void checkSaveToGalleryFiles() { // not sure, but it seems as if these paths are not needed try { File messengerPath = new File(Environment.getExternalStorageDirectory(), "Delta Chat"); File imagePath = new File(messengerPath, "Delta Chat Images"); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 836dbb772..28929ffde 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -2084,6 +2084,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not }); presentFragment(fragment); } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_VIDEO) { + Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); try { Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE); File video = AndroidUtilities.generateVideoPath(); @@ -2101,6 +2102,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_LOCATION ) { Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_FILE ) { + Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); if (Build.VERSION.SDK_INT >= 23 && getParentActivity().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); return; @@ -2127,6 +2129,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not }); presentFragment(fragment); } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_MUSIC ) { + Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); if (Build.VERSION.SDK_INT >= 23 && getParentActivity().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); return; @@ -2141,6 +2144,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not }); presentFragment(fragment); } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_CONTACT ) { + Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); if (Build.VERSION.SDK_INT >= 23) { if (getParentActivity().checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) { getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, 5); diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index b0e2be7df..5ef9c89de 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -2149,6 +2149,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe AndroidUtilities.hideKeyboard(messageEditText); } } else if (id == NotificationCenter.recordStartError || id == NotificationCenter.recordStopped) { + Toast.makeText(getContext(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_LONG).show(); if (recordingAudio) { MessagesController.getInstance().sendTyping(dialog_id, 2, 0); recordingAudio = false; diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java index 87eff1850..d3f0d93ed 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java @@ -177,17 +177,15 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter privacyRow = rowCount++; notificationRow = rowCount++; backgroundRow = rowCount++; - enableAnimationsRow = rowCount++; languageRow = rowCount++; - mediaDownloadSection = rowCount++; - mediaDownloadSection2 = rowCount++; - autoplayGifsRow = rowCount++; + mediaDownloadSection = -1; + mediaDownloadSection2 = -1; + autoplayGifsRow = -1;//rowCount++; mobileDownloadRow = -1;//rowCount++; wifiDownloadRow = -1;//rowCount++; roamingDownloadRow = -1;//rowCount++; saveToGalleryRow = -1;//rowCount++; -- for now, we do not use this option, this results in confusing folders ("AppName" and "AppName Images" etc.); instead, for now, the user can use the option to manually save a media - cacheRow = rowCount++; messagesSectionRow = rowCount++; messagesSectionRow2 = rowCount++; @@ -201,6 +199,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } raiseToSpeakRow = rowCount++; // outgoing message sendByEnterRow = rowCount++; + enableAnimationsRow = rowCount++; + cacheRow = rowCount++; supportSectionRow = rowCount++; supportSectionRow2 = rowCount++; @@ -1226,7 +1226,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == stickersRow) { textCell.setText(LocaleController.getString("Stickers", R.string.Stickers), true); } else if (i == cacheRow) { - textCell.setText(LocaleController.getString("CacheSettings", R.string.CacheSettings), true); + textCell.setText(LocaleController.getString("CacheSettings", R.string.CacheSettings), false); } /* EDIT BY MR else if (i == privacyPolicyRow) { @@ -1241,9 +1241,9 @@ 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), true); + textCell.setTextAndCheck(LocaleController.getString("EnableAnimations", R.string.EnableAnimations), preferences.getBoolean("view_animations", true), false); } else if (i == sendByEnterRow) { - textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), false); + textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), true); } else if (i == saveToGalleryRow) { textCell.setTextAndCheck(LocaleController.getString("SaveToGallerySettings", R.string.SaveToGallerySettings), MediaController.getInstance().canSaveToGallery(), true); } else if (i == autoplayGifsRow) { @@ -1262,7 +1262,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == supportSectionRow2) { ((HeaderCell) view).setText(LocaleController.getString("Info", R.string.Info)); // EDIT BY MR -- was: Support } else if (i == messagesSectionRow2) { - ((HeaderCell) view).setText(LocaleController.getString("MessagesSettings", R.string.MessagesSettings)); + ((HeaderCell) view).setText(LocaleController.getString("AdvancedSettings", R.string.AdvancedSettings)); } else if (i == mediaDownloadSection2) { ((HeaderCell) view).setText(LocaleController.getString("Media", R.string.Media)); } else if (i == numberSectionRow) { diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index 8b56e48c9..64fe6eee0 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -677,7 +677,7 @@ Dauerhaft stumm Chat mit ]]>%1$s]]> starten? Ein Klick auf die Antwort-Pfeile startet einen Chat. - Diese Funktion ist noch nicht eingebaut. + Diese Funktion ist nicht oder nur unvollständig eingebaut. Mit meinem Delta Chat Messenger gesendet Sofortnachricht Benutzer suchen @@ -695,4 +695,6 @@ Konto konfigurieren... Einladungen versenden Ich verwende nun auch den Delta Chat Messenger - %1$s - und bin dort unter %2$s erreichbar. + Erweiterte Einstellungen + diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index 2da28c4f4..88b9c5e86 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -676,7 +676,7 @@ Always muted Start a chat with ]]>%1$s]]>? To start a chat, click on the reply-arrows. - This function is not yet available. + This function is not available or incomplete. Sent with my Delta Chat Messenger Instant message Search user @@ -696,4 +696,5 @@ Delta Chat]]> is safe for business use, compatible and standards-based. Send invitations I\'m using Delta Chat messenger now - %1$s - you can text me at %2$s + Advanced settings