1.增加gemini-1.5-pro-002、gemini-1.5-flash-002、gemini-1.5-flash-8b-exp-0924模型。2.修复gemini错误弹窗fix #46。

Author: flyun

TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java

@@ -6987,7 +6987,9 @@ public void onSuccess(ChatGCompletionResponse result) {
                         return;
                     }
 
-                    if (!ChatGFinishReason.STOP.value().equals(chatGCandidate.getFinishReason())) {
+                    String finishReason = chatGCandidate.getFinishReason();
+
+                    if (finishReason != null && !ChatGFinishReason.STOP.value().equals(finishReason)) {
 
                         AndroidUtilities.runOnUIThread(() -> {
 

TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java

@@ -579,11 +579,14 @@ private void initOpenrouter() {
     public void initGoogle() {
         if (aiModelList == null) return;
         aiModelList.put(803, new AiModelBean("Gemini Pro 1.5", "gemini-1.5-pro-latest", true));
+        aiModelList.put(811, new AiModelBean("Gemini Pro 1.5 002", "gemini-1.5-pro-002", true));
         aiModelList.put(804, new AiModelBean("Gemini 1.5 Flash", "gemini-1.5-flash-latest", true));
+        aiModelList.put(812, new AiModelBean("Gemini 1.5 Flash 002", "gemini-1.5-flash-002", true));
         aiModelList.put(801, new AiModelBean("Gemini Pro 1.0", "gemini-pro", true));
         aiModelList.put(807, new AiModelBean("Gemini Pro 1.5 exp-0827", "gemini-1.5-pro-exp-0827", true));
         aiModelList.put(808, new AiModelBean("Gemini Pro 1.5 exp-0801", "gemini-1.5-pro-exp-0801", true));
         aiModelList.put(809, new AiModelBean("Gemini 1.5 Flash exp-0827", "gemini-1.5-flash-exp-0827", true));
+        aiModelList.put(813, new AiModelBean("Gemini 1.5 Flash 8b exp-0924", "gemini-1.5-flash-8b-exp-0924", true));
         aiModelList.put(810, new AiModelBean("Gemini 1.5 Flash 8b exp-0827", "gemini-1.5-flash-8b-exp-0827", true));
         aiModelList.put(802, new AiModelBean("Gemini Pro false", "gemini-pro-vision",
                 "Gemini Pro Vision (Picture model)", false));
@@ -622,7 +625,9 @@ public static String getGoogleVersion(String model) {
                 || model.equals("gemini-1.5-pro-exp-0827")
                 || model.equals("gemini-1.5-pro-exp-0801")
                 || model.equals("gemini-1.5-flash-exp-0827")
-                || model.equals("gemini-1.5-flash-8b-exp-0827")
+                || model.equals("gemini-1.5-pro-002")
+                || model.equals("gemini-1.5-flash-002")
+                || model.equals("gemini-1.5-flash-8b-exp-0924")
         )) {
             return "v1beta";
         }
@@ -797,6 +802,9 @@ public boolean isJudgeByModelGemini(int aiModel) {
         if (aiModel == 808) return true;
         if (aiModel == 809) return true;
         if (aiModel == 810) return true;
+        if (aiModel == 811) return true;
+        if (aiModel == 812) return true;
+        if (aiModel == 813) return true;
 
         return false;
     }
@@ -873,6 +881,9 @@ public static boolean isMultiCompletionRequest(int currentAccount, long userId)
                 || aiModel == 808
                 || aiModel == 809
                 || aiModel == 810
+                || aiModel == 811
+                || aiModel == 812
+                || aiModel == 813
         ) return true;
 
         // Claude

gradle.properties

@@ -13,8 +13,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Sat Mar 12 05:53:50 MSK 2016
-APP_VERSION_CODE=12
-APP_VERSION_NAME=1.1.2
+APP_VERSION_CODE=14
+APP_VERSION_NAME=1.1.4
 APP_PACKAGE=info.flyun.chatair
 RELEASE_KEY_PASSWORD=android
 RELEASE_KEY_ALIAS=androidkey