Merge branch 'dev' of https://github.com/loki-project/session-android into external-file-access-fix

2025-12-03 04:02:22 +00:00 · 2020-09-08 15:33:58 +10:00
parent 96b252c8da cc199b4022
commit 5acf505994
19 changed files with 138 additions and 144 deletions
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,18 +16,17 @@
 */
 package org.thoughtcrime.securesms;

-import android.app.Application;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.multidex.MultiDexApplication;

 import com.google.firebase.iid.FirebaseInstanceId;

@@ -116,10 +115,10 @@ import org.whispersystems.signalservice.loki.protocol.closedgroups.SharedSenderK
 import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager;
 import org.whispersystems.signalservice.loki.protocol.meta.SessionMetaProtocol;
 import org.whispersystems.signalservice.loki.protocol.meta.TTLUtilities;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.DeviceLink;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.syncmessages.SyncMessagesProtocol;

 import java.io.File;
@@ -145,10 +144,11 @@ import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
 *
 * @author Moxie Marlinspike
 */
-public class ApplicationContext extends Application implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
+public class ApplicationContext extends MultiDexApplication implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
      SessionManagementProtocolDelegate, SharedSenderKeysImplementationDelegate {

  private static final String TAG = ApplicationContext.class.getSimpleName();
+  private final static int OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; // 10 MB

  private ExpiringMessageManager  expiringMessageManager;
  private TypingStatusRepository  typingStatusRepository;
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private Button                 lockScreenButton;

  private EditText        passphraseText;
-  private ImageButton     showButton;
-  private ImageButton     hideButton;
+//  private ImageButton     showButton;
+//  private ImageButton     hideButton;
  private AnimatingToggle visibilityToggle;

  private FingerprintManagerCompat fingerprintManager;
@@ -203,11 +203,11 @@ public class PassphrasePromptActivity extends PassphraseActivity {

  private void initializeResources() {

-    ImageButton okButton = findViewById(R.id.ok_button);
+//    ImageButton okButton = findViewById(R.id.ok_button);
    Toolbar     toolbar  = findViewById(R.id.toolbar);

-    showButton                    = findViewById(R.id.passphrase_visibility);
-    hideButton                    = findViewById(R.id.passphrase_visibility_off);
+//    showButton                    = findViewById(R.id.passphrase_visibility);
+//    hideButton                    = findViewById(R.id.passphrase_visibility_off);
    visibilityToggle              = findViewById(R.id.button_toggle);
    passphraseText                = findViewById(R.id.passphrase_edit);
    passphraseAuthContainer       = findViewById(R.id.password_auth_container);
@@ -217,17 +217,17 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    fingerprintCancellationSignal = new CancellationSignal();
    fingerprintListener           = new FingerprintListener();

-    setSupportActionBar(toolbar);
-    getSupportActionBar().setTitle("");
+//    setSupportActionBar(toolbar);
+//    getSupportActionBar().setTitle("");

    SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
    hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
    hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);

    passphraseText.setHint(hint);
-    okButton.setOnClickListener(new OkButtonClickListener());
-    showButton.setOnClickListener(new ShowButtonOnClickListener());
-    hideButton.setOnClickListener(new HideButtonOnClickListener());
+//    okButton.setOnClickListener(new OkButtonClickListener());
+//    showButton.setOnClickListener(new ShowButtonOnClickListener());
+//    hideButton.setOnClickListener(new HideButtonOnClickListener());
    passphraseText.setOnEditorActionListener(new PassphraseActionListener());
    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
                                     EditorInfo.IME_ACTION_DONE);
@@ -316,7 +316,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private class ShowButtonOnClickListener implements OnClickListener {
    @Override
    public void onClick(View v) {
-      visibilityToggle.display(hideButton);
+//      visibilityToggle.display(hideButton);
      setPassphraseVisibility(true);
    }
  }
@@ -324,7 +324,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private class HideButtonOnClickListener implements OnClickListener {
    @Override
    public void onClick(View v) {
-      visibilityToggle.display(showButton);
+//      visibilityToggle.display(showButton);
      setPassphraseVisibility(false);
    }
  }
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -6,9 +6,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -17,11 +14,16 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;

 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -209,7 +211,8 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
    authorView.setText(isOwnNumber ? getContext().getString(R.string.QuoteView_you) : quoteeDisplayName);

    // We use the raw color resource because Android 4.x was struggling with tints here
-    quoteBarView.setImageResource(R.color.accent);
+    int colorID = UiModeUtilities.isDayUiMode(getContext()) ? R.color.black : R.color.accent;
+    quoteBarView.setImageResource(colorID);
    mainView.setBackgroundColor(ThemeUtil.getThemedColor(getContext(),
            outgoing ? R.attr.message_received_background_color : R.attr.message_sent_background_color));
  }
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3103,15 +3103,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  private void updateSubtitleTextView() {
    muteIndicatorImageView.setVisibility(View.GONE);
    subtitleTextView.setVisibility(View.VISIBLE);
-    if (messageStatus != null) {
-      switch (messageStatus) {
-        case "calculatingPoW": subtitleTextView.setText("Encrypting message"); break;
-        case "contactingNetwork": subtitleTextView.setText("Tracing a path"); break;
-        case "sendingMessage": subtitleTextView.setText("Sending message"); break;
-        case "messageSent": subtitleTextView.setText("Message sent securely"); break;
-        case "messageFailed": subtitleTextView.setText("Message failed to send"); break;
-      }
-    } else if (recipient.isMuted()) {
+    if (recipient.isMuted()) {
      muteIndicatorImageView.setVisibility(View.VISIBLE);
      subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
    } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
@@ -3125,10 +3117,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      } else {
        subtitleTextView.setVisibility(View.GONE);
      }
-    } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
-      String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-      String hexEncodedPublicKey = (recipient.isLocalNumber() && ourMasterHexEncodedPublicKey != null) ? ourMasterHexEncodedPublicKey : recipient.getAddress().toPhoneString();
-      subtitleTextView.setText(hexEncodedPublicKey);
    } else {
      subtitleTextView.setVisibility(View.GONE);
    }
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -202,7 +202,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
            seedReminderView.visibility = View.GONE
        }

