TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

final cleaning up

Browse Source
This commit is contained in:
Ryan ZHAO 2021-02-23 17:00:30 +11:00
parent 704ab37cad
commit 2bb07c8a38
7 changed files with 4 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/AndroidManifest.xml
View File

@ -341,17 +341,6 @@
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat" />
<activity
android:name="org.thoughtcrime.securesms.ClearProfileAvatarActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:icon="@drawable/clear_profile_avatar"
android:label="@string/AndroidManifest_remove_photo"
android:theme="@style/Theme.AppCompat.Dialog.Alert">
<intent-filter>
<action android:name="network.loki.securesms.action.CLEAR_PROFILE_PHOTO" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="org.thoughtcrime.securesms.ShortcutLauncherActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

17
app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
View File

@ -1,17 +0,0 @@
package org.thoughtcrime.securesms;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.model.ThreadRecord;
import org.thoughtcrime.securesms.mms.GlideRequests;
import java.util.Locale;
import java.util.Set;
public interface BindableConversationListItem extends Unbindable {
public void bind(@NonNull ThreadRecord thread,
@NonNull GlideRequests glideRequests, @NonNull Locale locale,
@NonNull Set<Long> typingThreads,
@NonNull Set<Long> selectedThreads, boolean batchMode);
}

28
app/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
View File

@ -1,28 +0,0 @@
package org.thoughtcrime.securesms;
import android.app.Activity;
import android.content.Intent;
import androidx.appcompat.app.AlertDialog;
import network.loki.messenger.R;
public class ClearProfileAvatarActivity extends Activity {
@Override
public void onResume() {
super.onResume();
new AlertDialog.Builder(this)
.setTitle(R.string.ClearProfileActivity_remove_profile_photo)
.setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
.setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
Intent result = new Intent();
result.putExtra("delete", true);
setResult(Activity.RESULT_OK, result);
finish();
})
.show();
}
}

348
app/src/main/java/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
View File

