From 4783f802e4151197efedb2fd7d53ae21757fa3b8 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+nekoinverter@users.noreply.github.com>
Date: Fri, 5 Jun 2020 13:43:46 +0800
Subject: [PATCH] Revert some stuff

---
 .../org/telegram/messenger/SendMessagesHelper.java  |  3 ---
 .../ui/Components/ChatActivityEnterView.java        |  2 --
 .../java/org/telegram/ui/DataSettingsActivity.java  | 13 +++++++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
index 6200f2a20..effcc8a2f 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
@@ -5099,9 +5099,6 @@ public class SendMessagesHelper extends BaseController implements NotificationCe
                     file.close();
                 } catch (Exception e) {
                     FileLog.e(e);
-                    try {
-                        BitmapFactory.decodeFile(path, bmOptions);
-                    } catch (Exception ignore) { }
                 }
                 if (bmOptions.outWidth != 0 && bmOptions.outHeight != 0 && bmOptions.outWidth <= 800 && bmOptions.outHeight <= 800) {
                     TLRPC.TL_documentAttributeSticker attributeSticker = new TLRPC.TL_documentAttributeSticker();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
index 2aa951349..eac52aaf8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
@@ -1917,8 +1917,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 ClipDescription description = inputContentInfo.getDescription();
                 if (description.hasMimeType("image/gif")) {
                     SendMessagesHelper.prepareSendingDocument(accountInstance, null, null, inputContentInfo.getContentUri(), null, "image/gif", dialog_id, replyingMessageObject, inputContentInfo, null, notify, 0);
-                } else if (description.hasMimeType("image/png")) {
-                    SendMessagesHelper.prepareSendingDocument(accountInstance, null, null, inputContentInfo.getContentUri(), null, "image/webp", dialog_id, replyingMessageObject, inputContentInfo, null, notify, 0);
                 } else {
                     SendMessagesHelper.prepareSendingPhoto(accountInstance, null, inputContentInfo.getContentUri(), dialog_id, replyingMessageObject, null, null, null, inputContentInfo, 0, null, notify, 0);
                 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
index 659109d55..f17f88141 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
@@ -108,8 +108,13 @@ public class DataSettingsActivity extends BaseFragment {
         autoplaySectionRow = rowCount++;
         streamSectionRow = rowCount++;
         enableStreamRow = rowCount++;
-        enableMkvRow = rowCount++;
-        enableAllStreamRow = rowCount++;
+        if (BuildVars.DEBUG_VERSION) {
+            enableMkvRow = rowCount++;
+            enableAllStreamRow = rowCount++;
+        } else {
+            enableAllStreamRow = -1;
+            enableMkvRow = -1;
+        }
         enableAllStreamInfoRow = rowCount++;
         enableCacheStreamRow = -1;//rowCount++;
         callsSectionRow = rowCount++;
@@ -447,9 +452,9 @@ public class DataSettingsActivity extends BaseFragment {
                     } else if (position == enableCacheStreamRow) {
                         //checkCell.setTextAndCheck(LocaleController.getString("CacheStreamFile", R.string.CacheStreamFile), SharedConfig.saveStreamMedia, true);
                     } else if (position == enableMkvRow) {
-                        checkCell.setTextAndCheck("Show MKV as Video", SharedConfig.streamMkv, true);
+                        checkCell.setTextAndCheck("(beta only) Show MKV as Video", SharedConfig.streamMkv, true);
                     } else if (position == enableAllStreamRow) {
-                        checkCell.setTextAndCheck("Stream All Videos", SharedConfig.streamAllVideo, false);
+                        checkCell.setTextAndCheck("(beta only) Stream All Videos", SharedConfig.streamAllVideo, false);
                     } else if (position == autoplayGifsRow) {
                         checkCell.setTextAndCheck(LocaleController.getString("AutoplayGIF", R.string.AutoplayGIF), SharedConfig.autoplayGifs, true);
                     } else if (position == autoplayVideoRow) {