Revert some stuff

This commit is contained in:
NekoInverter 2020-06-05 13:43:46 +08:00 committed by 世界
parent da93f4a809
commit 4783f802e4
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 9 additions and 9 deletions

View File

@ -5099,9 +5099,6 @@ public class SendMessagesHelper extends BaseController implements NotificationCe
file.close(); file.close();
} catch (Exception e) { } catch (Exception e) {
FileLog.e(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) { if (bmOptions.outWidth != 0 && bmOptions.outHeight != 0 && bmOptions.outWidth <= 800 && bmOptions.outHeight <= 800) {
TLRPC.TL_documentAttributeSticker attributeSticker = new TLRPC.TL_documentAttributeSticker(); TLRPC.TL_documentAttributeSticker attributeSticker = new TLRPC.TL_documentAttributeSticker();

View File

@ -1917,8 +1917,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
ClipDescription description = inputContentInfo.getDescription(); ClipDescription description = inputContentInfo.getDescription();
if (description.hasMimeType("image/gif")) { if (description.hasMimeType("image/gif")) {
SendMessagesHelper.prepareSendingDocument(accountInstance, null, null, inputContentInfo.getContentUri(), null, "image/gif", dialog_id, replyingMessageObject, inputContentInfo, null, notify, 0); 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 { } else {
SendMessagesHelper.prepareSendingPhoto(accountInstance, null, inputContentInfo.getContentUri(), dialog_id, replyingMessageObject, null, null, null, inputContentInfo, 0, null, notify, 0); SendMessagesHelper.prepareSendingPhoto(accountInstance, null, inputContentInfo.getContentUri(), dialog_id, replyingMessageObject, null, null, null, inputContentInfo, 0, null, notify, 0);
} }

View File

@ -108,8 +108,13 @@ public class DataSettingsActivity extends BaseFragment {
autoplaySectionRow = rowCount++; autoplaySectionRow = rowCount++;
streamSectionRow = rowCount++; streamSectionRow = rowCount++;
enableStreamRow = rowCount++; enableStreamRow = rowCount++;
enableMkvRow = rowCount++; if (BuildVars.DEBUG_VERSION) {
enableAllStreamRow = rowCount++; enableMkvRow = rowCount++;
enableAllStreamRow = rowCount++;
} else {
enableAllStreamRow = -1;
enableMkvRow = -1;
}
enableAllStreamInfoRow = rowCount++; enableAllStreamInfoRow = rowCount++;
enableCacheStreamRow = -1;//rowCount++; enableCacheStreamRow = -1;//rowCount++;
callsSectionRow = rowCount++; callsSectionRow = rowCount++;
@ -447,9 +452,9 @@ public class DataSettingsActivity extends BaseFragment {
} else if (position == enableCacheStreamRow) { } else if (position == enableCacheStreamRow) {
//checkCell.setTextAndCheck(LocaleController.getString("CacheStreamFile", R.string.CacheStreamFile), SharedConfig.saveStreamMedia, true); //checkCell.setTextAndCheck(LocaleController.getString("CacheStreamFile", R.string.CacheStreamFile), SharedConfig.saveStreamMedia, true);
} else if (position == enableMkvRow) { } 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) { } 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) { } else if (position == autoplayGifsRow) {
checkCell.setTextAndCheck(LocaleController.getString("AutoplayGIF", R.string.AutoplayGIF), SharedConfig.autoplayGifs, true); checkCell.setTextAndCheck(LocaleController.getString("AutoplayGIF", R.string.AutoplayGIF), SharedConfig.autoplayGifs, true);
} else if (position == autoplayVideoRow) { } else if (position == autoplayVideoRow) {