-        // Multiple device removal notification
+        // Multi device removal sheet
        if (!TextSecurePreferences.getHasSeenMultiDeviceRemovalSheet(this)) {
            TextSecurePreferences.setHasSeenMultiDeviceRemovalSheet(this)
            val userPublicKey = TextSecurePreferences.getLocalNumber(this)
@@ -223,7 +223,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
            }
        }

-        // Light theme introduction
+        // Light theme introduction sheet
        if (!TextSecurePreferences.hasSeenLightThemeIntroSheet(this) &&
                UiModeUtilities.isDayUiMode(this)) {
            TextSecurePreferences.setHasSeenLightThemeIntroSheet(this)
--- a/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
@@ -33,8 +33,14 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
            return TextSecurePreferences.getProfileName(context)
        } else {
            val database = databaseHelper.readableDatabase
-            return database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
+            val result = database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
                cursor.getString(cursor.getColumnIndexOrThrow(displayName))
+            } ?: return null
+            val suffix = " (...${publicKey.substring(publicKey.count() - 8)})"
+            if (result.endsWith(suffix)) {
+                return result.substring(0..(result.count() - suffix.count()))
+            } else {
+                return result
            }
        }
    }
--- a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
@@ -7,17 +7,18 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
+import android.view.WindowManager
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_seed.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
 import org.whispersystems.signalservice.loki.utilities.hexEncodedPrivateKey
-import java.io.File
+

 class SeedDialog : DialogFragment() {

--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
-import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 import java.security.MessageDigest

 object SessionMetaProtocol {
@@ -37,24 +36,16 @@ object SessionMetaProtocol {

    @JvmStatic
    fun handleProfileUpdateIfNeeded(context: Context, content: SignalServiceContent) {
-        val rawDisplayName = content.senderDisplayName.orNull() ?: return
-        if (rawDisplayName.isBlank()) { return }
+        val displayName = content.senderDisplayName.orNull() ?: return
+        if (displayName.isBlank()) { return }
        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
        val userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
        val sender = content.sender.toLowerCase()
        if (userMasterPublicKey == sender) {
            // Update the user's local name if the message came from their master device
-            TextSecurePreferences.setProfileName(context, rawDisplayName)
-        }
-        // Don't overwrite if the message came from a linked device; the device name is
-        // stored as a user name
-        val allUserDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userPublicKey)
-        if (!allUserDevices.contains(sender)) {
-            val displayName = rawDisplayName + " (..." + sender.substring(sender.length - 8) + ")"
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
-        } else {
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, rawDisplayName)
+            TextSecurePreferences.setProfileName(context, displayName)
        }
+        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
    }

    @JvmStatic
--- a/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
@@ -53,7 +53,9 @@ object MentionUtilities {
        }
        val result = SpannableString(text)
        for (mention in mentions) {
-            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(R.color.accent, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            val isLightMode = UiModeUtilities.isDayUiMode(context)
+            val colorID = if (isLightMode && isOutgoingMessage) R.color.black else R.color.accent
+            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(colorID, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
            result.setSpan(StyleSpan(Typeface.BOLD), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
        }
        return result