Merge branch 'dev'

app/build.gradle

@@ -46,11 +46,12 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
-    implementation 'androidx.activity:activity-ktx:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.3.0-beta01'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation 'androidx.activity:activity-ktx:1.2.2'
+    implementation 'androidx.fragment:fragment-ktx:1.3.2'
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.work:work-runtime-ktx:2.4.0"
 
@@ -157,8 +158,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 151
-def canonicalVersionName = "1.9.1"
+def canonicalVersionCode = 157
+def canonicalVersionName = "1.10.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/src/main/java/org/thoughtcrime/securesms/AppContext.kt

@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms
+
+import android.util.Log
+import nl.komponents.kovenant.Kovenant
+import nl.komponents.kovenant.jvm.asDispatcher
+import org.session.libsignal.utilities.ThreadUtils
+import java.util.concurrent.Executors
+
+object AppContext {
+
+    fun configureKovenant() {
+        Kovenant.context {
+            callbackContext.dispatcher = Executors.newSingleThreadExecutor().asDispatcher()
+            workerContext.dispatcher = ThreadUtils.executorPool.asDispatcher()
+            multipleCompletion = { v1, v2 ->
+                Log.d("Loki", "Promise resolved more than once (first with $v1, then with $v2); ignoring $v2.")
+            }
+        }
+    }
+}

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -30,15 +30,17 @@
 import androidx.multidex.MultiDexApplication;
 
 import org.conscrypt.Conscrypt;
-import org.session.libsession.messaging.MessagingConfiguration;
+import org.session.libsession.messaging.MessagingModuleConfiguration;
 import org.session.libsession.messaging.avatars.AvatarHelper;
+import org.session.libsession.messaging.file_server.FileServerAPI;
 import org.session.libsession.messaging.jobs.JobQueue;
-import org.session.libsession.messaging.opengroups.OpenGroupAPI;
+import org.session.libsession.messaging.mentions.MentionsManager;
+import org.session.libsession.messaging.open_groups.OpenGroupAPI;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.messaging.threads.Address;
-import org.session.libsession.snode.SnodeConfiguration;
+import org.session.libsession.snode.SnodeModule;
 import org.session.libsession.utilities.IdentityKeyUtil;
 import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.TextSecurePreferences;
@@ -47,12 +49,7 @@
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
 import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsignal.service.api.util.StreamDetails;
-import org.session.libsignal.service.loki.api.PushNotificationAPI;
-import org.session.libsignal.service.loki.api.SnodeAPI;
-import org.session.libsignal.service.loki.api.SwarmAPI;
-import org.session.libsignal.service.loki.api.fileserver.FileServerAPI;
-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol;
-import org.session.libsignal.service.loki.utilities.mentions.MentionsManager;
+import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol;
 import org.session.libsignal.utilities.logging.Log;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
@@ -106,6 +103,7 @@
 import kotlin.Unit;
 import kotlinx.coroutines.Job;
 import network.loki.messenger.BuildConfig;
+import nl.komponents.kovenant.Kovenant;
 
 import static nl.komponents.kovenant.android.KovenantAndroid.startKovenant;
 import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
@@ -166,24 +164,22 @@ public void onCreate() {
         ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
         // Loki
         // ========
+        AppContext.INSTANCE.configureKovenant();
         messageNotifier = new OptimizedMessageNotifier(new DefaultMessageNotifier());
         broadcaster = new Broadcaster(this);
         threadNotificationHandler = new Handler(Looper.getMainLooper());
         LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
         LokiThreadDatabase threadDB = DatabaseFactory.getLokiThreadDatabase(this);
         LokiUserDatabase userDB = DatabaseFactory.getLokiUserDatabase(this);
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);
-        MessagingConfiguration.Companion.configure(this,
+        MessagingModuleConfiguration.Companion.configure(this,
                 DatabaseFactory.getStorage(this),
                 DatabaseFactory.getAttachmentProvider(this),
                 new SessionProtocolImpl(this));
-        SnodeConfiguration.Companion.configure(apiDB, broadcaster);
+        SnodeModule.Companion.configure(apiDB, broadcaster);
         if (userPublicKey != null) {
-            SwarmAPI.Companion.configureIfNeeded(apiDB);
-            SnodeAPI.Companion.configureIfNeeded(userPublicKey, apiDB, broadcaster);
-            MentionsManager.Companion.configureIfNeeded(userPublicKey, threadDB, userDB);
+            MentionsManager.Companion.configureIfNeeded(userPublicKey, userDB);
         }
-        PushNotificationAPI.Companion.configureIfNeeded(BuildConfig.DEBUG);
         setUpStorageAPIIfNeeded();
         resubmitProfilePictureIfNeeded();
         publicChatManager = new PublicChatManager(this);
@@ -428,7 +424,6 @@ public boolean setUpStorageAPIIfNeeded() {
         byte[] userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(this).getPrivateKey().serialize();
         LokiAPIDatabaseProtocol apiDB = DatabaseFactory.getLokiAPIDatabase(this);
         FileServerAPI.Companion.configure(userPublicKey, userPrivateKey, apiDB);
-        org.session.libsession.messaging.fileserver.FileServerAPI.Companion.configure(userPublicKey, userPrivateKey, apiDB);
         return true;
     }
 
@@ -458,13 +453,10 @@ private void setUpPollingIfNeeded() {
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);
         if (userPublicKey == null) return;
         if (poller != null) {
-            SnodeAPI.shared.setUserPublicKey(userPublicKey);
             poller.setUserPublicKey(userPublicKey);
             return;
         }
         LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
-        SwarmAPI.Companion.configureIfNeeded(apiDB);
-        SnodeAPI.Companion.configureIfNeeded(userPublicKey, apiDB, broadcaster);
         poller = new Poller();
         closedGroupPoller = new ClosedGroupPoller();
     }

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -9,7 +9,7 @@
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.session.libsignal.libsignal.util.guava.Optional;
 
-import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
+import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.threads.Address;
 import org.session.libsession.messaging.threads.recipients.Recipient;
 

app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -52,6 +52,8 @@
 import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
 import com.google.android.material.tabs.TabLayout;
 
+import org.session.libsession.messaging.messages.control.DataExtractionNotification;
+import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
@@ -351,13 +353,29 @@ protected void onPostExecute(List<SaveAttachmentTask.Attachment> attachments) {
                       saveTask.executeOnExecutor(THREAD_POOL_EXECUTOR,
                               attachments.toArray(new SaveAttachmentTask.Attachment[attachments.size()]));
                       actionMode.finish();
+                      // Sending a Data extraction notification (for incoming attachments only)
+                      boolean containsIncoming = mediaRecords.parallelStream().anyMatch(m -> !m.isOutgoing());
+                      if (containsIncoming) {
+                        //TODO uncomment line below when Data extraction will be activated
+                        //sendMediaSavedNotificationIfNeeded();
+                      }
                     }
                   }.execute();
                 })
                 .execute();
       }, mediaRecords.size());
     }
 
+    /**
+     * Send a MediaSaved notification to the recipient
+     */
+    private void sendMediaSavedNotificationIfNeeded() {
+      // we don't send media saved notification for groups
+      if (recipient.isGroupRecipient()) return;
+      DataExtractionNotification message = new DataExtractionNotification(new DataExtractionNotification.Kind.MediaSaved(System.currentTimeMillis()));
+      MessageSender.send(message, recipient.getAddress());
+    }
+
     @SuppressLint("StaticFieldLeak")
     private void handleDeleteMedia(@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords) {
       int recordCount       = mediaRecords.size();

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -39,7 +39,8 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import org.session.libsession.messaging.messages.control.DataExtractionNotification;
+import org.session.libsession.messaging.sending_receiving.MessageSender;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -52,7 +53,6 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
 import org.session.libsession.messaging.threads.Address;
 import org.session.libsession.messaging.threads.recipients.Recipient;
@@ -352,11 +352,26 @@ private void saveToDisk() {
                 saveTask.executeOnExecutor(
                         AsyncTask.THREAD_POOL_EXECUTOR,
                         new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
+                // Sending a Data extraction notification (for incoming attachments only)
+                if(!mediaItem.outgoing) {
+                  //TODO uncomment line below when Data extraction will be activated
+                  //sendMediaSavedNotificationIfNeeded();
+                }
               })
               .execute();
     });
   }
 
+  /**
+   * Send a MediaSaved notification to the recipient
+   */
+  private void sendMediaSavedNotificationIfNeeded() {
+    // we don't send media saved notification for groups
+    if (conversationRecipient.isGroupRecipient()) return;
+    DataExtractionNotification message = new DataExtractionNotification(new DataExtractionNotification.Kind.MediaSaved(System.currentTimeMillis()));
+    MessageSender.send(message, conversationRecipient.getAddress());
+  }
+
   @SuppressLint("StaticFieldLeak")
   private void deleteMedia() {
     MediaItem mediaItem = getCurrentMediaItem();

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -40,6 +40,7 @@
 import org.session.libsession.messaging.messages.visible.LinkPreview;
 import org.session.libsession.messaging.messages.visible.Quote;
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
+import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
@@ -64,7 +65,6 @@
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.Util;
 import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.service.loki.api.opengroups.PublicChat;
 
 import java.lang.ref.WeakReference;
 import java.sql.Date;
@@ -263,7 +263,7 @@ private void updateRecipients(MessageRecord messageRecord, Recipient recipient,
     }
     toFrom.setText(toFromRes);
     long threadID = messageRecord.getThreadId();
-    PublicChat openGroup = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadID);
+    OpenGroup openGroup = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadID);
     if (openGroup != null && messageRecord.isOutgoing()) {
       toFrom.setVisibility(View.GONE);
       separator.setVisibility(View.GONE);

app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -84,6 +84,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
       }
       @Override
       public void onServiceDisconnected(ComponentName name) {
+        keyCachingService.setMasterSecret(new Object());
         keyCachingService = null;
       }
     }, Context.BIND_AUTO_CREATE);
