From 9ede636931bee96ab98e80477edf4adc7333460e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Thu, 25 Jun 2020 16:44:36 +0000
Subject: [PATCH] Fixes

---
 TMessagesProj/build.gradle                    |  11 +-------
 TMessagesProj/debug.keystore                  | Bin 2513 -> 0 bytes
 .../messenger/SendMessagesHelper.java         |   2 +-
 .../java/org/telegram/ui/CallLogActivity.java |   2 +-
 .../telegram/ui/ChannelCreateActivity.java    |   1 +
 .../telegram/ui/ChatRightsEditActivity.java   |   2 +-
 .../tw/nekomimi/nekogram/utils/FileUtil.kt    |  24 ++++++++++++++++--
 update_jni.sh                                 |  12 +++++----
 8 files changed, 34 insertions(+), 20 deletions(-)
 delete mode 100644 TMessagesProj/debug.keystore

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 10025372b..f88e4bd4c 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -210,14 +210,6 @@ android {
             keyPassword pwd
         }
 
-        debug {
-
-            storeFile project.file('debug.keystore')
-            storePassword "android"
-            keyAlias "androiddebugkey"
-            keyPassword "android"
-
-        }
     }
 
     buildTypes {
@@ -225,7 +217,7 @@ android {
             debuggable true
             jniDebuggable true
             multiDexEnabled true
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
@@ -235,7 +227,6 @@ android {
             jniDebuggable false
             minifyEnabled true
             shrinkResources true
-            signingConfig signingConfigs.release
         }
 
         release {
diff --git a/TMessagesProj/debug.keystore b/TMessagesProj/debug.keystore
deleted file mode 100644
index 87a727d3fe94243866ae898ff7a722c5c8fbc040..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2513
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
LY8ew4gwOp8uBWE3

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
index 6604c3af6..044e10a50 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
@@ -6036,7 +6036,7 @@ public class SendMessagesHelper extends BaseController implements NotificationCe
                         if (forceDocument) {
                             videoEditedInfo = null;
                         } else {
-                            videoEditedInfo = info.videoEditedInfo;
+                            videoEditedInfo = info.videoEditedInfo != null ? info.videoEditedInfo : createCompressionSettings(info.path);
                         }
 
                         if (!forceDocument && (videoEditedInfo != null || info.path.endsWith("mp4"))) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java
index d86d07dd4..78de519ba 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java
@@ -451,7 +451,7 @@ public class CallLogActivity extends BaseFragment implements NotificationCenter.
         BottomBuilder builder = new BottomBuilder(getParentActivity());
 
         builder.addTitle(LocaleController.getString("ConfirmDeleteCallLog", R.string.ConfirmDeleteCallLog));
-        builder.addItem(LocaleController.getString("Delete", R.string.Delete), R.drawable.baseline_delete_24, (dialog, which) -> {
+        builder.addItem(LocaleController.getString("Delete", R.string.Delete), R.drawable.baseline_delete_24, (cell) -> {
             ArrayList<Integer> ids = new ArrayList<>();
             for (TLRPC.Message msg : row.calls) {
                 ids.add(msg.id);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
index b99c737c8..db05a7c2b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
@@ -16,6 +16,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.os.Bundle;
 import android.os.Vibrator;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
index 2319140fd..06ed4bfc8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
@@ -974,7 +974,7 @@ public class ChatRightsEditActivity extends BaseFragment {
             int left = MAX_RANK_LENGTH - (currentRank != null ? currentRank.codePointCount(0, currentRank.length()) : 0);
             if (left <= MAX_RANK_LENGTH - MAX_RANK_LENGTH * 0.7f) {
                 headerCell.setText2(String.format("%d", left));
-                SimpleTextView textView = headerCell.getTextView2();
+                TextView textView = headerCell.getTextView2();
                 String key = left < 0 ? Theme.key_windowBackgroundWhiteRedText5 : Theme.key_windowBackgroundWhiteGrayText3;
                 textView.setTextColor(Theme.getColor(key));
                 textView.setTag(key);
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
index a12998d3e..2809ceab7 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
@@ -192,17 +192,37 @@ object FileUtil {
 
         if (!newFile.isFile) {
 
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+
+                Build.SUPPORTED_ABIS.forEachIndexed { index, abi ->
+
+                    runCatching {
+
+                        saveNonAsset("lib/$abi/${execFile.name}", execFile)
+
+                        FileLog.d("lib extracted with default abi$index ($abi): $execFile")
+
+                    }
+
+                }
+
+                error("library not found ${execFile.name}")
+
+            }
+
+        } else {
+
             runCatching {
 
                 saveNonAsset("lib/${Build.CPU_ABI}/${execFile.name}", execFile)
 
-                FileLog.d("lib extracted with default abi: $execFile, ${Build.CPU_ABI}")
+                FileLog.d("lib extracted with default abi (${Build.CPU_ABI}): $execFile")
 
             }.recover {
 
                 saveNonAsset("lib/${Build.CPU_ABI2}/${execFile.name}", execFile)
 
-                FileLog.d("lib extracted with abi2: $execFile, ${Build.CPU_ABI2}")
+                FileLog.d("lib extracted with abi2 (${Build.CPU_ABI2}): $execFile")
 
             }
 
diff --git a/update_jni.sh b/update_jni.sh
index dcf42c10e..26ac6f018 100755
--- a/update_jni.sh
+++ b/update_jni.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-rm TMessagesProj/libs/*.aar
+rm -f TMessagesProj/libs/*.aar
 
 ./gradlew ss-rust:assembleRelease
 
@@ -31,14 +31,16 @@ cd  ../..
 OUT=TMessagesProj/build/intermediates/ndkBuild/fullFoss/obj/local
 DIR=TMessagesProj/src/main/libs
 
-rm $DIR/armeabi-v7a/*
+rm -rf $DIR
+
+mkdir -p $DIR/armeabi-v7a
 cp $OUT/armeabi-v7a/*.so $DIR/armeabi-v7a
 
-rm $DIR/arm64-v8a/*
+mkdir -p $DIR/arm64-v8a
 cp $OUT/arm64-v8a/*.so $DIR/arm64-v8a
 
-rm $DIR/x86/*
+mkdir -p $DIR/x86
 cp $OUT/x86/*.so $DIR/x86
 
-rm $DIR/x86_64/*
+mkdir -p $DIR/x86_64
 cp $OUT/x86_64/*.so $DIR/x86_64
\ No newline at end of file