mirror of https://github.com/NekoX-Dev/NekoX.git
Revert some stuff
Revert "Enable obfuscate" This reverts commit1ebbd0b2
Revert "Enable Show MKV as video and stream all videos options" This reverts commit24b05a98
This commit is contained in:
parent
48ad7183ab
commit
7152ea49e3
|
@ -103,7 +103,7 @@ android {
|
|||
applicationIdSuffix ".beta"
|
||||
minifyEnabled true
|
||||
multiDexEnabled true
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
|
||||
/*debugAsan {
|
||||
|
@ -155,9 +155,9 @@ android {
|
|||
jniDebuggable false
|
||||
signingConfig signingConfigs.release
|
||||
minifyEnabled true
|
||||
shrinkResources true
|
||||
shrinkResources false
|
||||
multiDexEnabled true
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -24,6 +24,5 @@
|
|||
-keep class com.google.android.exoplayer2.metadata.flac.PictureFrame { *; }
|
||||
-keep class com.google.android.exoplayer2.decoder.SimpleOutputBuffer { *; }
|
||||
# Use -keep to explicitly keep any other classes shrinking would remove
|
||||
#-dontoptimize
|
||||
#-dontobfuscate
|
||||
-repackageclasses ''
|
||||
-dontoptimize
|
||||
-dontobfuscate
|
|
@ -5027,9 +5027,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();
|
||||
|
|
|
@ -1911,8 +1911,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);
|
||||
}
|
||||
|
|
|
@ -45,13 +45,12 @@ public class ColorPicker extends FrameLayout {
|
|||
private OvershootInterpolator interpolator = new OvershootInterpolator(1.02f);
|
||||
|
||||
private static final int[] COLORS = new int[]{
|
||||
0xff000000,
|
||||
0xffff0000,
|
||||
0xffea2739,
|
||||
0xffdb3ad2,
|
||||
0xff3051e3,
|
||||
0xff49c5ed,
|
||||
0xff80c864,
|
||||
0xffffff00,
|
||||
0xfffcde65,
|
||||
0xfffc964d,
|
||||
0xff000000,
|
||||
0xffffffff
|
||||
|
@ -59,7 +58,6 @@ public class ColorPicker extends FrameLayout {
|
|||
|
||||
private static final float[] LOCATIONS = new float[]{
|
||||
0.0f,
|
||||
0.07f,
|
||||
0.14f,
|
||||
0.24f,
|
||||
0.39f,
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue