TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-08 03:01:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move files

Browse Source
This commit is contained in:
Niels Andriesse
2021-05-18 09:12:33 +10:00
parent 77f0a54aec
commit a88322a033
204 changed files with 228 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
View File

@@ -5,7 +5,7 @@ import android.hardware.Camera;
import androidx.annotation.NonNull;
import android.view.Surface;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import java.util.Collections;
import java.util.Comparator;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
View File

@@ -35,7 +35,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import network.loki.messenger.R;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.session.libsession.utilities.ServiceUtil;
import org.thoughtcrime.securesms.util.Stopwatch;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
View File

@@ -23,7 +23,7 @@ import androidx.lifecycle.ViewModelProvider;
import org.session.libsession.utilities.MediaTypes;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;

6
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
View File

@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
import org.thoughtcrime.securesms.imageeditor.model.EditorModel;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -52,8 +52,8 @@ import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.views.Stub;
import org.session.libsignal.utilities.concurrent.ListenableFuture;
import org.session.libsignal.utilities.concurrent.SettableFuture;
import org.session.libsignal.utilities.ListenableFuture;
import org.session.libsignal.utilities.SettableFuture;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
View File

@@ -10,7 +10,7 @@ import android.view.View;
import android.view.ViewGroup;
import network.loki.messenger.R;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.mms.VideoSlide;
import org.thoughtcrime.securesms.video.VideoPlayer;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
View File

@@ -12,7 +12,7 @@ import android.text.TextUtils;
import com.annimon.stream.Stream;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.mms.MediaConstraints;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.util.MediaUtil;