|
|
@ -20,19 +20,16 @@ package org.thoughtcrime.securesms;
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
|
import android.content.Context;
|
|
|
|
import android.content.Context;
|
|
|
|
import android.content.Intent;
|
|
|
|
import android.content.Intent;
|
|
|
|
import android.content.pm.PackageManager;
|
|
|
|
|
|
|
|
import android.database.Cursor;
|
|
|
|
import android.database.Cursor;
|
|
|
|
import android.os.AsyncTask;
|
|
|
|
import android.os.AsyncTask;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.support.v7.preference.PreferenceManager;
|
|
|
|
import android.support.v7.preference.PreferenceManager;
|
|
|
|
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.color.MaterialColor;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.contacts.avatars.ContactColorsLegacy;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.logging.Log;
|
|
|
|
|
|
|
|
import android.view.View;
|
|
|
|
import android.view.View;
|
|
|
|
import android.widget.ProgressBar;
|
|
|
|
import android.widget.ProgressBar;
|
|
|
|
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
|
|
|
|
import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.color.MaterialColor;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.contacts.avatars.ContactColorsLegacy;
|
|
|
|
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
|
|
|
|
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
|
|
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
|
|
import org.thoughtcrime.securesms.database.AttachmentDatabase;
|
|
|
|
import org.thoughtcrime.securesms.database.AttachmentDatabase;
|
|
|
@ -46,6 +43,7 @@ import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.PushDecryptJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.PushDecryptJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
|
|
|
|
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.logging.Log;
|
|
|
|
import org.thoughtcrime.securesms.mms.GlideApp;
|
|
|
|
import org.thoughtcrime.securesms.mms.GlideApp;
|
|
|
|
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
|
|
|
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
|
|
|
import org.thoughtcrime.securesms.service.KeyCachingService;
|
|
|
|
import org.thoughtcrime.securesms.service.KeyCachingService;
|
|
|
@ -148,7 +146,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private boolean needsUpgradeTask() {
|
|
|
|
private boolean needsUpgradeTask() {
|
|
|
|
int currentVersionCode = Util.getCurrentApkReleaseVersion(this);
|
|
|
|
int currentVersionCode = Util.getCanonicalVersionCode();
|
|
|
|
int lastSeenVersion = VersionTracker.getLastSeenVersion(this);
|
|
|
|
int lastSeenVersion = VersionTracker.getLastSeenVersion(this);
|
|
|
|
|
|
|
|
|
|
|
|
Log.i("DatabaseUpgradeActivity", "LastSeenVersion: " + lastSeenVersion);
|
|
|
|
Log.i("DatabaseUpgradeActivity", "LastSeenVersion: " + lastSeenVersion);
|
|
|
@ -166,14 +164,10 @@ public class DatabaseUpgradeActivity extends BaseActivity {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public static boolean isUpdate(Context context) {
|
|
|
|
public static boolean isUpdate(Context context) {
|
|
|
|
try {
|
|
|
|
int currentVersionCode = Util.getCanonicalVersionCode();
|
|
|
|
int currentVersionCode = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode;
|
|
|
|
int previousVersionCode = VersionTracker.getLastSeenVersion(context);
|
|
|
|
int previousVersionCode = VersionTracker.getLastSeenVersion(context);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return previousVersionCode < currentVersionCode;
|
|
|
|
return previousVersionCode < currentVersionCode;
|
|
|
|
} catch (PackageManager.NameNotFoundException e) {
|
|
|
|
|
|
|
|
throw new AssertionError(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@SuppressLint("StaticFieldLeak")
|
|
|
|
@SuppressLint("StaticFieldLeak")
|
|
|
|