1) There is no longer a concept of "verified" or "unverified." Only "what we saw last time" and "different from last time." 2) Let's eliminate "verify session," since we're all about identity keys now. 3) Mark manually processed key exchanges as processed.
134 lines
4.5 KiB
Java
134 lines
4.5 KiB
Java
package org.thoughtcrime.securesms;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.content.pm.PackageManager;
|
|
import android.os.AsyncTask;
|
|
import android.os.Bundle;
|
|
import android.util.Log;
|
|
import android.view.View;
|
|
import android.widget.ProgressBar;
|
|
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
|
import org.thoughtcrime.securesms.util.VersionTracker;
|
|
|
|
import java.util.SortedSet;
|
|
import java.util.TreeSet;
|
|
|
|
public class DatabaseUpgradeActivity extends Activity {
|
|
|
|
public static final int NO_MORE_KEY_EXCHANGE_PREFIX_VERSION = 46;
|
|
public static final int MMS_BODY_VERSION = 46;
|
|
public static final int TOFU_IDENTITIES_VERSION = 50;
|
|
|
|
private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
|
|
add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
|
|
add(TOFU_IDENTITIES_VERSION);
|
|
}};
|
|
|
|
private MasterSecret masterSecret;
|
|
|
|
@Override
|
|
public void onCreate(Bundle bundle) {
|
|
super.onCreate(bundle);
|
|
this.masterSecret = (MasterSecret)getIntent().getParcelableExtra("master_secret");
|
|
|
|
if (needsDatabaseUpgrade()) {
|
|
Log.w("DatabaseUpgradeActivity", "Upgrading...");
|
|
setContentView(R.layout.database_upgrade_activity);
|
|
|
|
ProgressBar indeterminateProgress = (ProgressBar)findViewById(R.id.indeterminate_progress);
|
|
ProgressBar determinateProgress = (ProgressBar)findViewById(R.id.determinate_progress);
|
|
|
|
new DatabaseUpgradeTask(indeterminateProgress, determinateProgress)
|
|
.execute(VersionTracker.getLastSeenVersion(this));
|
|
} else {
|
|
VersionTracker.updateLastSeenVersion(this);
|
|
startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
|
|
finish();
|
|
}
|
|
}
|
|
|
|
private boolean needsDatabaseUpgrade() {
|
|
try {
|
|
int currentVersionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
|
|
int lastSeenVersion = VersionTracker.getLastSeenVersion(this);
|
|
|
|
Log.w("DatabaseUpgradeActivity", "LastSeenVersion: " + lastSeenVersion);
|
|
|
|
if (lastSeenVersion >= currentVersionCode)
|
|
return false;
|
|
|
|
for (int version : UPGRADE_VERSIONS) {
|
|
Log.w("DatabaseUpgradeActivity", "Comparing: " + version);
|
|
if (lastSeenVersion < version)
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
} catch (PackageManager.NameNotFoundException e) {
|
|
throw new AssertionError(e);
|
|
}
|
|
}
|
|
|
|
public static boolean isUpdate(Context context) {
|
|
try {
|
|
int currentVersionCode = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode;
|
|
int previousVersionCode = VersionTracker.getLastSeenVersion(context);
|
|
|
|
return previousVersionCode < currentVersionCode;
|
|
} catch (PackageManager.NameNotFoundException e) {
|
|
throw new AssertionError(e);
|
|
}
|
|
}
|
|
|
|
public interface DatabaseUpgradeListener {
|
|
public void setProgress(int progress, int total);
|
|
}
|
|
|
|
private class DatabaseUpgradeTask extends AsyncTask<Integer, Double, Void>
|
|
implements DatabaseUpgradeListener
|
|
{
|
|
|
|
private final ProgressBar indeterminateProgress;
|
|
private final ProgressBar determinateProgress;
|
|
|
|
public DatabaseUpgradeTask(ProgressBar indeterminateProgress, ProgressBar determinateProgress) {
|
|
this.indeterminateProgress = indeterminateProgress;
|
|
this.determinateProgress = determinateProgress;
|
|
}
|
|
|
|
@Override
|
|
protected Void doInBackground(Integer... params) {
|
|
Log.w("DatabaseUpgradeActivity", "Running background upgrade..");
|
|
DatabaseFactory.getInstance(DatabaseUpgradeActivity.this)
|
|
.onApplicationLevelUpgrade(DatabaseUpgradeActivity.this.getApplicationContext(),
|
|
masterSecret, params[0], this);
|
|
return null;
|
|
}
|
|
|
|
@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);
|
|
startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
|
|
finish();
|
|
}
|
|
|
|
@Override
|
|
public void setProgress(int progress, int total) {
|
|
publishProgress(((double)progress / (double)total));
|
|
}
|
|
}
|
|
|
|
}
|