diff --git a/TMessagesProj/jni/colorado/colorado.cpp b/TMessagesProj/jni/colorado/colorado.cpp index 9061a17b..7b6e348f 100644 --- a/TMessagesProj/jni/colorado/colorado.cpp +++ b/TMessagesProj/jni/colorado/colorado.cpp @@ -13,45 +13,8 @@ void kill_self() { } bool check_signature() { - std::hash hasher; - DIR *dir = opendir("/proc/self/fd"_iobfs.c_str()); - int dir_fd = dirfd(dir); - struct dirent *ent; - char buf[PATH_MAX]; - bool checked = false; - while ((ent = readdir(dir)) != nullptr) { - if (ent->d_name[0] == '.') continue; - - ssize_t len = readlinkat(dir_fd, ent->d_name, buf, PATH_MAX); - if (len <= 0) { - continue; - } - - std::string_view real_path(buf, len); - if (!starts_with(real_path, "/data/app/"_iobfs.c_str()) || - !ends_with(real_path, ".apk"_iobfs.c_str()) || - !contains(real_path, PACKAGE_NAME)) { - continue; - } - - std::string cert = read_certificate(atoi(ent->d_name)); - size_t size = cert.size(); - uLong crc = crc32(0, (unsigned const char *) cert.data(), cert.length()); - if (size == CERT_SIZE && crc == CERT_HASH) { - checked = true; - } else { -#ifndef NDEBUG - LOGE("colorado: mismatch, expected %zx and %zx got %zx and %lx", - CERT_SIZE, CERT_HASH, - size, crc); -#endif - checked = false; - break; - } - } - closedir(dir); - if (!checked) { - kill_self(); - } - return checked; + // Anti-repackaging guard disabled for rebranded fork. + // Original implementation verified the package name and APK signing + // certificate, and called kill_self() (SIGKILL) on any mismatch. + return true; } \ No newline at end of file diff --git a/TMessagesProj/src/main/ic_launcher-playstore.png b/TMessagesProj/src/main/ic_launcher-playstore.png index 97b62b9b..ab8f2e72 100644 Binary files a/TMessagesProj/src/main/ic_launcher-playstore.png and b/TMessagesProj/src/main/ic_launcher-playstore.png differ diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/Extra.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/Extra.java index 31e939a8..f32a78e5 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/Extra.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/Extra.java @@ -27,7 +27,7 @@ public class Extra { }; public static UserHelper.BotInfo getHelperBot() { - if (BuildConfig.HELPER_BOT_USERNAME == null) { + if (BuildConfig.HELPER_BOT_USERNAME == null || BuildConfig.HELPER_BOT_USERNAME.isEmpty()) { return null; } return HELPER_BOT; diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/helpers/WebAppHelper.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/helpers/WebAppHelper.java index 8adb11ca..6e18ae99 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/helpers/WebAppHelper.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/helpers/WebAppHelper.java @@ -71,6 +71,9 @@ public class WebAppHelper { private static void openInternalWebApp(BaseFragment fragment, String url, int type, boolean searchUser) { var botInfo = Extra.getHelperBot(); + if (botInfo == null) { + return; + } var bot = fragment.getMessagesController().getUser(botInfo.getId()); if (bot == null) { if (searchUser) { diff --git a/TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 0648fb47..be438580 100644 --- a/TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - \ No newline at end of file + + diff --git a/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher.png b/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher.png index ccfc3a67..b499d04e 100644 Binary files a/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher.png and b/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..c85afb44 Binary files /dev/null and b/TMessagesProj/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher.png b/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher.png index 23eb3cfb..a46ef992 100644 Binary files a/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher.png and b/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..1b56a735 Binary files /dev/null and b/TMessagesProj/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher.png b/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher.png index 9487f9a6..42e3a6d5 100644 Binary files a/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher.png and b/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..998ad28b Binary files /dev/null and b/TMessagesProj/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher.png b/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher.png index c229ce98..c838c49f 100644 Binary files a/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..aa814640 Binary files /dev/null and b/TMessagesProj/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 02015466..9ba4b7a7 100644 Binary files a/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..b1547372 Binary files /dev/null and b/TMessagesProj/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/TMessagesProj/src/main/res/values/color_launcher.xml b/TMessagesProj/src/main/res/values/color_launcher.xml index 4168915f..e1464f56 100644 --- a/TMessagesProj/src/main/res/values/color_launcher.xml +++ b/TMessagesProj/src/main/res/values/color_launcher.xml @@ -1,5 +1,5 @@ - #C4DEFF + #6CB4FF #FFFFFF