@ -48,106 +48,13 @@ import network.loki.messenger.R;
public class DatabaseUpgradeActivity extends BaseActivity {
private static final String TAG = DatabaseUpgradeActivity.class.getSimpleName();
// public static final int NO_MORE_KEY_EXCHANGE_PREFIX_VERSION = 0; // 46
// public static final int MMS_BODY_VERSION = 0; // 46
// public static final int TOFU_IDENTITIES_VERSION = 1; // 50
// public static final int CURVE25519_VERSION = 2; // 63
// public static final int ASYMMETRIC_MASTER_SECRET_FIX_VERSION = 3; // 73
// public static final int NO_V1_VERSION = 4; // 83
// public static final int SIGNED_PREKEY_VERSION = 4; // 83
// public static final int NO_DECRYPT_QUEUE_VERSION = 5; // 113
// public static final int PUSH_DECRYPT_SERIAL_ID_VERSION = 6; // 131
// public static final int MIGRATE_SESSION_PLAINTEXT = 7; // 136
// public static final int CONTACTS_ACCOUNT_VERSION = 7; // 136
// public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION = 8; // 151
// public static final int REDPHONE_SUPPORT_VERSION = 9; // 157
// public static final int NO_MORE_CANONICAL_DB_VERSION = 10; // 276
// public static final int PROFILES = 11; // 289
// public static final int SCREENSHOTS = 12; // 300
// public static final int PERSISTENT_BLOBS = 13; // 317
// public static final int INTERNALIZE_CONTACTS = 13; // 317
// public static final int SQLCIPHER = 14; // 334
// public static final int SQLCIPHER_COMPLETE = 15; // 352
// public static final int REMOVE_JOURNAL = 16; // 353
// public static final int REMOVE_CACHE = 17; // 354
// public static final int FULL_TEXT_SEARCH = 18; // 358
// public static final int BAD_IMPORT_CLEANUP = 19; // 373
// public static final int IMAGE_CACHE_CLEANUP = 20; // 406
// public static final int WORKMANAGER_MIGRATION = 21; // 408
// public static final int COLOR_MIGRATION = 22; // 412
// public static final int UNIDENTIFIED_DELIVERY = 23; // 422
// public static final int SIGNALING_KEY_DEPRECATION = 24; // 447
// public static final int CONVERSATION_SEARCH = 25; // 455
private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
// add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
// add(TOFU_IDENTITIES_VERSION);
// add(CURVE25519_VERSION);
// add(ASYMMETRIC_MASTER_SECRET_FIX_VERSION);
// add(NO_V1_VERSION);
// add(SIGNED_PREKEY_VERSION);
// add(NO_DECRYPT_QUEUE_VERSION);
// add(PUSH_DECRYPT_SERIAL_ID_VERSION);
// add(MIGRATE_SESSION_PLAINTEXT);
// add(MEDIA_DOWNLOAD_CONTROLS_VERSION);
// add(REDPHONE_SUPPORT_VERSION);
// add(NO_MORE_CANONICAL_DB_VERSION);
// add(SCREENSHOTS);
// add(INTERNALIZE_CONTACTS);
// add(PERSISTENT_BLOBS);
// add(SQLCIPHER);
// add(SQLCIPHER_COMPLETE);
// add(REMOVE_CACHE);
// add(FULL_TEXT_SEARCH);
// add(BAD_IMPORT_CLEANUP);
// add(IMAGE_CACHE_CLEANUP);
// add(WORKMANAGER_MIGRATION);
// add(COLOR_MIGRATION);
// add(UNIDENTIFIED_DELIVERY);
// add(SIGNALING_KEY_DEPRECATION);
// add(CONVERSATION_SEARCH);
}};
// private MasterSecret masterSecret;
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
// this.masterSecret = KeyCachingService.getMasterSecret(this);
if (needsUpgradeTask()) {
Log.i("DatabaseUpgradeActivity", "Upgrading...");
setContentView(R.layout.database_upgrade_activity);
ProgressBar indeterminateProgress = findViewById(R.id.indeterminate_progress);
ProgressBar determinateProgress = findViewById(R.id.determinate_progress);
new DatabaseUpgradeTask(indeterminateProgress, determinateProgress)
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, VersionTracker.getLastSeenVersion(this));
} else {
VersionTracker.updateLastSeenVersion(this);
updateNotifications(this);
startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
finish();
}
}
private boolean needsUpgradeTask() {
int currentVersionCode = Util.getCanonicalVersionCode();
int lastSeenVersion = VersionTracker.getLastSeenVersion(this);
Log.i("DatabaseUpgradeActivity", "LastSeenVersion: " + lastSeenVersion);
if (lastSeenVersion >= currentVersionCode)
return false;
for (int version : UPGRADE_VERSIONS) {
Log.i("DatabaseUpgradeActivity", "Comparing: " + version);
if (lastSeenVersion < version)
return true;
}
return false;
VersionTracker.updateLastSeenVersion(this);
updateNotifications(this);
startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
finish();
}
public static boolean isUpdate(Context context) {
@ -167,251 +74,4 @@ public class DatabaseUpgradeActivity extends BaseActivity {
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
public interface DatabaseUpgradeListener {
public void setProgress(int progress, int total);
}
@SuppressLint("StaticFieldLeak")
private class DatabaseUpgradeTask extends AsyncTask<Integer, Double, Void>
implements DatabaseUpgradeListener
{
private final ProgressBar indeterminateProgress;
private final ProgressBar determinateProgress;
DatabaseUpgradeTask(ProgressBar indeterminateProgress, ProgressBar determinateProgress) {
this.indeterminateProgress = indeterminateProgress;
this.determinateProgress = determinateProgress;
}
@Override
protected Void doInBackground(Integer... params) {
Context context = DatabaseUpgradeActivity.this.getApplicationContext();
Log.i("DatabaseUpgradeActivity", "Running background upgrade..");
// DatabaseFactory.getInstance(DatabaseUpgradeActivity.this)
// .onApplicationLevelUpgrade(context, params[0], this);
// if (params[0] < CURVE25519_VERSION) {
// IdentityKeyUtil.migrateIdentityKeys(context, masterSecret);
// }
//
// if (params[0] < NO_V1_VERSION) {
// File v1sessions = new File(context.getFilesDir(), "sessions");
//
// if (v1sessions.exists() && v1sessions.isDirectory()) {
// File[] contents = v1sessions.listFiles();
//
// if (contents != null) {
// for (File session : contents) {
// session.delete();
// }
// }
//
// v1sessions.delete();
// }
// }
//
// if (params[0] < SIGNED_PREKEY_VERSION) {
//// ApplicationContext.getInstance(getApplicationContext())
//// .getJobManager()
//// .add(new CreateSignedPreKeyJob(context));
// }
//
// if (params[0] < NO_DECRYPT_QUEUE_VERSION) {
// scheduleMessagesInPushDatabase(context);
// }
//
// if (params[0] < PUSH_DECRYPT_SERIAL_ID_VERSION) {
// scheduleMessagesInPushDatabase(context);
// }
//
// if (params[0] < MIGRATE_SESSION_PLAINTEXT) {
//// new TextSecureSessionStore(context, masterSecret).migrateSessions();
//// new TextSecurePreKeyStore(context, masterSecret).migrateRecords();
//
// IdentityKeyUtil.migrateIdentityKeys(context, masterSecret);
// scheduleMessagesInPushDatabase(context);;
// }
//
// if (params[0] < MEDIA_DOWNLOAD_CONTROLS_VERSION) {
// schedulePendingIncomingParts(context);
// }
//
// if (params[0] < REDPHONE_SUPPORT_VERSION) {
// ApplicationContext.getInstance(getApplicationContext())
// .getJobManager()
// .add(new RefreshAttributesJob());
// }
//
// if (params[0] < SCREENSHOTS) {
// boolean screenSecurity = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(TextSecurePreferences.SCREEN_SECURITY_PREF, true);
// TextSecurePreferences.setScreenSecurityEnabled(getApplicationContext(), screenSecurity);
// }
//
// if (params[0] < PERSISTENT_BLOBS) {
// File externalDir = context.getExternalFilesDir(null);
//
// if (externalDir != null && externalDir.isDirectory() && externalDir.exists()) {
// for (File blob : externalDir.listFiles()) {
// if (blob.exists() && blob.isFile()) blob.delete();
// }
// }
// }
//
// if (params[0] < INTERNALIZE_CONTACTS) {
// if (TextSecurePreferences.isPushRegistered(getApplicationContext())) {
// TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(getApplicationContext(), true);
// }
// }
//
// if (params[0] < SQLCIPHER) {
// scheduleMessagesInPushDatabase(context);
// }
//
// if (params[0] < SQLCIPHER_COMPLETE) {
// File file = context.getDatabasePath("messages.db");
// if (file != null && file.exists()) file.delete();
// }
//
// if (params[0] < REMOVE_JOURNAL) {
// File file = context.getDatabasePath("messages.db-journal");
// if (file != null && file.exists()) file.delete();
// }
//
// if (params[0] < REMOVE_CACHE) {
// try {
// FileUtils.deleteDirectoryContents(context.getCacheDir());
// } catch (IOException e) {
// Log.w(TAG, e);
// }
// }
//
// if (params[0] < IMAGE_CACHE_CLEANUP) {
// try {
// FileUtils.deleteDirectoryContents(context.getExternalCacheDir());
// GlideApp.get(context).clearDiskCache();
// } catch (IOException e) {
// Log.w(TAG, e);
// }
// }
//
// // This migration became unnecessary after switching away from WorkManager
//// if (params[0] < WORKMANAGER_MIGRATION) {
//// Log.i(TAG, "Beginning migration of existing jobs to WorkManager");
////
//// JobManager jobManager = ApplicationContext.getInstance(getApplicationContext()).getJobManager();
//// PersistentStorage storage = new PersistentStorage(getApplicationContext(), "TextSecureJobs", new JavaJobSerializer());
////
//// for (Job job : storage.getAllUnencrypted()) {
//// jobManager.add(job);
//// Log.i(TAG, "Migrated job with class '" + job.getClass().getSimpleName() + "' to run on new JobManager.");
//// }
//// }
//
// if (params[0] < COLOR_MIGRATION) {
// long startTime = System.currentTimeMillis();
// DatabaseFactory.getRecipientDatabase(context).updateSystemContactColors((name, color) -> {
// if (color != null) {
// try {
// return MaterialColor.fromSerialized(color);
// } catch (MaterialColor.UnknownColorException e) {
// Log.w(TAG, "Encountered an unknown color during legacy color migration.", e);
// return ContactColorsLegacy.generateFor(name);
// }
// }
// return ContactColorsLegacy.generateFor(name);
// });
// Log.i(TAG, "Color migration took " + (System.currentTimeMillis() - startTime) + " ms");
// }
//
// if (params[0] < UNIDENTIFIED_DELIVERY) {
// if (TextSecurePreferences.isMultiDevice(context)) {
// Log.i(TAG, "MultiDevice: Disabling UD (will be re-enabled if possible after pending refresh).");
// TextSecurePreferences.setIsUnidentifiedDeliveryEnabled(context, false);
// }
//
// Log.i(TAG, "Scheduling UD attributes refresh.");
// ApplicationContext.getInstance(context)
// .getJobManager()
// .add(new RefreshAttributesJob());
// }
//
// if (params[0] < SIGNALING_KEY_DEPRECATION) {
// Log.i(TAG, "Scheduling a RefreshAttributesJob to remove the signaling key remotely.");
// ApplicationContext.getInstance(context)
// .getJobManager()
// .add(new RefreshAttributesJob());
// }
return null;
}
private void schedulePendingIncomingParts(Context context) {
final AttachmentDatabase attachmentDb = DatabaseFactory.getAttachmentDatabase(context);
final MmsDatabase mmsDb = DatabaseFactory.getMmsDatabase(context);
final List<DatabaseAttachment> pendingAttachments = DatabaseFactory.getAttachmentDatabase(context).getPendingAttachments();
Log.i(TAG, pendingAttachments.size() + " pending parts.");
for (DatabaseAttachment attachment : pendingAttachments) {
final Reader reader = mmsDb.readerFor(mmsDb.getMessage(attachment.getMmsId()));
final MessageRecord record = reader.getNext();
if (attachment.hasData()) {
Log.i(TAG, "corrected a pending media part " + attachment.getAttachmentId() + "that already had data.");
attachmentDb.setTransferState(attachment.getMmsId(), attachment.getAttachmentId(), AttachmentDatabase.TRANSFER_PROGRESS_DONE);
} else if (record != null && !record.isOutgoing() && record.isPush()) {
Log.i(TAG, "queuing new attachment download job for incoming push part " + attachment.getAttachmentId() + ".");
ApplicationContext.getInstance(context)
.getJobManager()
.add(new AttachmentDownloadJob(attachment.getMmsId(), attachment.getAttachmentId(), false));
}
reader.close();
}
}
private void scheduleMessagesInPushDatabase(Context context) {
PushDatabase pushDatabase = DatabaseFactory.getPushDatabase(context);
Cursor pushReader = null;
try {
pushReader = pushDatabase.getPending();
while (pushReader != null && pushReader.moveToNext()) {
ApplicationContext.getInstance(getApplicationContext())
.getJobManager()
.add(new PushDecryptJob(getApplicationContext(),
pushReader.getLong(pushReader.getColumnIndexOrThrow(PushDatabase.ID))));
}
} finally {
if (pushReader != null)
pushReader.close();
}
}
@Override
protected void onProgressUpdate(Double... update) {
indeterminateProgress.setVisibility(View.GONE);
determinateProgress.setVisibility(View.VISIBLE);
double scaler = update[0];
determinateProgress.setProgress((int)Math.floor(determinateProgress.getMax() * scaler));
}
@Override
protected void onPostExecute(Void result) {
VersionTracker.updateLastSeenVersion(DatabaseUpgradeActivity.this);
updateNotifications(DatabaseUpgradeActivity.this);
startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
finish();
}
@Override
public void setProgress(int progress, int total) {
publishProgress(((double)progress / (double)total));
}
}
}

57
app/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
View File

@ -1,57 +0,0 @@
package org.thoughtcrime.securesms;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import network.loki.messenger.R;
public class LinkPreviewsIntroFragment extends Fragment {
private Controller controller;
public static LinkPreviewsIntroFragment newInstance() {
LinkPreviewsIntroFragment fragment = new LinkPreviewsIntroFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
public LinkPreviewsIntroFragment() {}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (!(getActivity() instanceof Controller)) {
throw new IllegalStateException("Parent activity must implement the Controller interface.");
}
controller = (Controller) getActivity();
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.experience_upgrade_link_previews_fragment, container, false);
view.findViewById(R.id.experience_ok_button).setOnClickListener(v -> {
controller.onLinkPreviewsFinished();
});
return view;
}
public interface Controller {
void onLinkPreviewsFinished();
}
}

