clean

libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupAPI.kt

@@ -9,15 +9,12 @@ import org.session.libsession.messaging.MessagingConfiguration
 
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsession.messaging.fileserver.FileServerAPI
-import org.session.libsignal.service.loki.utilities.ThreadUtils
-import org.session.libsession.utilities.createContext
 
 import org.session.libsignal.libsignal.logging.Log
-import org.session.libsignal.utilities.Hex
-import org.session.libsignal.utilities.Base64
-import org.session.libsignal.utilities.JsonUtil
+import org.session.libsignal.utilities.*
 import org.session.libsignal.service.loki.utilities.DownloadUtilities
 import org.session.libsignal.service.loki.utilities.retryIfNeeded
+import org.session.libsignal.utilities.Base64
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
 import java.util.*

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt

@@ -10,7 +10,7 @@ import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.snode.SnodeAPI
-import org.session.libsession.utilities.successBackground
+import org.session.libsignal.utilities.successBackground
 
 import org.session.libsignal.libsignal.logging.Log
 import org.session.libsignal.utilities.Base64

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt

@@ -11,9 +11,8 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.opengroups.OpenGroup
 import org.session.libsession.messaging.opengroups.OpenGroupAPI
 import org.session.libsession.messaging.opengroups.OpenGroupMessage
-import org.session.libsession.utilities.GroupUtil
-import org.session.libsession.utilities.successBackground
 
+import org.session.libsignal.utilities.successBackground
 import org.session.libsignal.libsignal.logging.Log
 import org.session.libsignal.service.internal.push.SignalServiceProtos.*
 

libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt

@@ -26,6 +26,7 @@ import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.JsonUtil
 import org.session.libsignal.service.loki.api.utilities.HTTP
 import org.session.libsignal.service.loki.utilities.*
+import org.session.libsignal.utilities.*
 import org.session.libsignal.utilities.Base64
 
 import java.io.File

libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt

@@ -9,12 +9,12 @@ import okhttp3.Request
 import org.session.libsession.utilities.AESGCM
 import org.session.libsignal.libsignal.logging.Log
 import org.session.libsignal.utilities.Base64
-import org.session.libsignal.utilities.JsonUtil
+import org.session.libsignal.utilities.*
 import org.session.libsignal.service.loki.api.*
 import org.session.libsignal.service.loki.api.fileserver.FileServerAPI
 import org.session.libsignal.service.loki.api.utilities.*
 import org.session.libsession.utilities.AESGCM.EncryptionResult
-import org.session.libsignal.service.loki.utilities.ThreadUtils
+import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsession.utilities.getBodyForOnionRequest
 import org.session.libsession.utilities.getHeadersForOnionRequest
 import org.session.libsignal.service.loki.utilities.*

libsession/src/main/java/org/session/libsession/snode/OnionRequestEncryption.kt

@@ -5,7 +5,7 @@ import nl.komponents.kovenant.deferred
 import org.session.libsignal.utilities.JsonUtil
 import org.session.libsession.utilities.AESGCM.EncryptionResult
 import org.session.libsession.utilities.AESGCM
-import org.session.libsignal.service.loki.utilities.ThreadUtils
+import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsignal.service.loki.utilities.toHexString
 import java.nio.Buffer
 import java.nio.ByteBuffer

libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt

@@ -7,13 +7,12 @@ import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.functional.map
 
 import org.session.libsession.snode.utilities.getRandomElement
-import org.session.libsignal.service.loki.utilities.ThreadUtils
-import org.session.libsession.utilities.createContext
 
 import org.session.libsignal.libsignal.logging.Log
 import org.session.libsignal.service.loki.api.utilities.HTTP
 import org.session.libsignal.service.loki.utilities.prettifiedDescription
 import org.session.libsignal.service.loki.utilities.retryIfNeeded
+import org.session.libsignal.utilities.*
 
 import java.security.SecureRandom
 

libsession/src/main/java/org/session/libsession/utilities/PromiseUtilities.kt

@@ -1,73 +0,0 @@
-@file:JvmName("PromiseUtilities")
-package org.session.libsession.utilities
-
-import nl.komponents.kovenant.Context
-import nl.komponents.kovenant.Kovenant
-import nl.komponents.kovenant.Promise
-import nl.komponents.kovenant.deferred
-import nl.komponents.kovenant.jvm.asDispatcher
-import org.session.libsignal.libsignal.logging.Log
-import org.session.libsignal.service.loki.utilities.ThreadUtils
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeoutException
-
-fun Kovenant.createContext(): Context {
-    return createContext {
-        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.")
-        }
-    }
-}
-
-fun <V, E : Throwable> Promise<V, E>.get(defaultValue: V): V {
-    return try {
-        get()
-    } catch (e: Exception) {
-        defaultValue
-    }
-}
-
-fun <V, E : Throwable> Promise<V, E>.recover(callback: (exception: E) -> V): Promise<V, E> {
-    val deferred = deferred<V, E>()
-    success {
-        deferred.resolve(it)
-    }.fail {
-        try {
-            val value = callback(it)
-            deferred.resolve(value)
-        } catch (e: Throwable) {
-            deferred.reject(it)
-        }
-    }
-    return deferred.promise
-}
-
-fun <V, E> Promise<V, E>.successBackground(callback: (value: V) -> Unit): Promise<V, E> {
-    ThreadUtils.queue {
-        try {
-            callback(get())
-        } catch (e: Exception) {
-            Log.d("Loki", "Failed to execute task in background: ${e.message}.")
-        }
-    }
-    return this
-}
-
-fun <V> Promise<V, Exception>.timeout(millis: Long): Promise<V, Exception> {
-    if (this.isDone()) { return this; }
-    val deferred = deferred<V, Exception>()
-    ThreadUtils.queue {
-        Thread.sleep(millis)
-        if (!deferred.promise.isDone()) {
-            deferred.reject(TimeoutException("Promise timed out."))
-        }
-    }
-    this.success {
-        if (!deferred.promise.isDone()) { deferred.resolve(it) }
-    }.fail {
-        if (!deferred.promise.isDone()) { deferred.reject(it) }
-    }
-    return deferred.promise
-}

libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java

@@ -39,8 +39,8 @@ import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
-import org.session.libsession.utilities.concurrent.ListenableFuture;
-import org.session.libsession.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.concurrent.SettableFuture;
 import org.session.libsession.utilities.views.Stub;
 
 public class ViewUtil {

libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java

@@ -1,6 +1,6 @@
 package org.session.libsession.utilities.concurrent;
 
-import org.session.libsession.utilities.concurrent.ListenableFuture.Listener;
+import org.session.libsignal.utilities.concurrent.ListenableFuture.Listener;
 
 import java.util.concurrent.ExecutionException;
 

libsession/src/main/java/org/session/libsession/utilities/concurrent/ListenableFuture.java

@@ -1,13 +0,0 @@
-package org.session.libsession.utilities.concurrent;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-public interface ListenableFuture<T> extends Future<T> {
-  void addListener(Listener<T> listener);
-
-  public interface Listener<T> {
-    public void onSuccess(T result);
-    public void onFailure(ExecutionException e);
-  }
-}

libsession/src/main/java/org/session/libsession/utilities/concurrent/SettableFuture.java

@@ -1,136 +0,0 @@
-package org.session.libsession.utilities.concurrent;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class SettableFuture<T> implements ListenableFuture<T> {
-
-  private final List<Listener<T>> listeners = new LinkedList<>();
-
-  private          boolean   completed;
-  private          boolean   canceled;
-  private volatile T         result;
-  private volatile Throwable exception;
-
-  public SettableFuture() { }
-
-  public SettableFuture(T value) {
-    this.result    = value;
-    this.completed = true;
-  }
-
-  @Override
-  public synchronized boolean cancel(boolean mayInterruptIfRunning) {
-    if (!completed && !canceled) {
-      canceled = true;
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public synchronized boolean isCancelled() {
-    return canceled;
-  }
-
-  @Override
-  public synchronized boolean isDone() {
-    return completed;
-  }
-
-  public boolean set(T result) {
-    synchronized (this) {
-      if (completed || canceled) return false;
-
-      this.result    = result;
-      this.completed = true;
-
-      notifyAll();
-    }
-
-    notifyAllListeners();
-    return true;
-  }
-
-  public boolean setException(Throwable throwable) {
-    synchronized (this) {
-      if (completed || canceled) return false;
-
-      this.exception = throwable;
-      this.completed = true;
-
-      notifyAll();
-    }
-
-    notifyAllListeners();
-    return true;
-  }
-
-  public void deferTo(ListenableFuture<T> other) {
-    other.addListener(new Listener<T>() {
-      @Override
-      public void onSuccess(T result) {
-        SettableFuture.this.set(result);
-      }
-
-      @Override
-      public void onFailure(ExecutionException e) {
-        SettableFuture.this.setException(e.getCause());
-      }
-    });
-  }
-
-  @Override
-  public synchronized T get() throws InterruptedException, ExecutionException {
-    while (!completed) wait();
-
-    if (exception != null) throw new ExecutionException(exception);
-    else                   return result;
-  }
-
-  @Override
-  public synchronized T get(long timeout, TimeUnit unit)
-      throws InterruptedException, ExecutionException, TimeoutException
-  {
-    long startTime = System.currentTimeMillis();
-
-    while (!completed && System.currentTimeMillis() - startTime > unit.toMillis(timeout)) {
-      wait(unit.toMillis(timeout));
-    }
-
-    if (!completed) throw new TimeoutException();
-    else            return get();
-  }
-
-  @Override
-  public void addListener(Listener<T> listener) {
-    synchronized (this) {
-      listeners.add(listener);
-
-      if (!completed) return;
-    }
-
-    notifyListener(listener);
-  }
-
-  private void notifyAllListeners() {
-    List<Listener<T>> localListeners;
-
-    synchronized (this) {
-      localListeners = new LinkedList<>(listeners);
-    }
-
-    for (Listener<T> listener : localListeners) {
-      notifyListener(listener);
-    }
-  }
-
-  private void notifyListener(Listener<T> listener) {
-    if (exception != null) listener.onFailure(new ExecutionException(exception));
-    else                   listener.onSuccess(result);
-  }
-}