@@ -133,7 +134,9 @@ public void onActivityResult(int requestCode, int resultcode, Intent data) {
   private void handleAuthenticated() {
     authenticated = true;
     //TODO Replace with a proper call.
-    keyCachingService.setMasterSecret(new Object());
+    if (keyCachingService != null) {
+      keyCachingService.setMasterSecret(new Object());
+    }
 
     // Finish and proceed with the next intent.
     Intent nextIntent = getIntent().getParcelableExtra("next_intent");
@@ -188,6 +191,8 @@ private void resumeScreenLock() {
 
     if (!keyguardManager.isKeyguardSecure()) {
       Log.w(TAG ,"Keyguard not secure...");
+      TextSecurePreferences.setScreenLockEnabled(getApplicationContext(), false);
+      TextSecurePreferences.setScreenLockTimeout(getApplicationContext(), 0);
       handleAuthenticated();
       return;
     }

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -5,6 +5,7 @@ import android.text.TextUtils
 import com.google.protobuf.ByteString
 import org.greenrobot.eventbus.EventBus
 import org.session.libsession.database.MessageDataProvider
+import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.attachments.*
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
@@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.IOException
 import java.io.InputStream
 
-
 class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), MessageDataProvider {
 
     override fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream? {
@@ -104,6 +104,10 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         return smsDatabase.isOutgoingMessage(timestamp) || mmsDatabase.isOutgoingMessage(timestamp)
     }
 
+    override fun getOpenGroup(threadID: Long): OpenGroup? {
+        return null // TODO: Implement
+    }
+
     override fun updateAttachmentAfterUploadSucceeded(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: DotNetAPI.UploadResult) {
         val database = DatabaseFactory.getAttachmentDatabase(context)
         val databaseAttachment = getDatabaseAttachment(attachmentId) ?: return
@@ -133,9 +137,20 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         return openGroupMessagingDatabase.getMessageID(serverID)
     }
 
-    override fun deleteMessage(messageID: Long) {
-        val messagingDatabase = DatabaseFactory.getSmsDatabase(context)
-        messagingDatabase.deleteMessage(messageID)
+    override fun getMessageID(serverId: Long, threadId: Long): Pair<Long, Boolean>? {
+        val messageDB = DatabaseFactory.getLokiMessageDatabase(context)
+        return messageDB.getMessageID(serverId, threadId)
+    }
+
+    override fun deleteMessage(messageID: Long, isSms: Boolean) {
+        if (isSms) {
+            val db = DatabaseFactory.getSmsDatabase(context)
+            db.deleteMessage(messageID)
+        } else {
+            val db = DatabaseFactory.getMmsDatabase(context)
+            db.delete(messageID)
+        }
+        DatabaseFactory.getLokiMessageDatabase(context).deleteMessage(messageID, isSms)
     }
 
     override fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment? {

app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -30,7 +30,7 @@
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 
-import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
+import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
 import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java

@@ -17,7 +17,7 @@
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 
-import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
+import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 
 import network.loki.messenger.R;
 import okhttp3.HttpUrl;

app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -21,6 +21,7 @@
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -35,7 +36,6 @@
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.ThemeUtil;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.service.loki.api.opengroups.PublicChat;
 
 import java.util.List;
 
@@ -201,7 +201,7 @@ private void setQuoteAuthor(@NonNull Recipient author) {
 
     long threadID = DatabaseFactory.getThreadDatabase(getContext()).getOrCreateThreadIdFor(conversationRecipient);
     String senderHexEncodedPublicKey = author.getAddress().serialize();
-    PublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(getContext()).getPublicChat(threadID);
+    OpenGroup publicChat = DatabaseFactory.getLokiThreadDatabase(getContext()).getPublicChat(threadID);
     if (senderHexEncodedPublicKey.equalsIgnoreCase(TextSecurePreferences.getLocalNumber(getContext()))) {
       quoteeDisplayName = TextSecurePreferences.getProfileName(getContext());
     } else if (publicChat != null) {