Upgrade TDLib to tdlib/td@b102c3a

Author: vkryl

.gitattributes

@@ -1,2 +1,3 @@
 app/jniLibs/*/*.so filter=lfs diff=lfs merge=lfs -text
 *.zip -delta
+* text=auto

app/build.gradle.kts

@@ -380,6 +380,7 @@ dependencies {
   implementation("androidx.activity:activity:1.8.2") // 1.9.0+ requires minSdkVersion 19
   implementation("androidx.palette:palette:1.0.0")
   implementation("androidx.recyclerview:recyclerview:1.3.2")
+  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
   implementation("androidx.viewpager:viewpager:1.0.0")
   implementation("androidx.work:work-runtime:2.9.0")
   implementation("androidx.browser:browser:1.5.0") // 1.7.0+ requires minSdkVersion 19
@@ -398,13 +399,16 @@ dependencies {
   implementation("com.google.android.gms:play-services-maps:17.0.1")
   implementation("com.google.android.gms:play-services-location:18.0.0")
   implementation("com.google.android.gms:play-services-mlkit-barcode-scanning:16.2.1")
+  implementation("com.google.android.gms:play-services-safetynet:18.0.1")
   // Firebase: https://firebase.google.com/support/release-notes/android
   implementation("com.google.firebase:firebase-messaging:22.0.0") {
     exclude(group = "com.google.firebase", module = "firebase-core")
     exclude(group = "com.google.firebase", module = "firebase-analytics")
     exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
   }
-  implementation("com.google.firebase:firebase-appcheck-safetynet:16.1.2")
+  // implementation("com.google.firebase:firebase-appcheck-safetynet:16.1.2")
+  // Play Integrity: https://developer.android.com/google/play/integrity/reference/com/google/android/play/core/release-notes
+  implementation("com.google.android.play:integrity:1.3.0")
   // Play In-App Updates: https://developer.android.com/reference/com/google/android/play/core/release-notes-in_app_updates
   implementation("com.google.android.play:app-update:2.1.0")
   // AndroidX/media: https://github.com/androidx/media/blob/release/RELEASENOTES.md

app/src/main/java/org/thunderdog/challegram/Log.java

@@ -983,6 +983,21 @@ public static RuntimeException generateException (int skipCount) {
     }
   }
 
+  public static String toErrorString (Throwable e) {
+
+    if (e == null) return "NULL";
+    String str = "";
+    if (e.getClass() != null && e.getClass().getSimpleName() != null) {
+      str = e.getClass().getSimpleName();
+      if (str == null) str = "";
+    }
+    if (e.getMessage() != null) {
+      if (str.length() > 0) str += ": ";
+      str += e.getMessage();
+    }
+    return str;
+  }
+
   public static String toString (Throwable t) {
     StringBuilder b = new StringBuilder();
     toStringBuilder(t, 10, b);

app/src/main/java/org/thunderdog/challegram/TDLib.java

@@ -92,6 +92,18 @@ public static void safetyNet (String format, Object... formatArgs) {
       i("[safetynet]: %s", format(format, formatArgs));
     }
 
+    public static void playIntegrity (String format, Object... formatArgs) {
+      i("[play-integrity]: %s", format(format, formatArgs));
+    }
+
+    public static void integrity (boolean isPlay, String format, Object... formatArgs) {
+      if (isPlay) {
+        playIntegrity(format, formatArgs);
+      } else {
+        safetyNet(format, formatArgs);
+      }
+    }
+
     public static void td_init (String format, Object... formatArgs) {
       logModule("td_init", format, formatArgs);
     }

app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomGalleryController.java

@@ -248,6 +248,11 @@ public boolean allowSpoiler () {
     return !ChatId.isSecret(getOutputChatId());
   }
 
+  @Override
+  public boolean allowShowCaptionAboveMedia () {
+    return !ChatId.isSecret(getOutputChatId());
+  }
+
   @Override
   protected void onUpdateBottomBarFactor (float bottomBarFactor, float counterFactor, float y) {
     float factor = Math.min(bottomBarFactor, 1f - counterFactor);
@@ -541,7 +546,7 @@ public boolean canSendAsFile () {
   }
 
   @Override
-  public boolean sendSelectedItems (View view, ArrayList<ImageFile> images, TdApi.MessageSendOptions options, boolean disableMarkdown, boolean asFiles, boolean hasSpoiler) {
+  public boolean sendSelectedItems (View view, ArrayList<ImageFile> images, TdApi.MessageSendOptions options, boolean disableMarkdown, boolean asFiles, boolean showCaptionAboveMedia, boolean hasSpoiler) {
     // TODO delete other
     return mediaLayout.sendPhotosOrVideos(view, images, false, options, disableMarkdown, asFiles, true);
   }
@@ -561,6 +566,16 @@ public void onHideMediaStateChanged (boolean hideMedia) {
     mediaLayout.setNeedSpoiler(hideMedia);
   }
 
+  @Override
+  public boolean showCaptionAboveMedia () {
+    return mediaLayout.showCaptionAboveMedia();
+  }
+
+  @Override
+  public void onShowCaptionAboveMediaStateChanged (boolean showCaptionAboveMedia) {
+    mediaLayout.setShowCaptionAboveMedia(showCaptionAboveMedia);
+  }
+
   @Override
   protected void onCancelMultiSelection () {
     adapter.clearSelectedImages((GridLayoutManager) getLayoutManager());

app/src/main/java/org/thunderdog/challegram/component/attach/MediaLayout.java

@@ -1294,7 +1294,9 @@ public boolean sendPhotosOrVideos (View view, ArrayList<ImageFile> images, boole
         ImageGalleryFile[] result = new ImageGalleryFile[galleryFiles.size()];
         galleryFiles.toArray(result);
         Settings.instance().setNeedGroupMedia(needGroupMedia);
-        target.sendPhotosAndVideosCompressed(result, needGroupMedia, options, disableMarkdown, asFiles, allowSpoiler && needSpoiler);
+        boolean showCaptionAboveMedia = false;
+        boolean hasSpoiler = allowSpoiler && needSpoiler;
+        target.sendPhotosAndVideosCompressed(result, needGroupMedia, options, disableMarkdown, asFiles, showCaptionAboveMedia, hasSpoiler);
       }
     }
 
@@ -1609,6 +1611,14 @@ public void setNeedSpoiler (boolean needSpoiler) {
     }
   }
 
+  public boolean showCaptionAboveMedia () {
+    return false; // TODO
+  }
+
+  public void setShowCaptionAboveMedia (boolean showCaptionAboveMedia) {
+    // TODO
+  }
+
   private @Nullable TdApi.Chat getTargetChat () {
     MessagesController c = getTarget();
     TdApi.Chat chat = null;

app/src/main/java/org/thunderdog/challegram/component/chat/InputView.java

@@ -1459,13 +1459,13 @@ protected InputConnection createInputConnection (EditorInfo editorInfo) {
           final boolean isSecretChat = ChatId.isSecret(chatId);
           if (mediaType == MediaType.GIF && isAnimatedGif) {
             TdApi.InputFileGenerated generated = TD.newGeneratedFile(null, path, 0, timestamp);
-            content = tdlib.filegen().createThumbnail(new TdApi.InputMessageAnimation(generated, null, null, 0, imageWidth, imageHeight, null, false), isSecretChat);
+            content = tdlib.filegen().createThumbnail(new TdApi.InputMessageAnimation(generated, null, null, 0, imageWidth, imageHeight, null, false, false), isSecretChat);
           } else if ((mediaType != MediaType.JPEG && (mediaType == MediaType.WEBP || path.contains("sticker") || Math.max(imageWidth, imageHeight) <= 512))) {
             TdApi.InputFileGenerated generated = PhotoGenerationInfo.newFile(path, 0, timestamp, true, 512);
             content = tdlib.filegen().createThumbnail(new TdApi.InputMessageSticker(generated, null, imageWidth, imageHeight, null), isSecretChat);
           } else {
             TdApi.InputFileGenerated generated = PhotoGenerationInfo.newFile(path, 0, timestamp, false, 0);
-            content = tdlib.filegen().createThumbnail(new TdApi.InputMessagePhoto(generated, null, null, imageWidth, imageHeight, null, null, false), isSecretChat);
+            content = tdlib.filegen().createThumbnail(new TdApi.InputMessagePhoto(generated, null, null, imageWidth, imageHeight, null, false, null, false), isSecretChat);
           }
 
           UI.post(() -> {

app/src/main/java/org/thunderdog/challegram/component/chat/MessagesLoader.java

@@ -966,7 +966,7 @@ private static boolean parsePreviewMessages (TdlibDelegate context, List<TdApi.M
 
       TdApi.MessageContent content;
       if (photo != null)
-        content = new TdApi.MessagePhoto(photo, text, false, false);
+        content = new TdApi.MessagePhoto(photo, text, false, false, false);
       else if (sticker != null)
         content = new TdApi.MessageSticker(sticker, false);
       else if (audio != null)
@@ -1224,10 +1224,10 @@ private TdApi.Message newMessage (final long chatId, final boolean isChannel, fi
       false,
       event.date, 0,
       null, null, null, null,
-      null, 0, 0,
+      null, null, 0, 0,
       null, 0, 0,
       0, 0, 0, null,
-      0,
+      0, 0,
       null,
       null,
       null