7
app/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java
View File

@ -1,7 +0,0 @@
package org.thoughtcrime.securesms;
public class TextSecureExpiredException extends Exception {
public TextSecureExpiredException(String message) {
super(message);
}
}

69
app/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
View File

@ -1,69 +0,0 @@
package org.thoughtcrime.securesms;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import org.thoughtcrime.securesms.components.TypingIndicatorView;
import org.session.libsession.utilities.TextSecurePreferences;
import network.loki.messenger.R;
public class TypingIndicatorIntroFragment extends Fragment {
private Controller controller;
public static TypingIndicatorIntroFragment newInstance() {
TypingIndicatorIntroFragment fragment = new TypingIndicatorIntroFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
public TypingIndicatorIntroFragment() {}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (!(getActivity() instanceof Controller)) {
throw new IllegalStateException("Parent activity must implement the Controller interface.");
}
controller = (Controller) getActivity();
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.experience_upgrade_typing_indicators_fragment, container, false);
View yesButton = view.findViewById(R.id.experience_yes_button);
View noButton = view.findViewById(R.id.experience_no_button);
((TypingIndicatorView) view.findViewById(R.id.typing_indicator)).startAnimation();
yesButton.setOnClickListener(v -> onButtonClicked(true));
noButton.setOnClickListener(v -> onButtonClicked(false));
return view;
}
private void onButtonClicked(boolean typingEnabled) {
TextSecurePreferences.setTypingIndicatorsEnabled(getContext(), typingEnabled);
controller.onTypingIndicatorsFinished();
}
public interface Controller {
void onTypingIndicatorsFinished();
}
}