keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

clean

Browse Source
pull/420/head
Ryan ZHAO 4 years ago
parent a34a18f5f1
commit 2db567144d
20 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
Unescape Escape View File

@ -66,7 +66,7 @@ import org.thoughtcrime.securesms.util.SaveAttachmentTask;
import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.ViewUtil;
import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
import java.util.Collection;
import java.util.LinkedList;

2
app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
Unescape Escape View File

@ -17,7 +17,7 @@ import network.loki.messenger.R;
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.thoughtcrime.securesms.util.ResUtil;
import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan;
import org.session.libsession.utilities.color.spans.CenterAlignedRelativeSizeSpan;
public class FromTextView extends EmojiTextView {

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
Unescape Escape View File

@ -69,7 +69,6 @@ import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickList
import org.session.libsession.messaging.threads.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsSmsDatabase;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.loaders.ConversationLoader;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord;
@ -90,7 +89,7 @@ import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity;
import org.thoughtcrime.securesms.util.CommunicationActions;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.service.loki.api.opengroups.PublicChat;
import org.session.libsignal.service.loki.api.opengroups.PublicChatAPI;
@ -112,11 +111,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;
import kotlin.Unit;
import network.loki.messenger.R;
import nl.komponents.kovenant.Kovenant;
@SuppressLint("StaticFieldLeak")
public class ConversationFragment extends Fragment

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
Unescape Escape View File

@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.search.SearchRepository;
import org.thoughtcrime.securesms.search.model.MessageResult;
import org.thoughtcrime.securesms.util.CloseableLiveData;
import org.thoughtcrime.securesms.util.Debouncer;
import org.session.libsession.utilities.Debouncer;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.concurrent.SignalExecutors;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
Unescape Escape View File

@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.DatabaseContentProviders;
import org.thoughtcrime.securesms.database.model.StickerRecord;
import org.thoughtcrime.securesms.stickers.StickerSearchRepository;
import org.thoughtcrime.securesms.util.CloseableLiveData;
import org.thoughtcrime.securesms.util.Throttler;
import org.session.libsession.utilities.Throttler;
class ConversationStickerViewModel extends ViewModel {

2
app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
Unescape Escape View File

@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec;
import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec;
import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.Debouncer;
import org.session.libsession.utilities.Debouncer;
import java.util.ArrayList;
import java.util.Collections;

2
app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
Unescape Escape View File

@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory;
import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.Debouncer;
import org.session.libsession.utilities.Debouncer;
import java.util.ArrayList;
import java.util.Collections;

2
app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
Unescape Escape View File

@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
import android.text.TextUtils;
import org.thoughtcrime.securesms.net.RequestController;
import org.thoughtcrime.securesms.util.Debouncer;
import org.session.libsession.utilities.Debouncer;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;

2
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
Unescape Escape View File

@ -56,7 +56,7 @@ import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.logsubmit.util.Scrubber;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
import java.io.BufferedReader;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
Unescape Escape View File

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.loki.api.PublicChatManager;
import org.thoughtcrime.securesms.util.Debouncer;
import org.session.libsession.utilities.Debouncer;
import org.session.libsignal.service.loki.api.Poller;
import org.session.libsignal.utilities.ThreadUtils;

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
Unescape Escape View File

@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseContentProviders;
import org.thoughtcrime.securesms.database.model.StickerRecord;
import org.thoughtcrime.securesms.util.Throttler;
import org.session.libsession.utilities.Throttler;
import java.util.List;

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
Unescape Escape View File

@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.stickers.StickerKeyboardPageFragment.EventList
import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult;
import org.thoughtcrime.securesms.util.ResUtil;
import org.session.libsession.utilities.ThemeUtil;
import org.thoughtcrime.securesms.util.Throttler;
import org.session.libsession.utilities.Throttler;
import java.util.ArrayList;
import java.util.HashMap;

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
Unescape Escape View File

@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseContentProviders;
import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult;
import org.thoughtcrime.securesms.util.Throttler;
import org.session.libsession.utilities.Throttler;
final class StickerKeyboardViewModel extends ViewModel {

2
app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
Unescape Escape View File

@ -13,7 +13,7 @@ import androidx.appcompat.app.AlertDialog
import network.loki.messenger.R
import org.thoughtcrime.securesms.logging.Log
import org.thoughtcrime.securesms.mms.PartAuthority
import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask
import org.session.libsession.utilities.task.ProgressDialogAsyncTask
import java.io.File
import java.io.IOException
import java.lang.ref.WeakReference

5
app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
Unescape Escape View File

@ -9,8 +9,9 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import network.loki.messenger.R;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.ServiceUtil;
import org.session.libsignal.libsignal.logging.Log;
import org.session.libsignal.libsignal.util.guava.Function;
import org.session.libsignal.libsignal.util.guava.Optional;
@ -25,7 +26,7 @@ import java.util.Set;
public final class SubscriptionManagerCompat {
private static final String TAG = Log.tag(SubscriptionManagerCompat.class);
private static final String TAG = SubscriptionManagerCompat.class.getSimpleName();
private final Context context;

2
app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java → libsession/src/main/java/org/session/libsession/utilities/Debouncer.java
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util;
package org.session.libsession.utilities;
import android.os.Handler;

2
app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java → libsession/src/main/java/org/session/libsession/utilities/Throttler.java
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util;
package org.session.libsession.utilities;
import android.os.Handler;

2
app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java → libsession/src/main/java/org/session/libsession/utilities/color/spans/CenterAlignedRelativeSizeSpan.java
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util.spans;
package org.session.libsession.utilities.color.spans;
import androidx.annotation.NonNull;

2
app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java → libsession/src/main/java/org/session/libsession/utilities/task/ProgressDialogAsyncTask.java
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util.task;
package org.session.libsession.utilities.task;
import android.app.ProgressDialog;
import android.content.Context;

2
app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java → libsession/src/main/java/org/session/libsession/utilities/task/SnackbarAsyncTask.java
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util.task;
package org.session.libsession.utilities.task;
import android.app.ProgressDialog;
import android.os.AsyncTask;
Write Preview
Loading…
Cancel
Save