Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c523f95b authored by twyen's avatar twyen Committed by android-build-merger
Browse files

Merge "Disable transcrption downloads for T-Mobile."

am: c81fbd75

Change-Id: I4b8d4419b7e0d7ac6c5e0b3c5f59a808075b76ad
parents 79f874e7 c81fbd75
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class OmtpVvmCarrierConfigHelper {
      "vvm_disabled_capabilities_string_array";

  public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
  private static final String KEY_IGNORE_TRANSCRIPTION_BOOL = "vvm_ignore_transcription";

  @Nullable private static PersistableBundle overrideConfigForTest;

@@ -517,4 +518,13 @@ public class OmtpVvmCarrierConfigHelper {
    }
    return false;
  }

  /**
   * Suppress the behavior of treating any text attachment with MIME "text/*" as transcription,
   * default to false.
   */
  public boolean ignoreTranscription() {
    Assert.checkArgument(isValid());
    return (boolean) getValue(KEY_IGNORE_TRANSCRIPTION_BOOL, false);
  }
}
+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ public class ImapHelper implements Closeable {

        if (bodyPartMimeType.startsWith("audio/")) {
          messageStructureWrapper.messageStructure = message;
        } else if (bodyPartMimeType.startsWith("text/")) {
        } else if (!config.ignoreTranscription() && bodyPartMimeType.startsWith("text/")) {
          messageStructureWrapper.transcriptionBodyPart = bodyPart;
        } else {
          VvmLog.v(TAG, "Unknown bodyPart MIME: " + bodyPartMimeType);
+17 −14
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@
      <item value="AUTH=DIGEST-MD5"/>
    </string-array>
    <string name="vvm_carrier_allows_ott_transcription_string">true</string>
    <boolean
        name="vvm_ignore_transcription"
        value="false"/>
  </pbundle_as_map>

  <pbundle_as_map>