Skip to content
Snippets Groups Projects
Commit f3e61f9c authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Finished the first implementation of hybrid backlog storage

parent 6b8f35fa
Branches
Tags
No related merge requests found
......@@ -26,6 +26,9 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import com.raizlabs.android.dbflow.config.FlowManager;
import de.kuschku.libquassel.localtypes.orm.ConnectedDatabase;
import de.kuschku.quasseldroid_ng.ui.chat.MainActivity;
import de.kuschku.quasseldroid_ng.ui.chat.util.ServiceHelper;
import de.kuschku.quasseldroid_ng.ui.setup.AccountSelectActivity;
......@@ -55,6 +58,10 @@ public class LoginActivity extends AppCompatActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
// If we select a different core than we used last time, clear the database
if (!context.settings().preferenceLastAccount.get().equals(data.getBundleExtra("extra").getString("account")))
deleteDatabase(ConnectedDatabase.NAME);
context.settings().preferenceLastAccount.set(data.getBundleExtra("extra").getString("account"));
checkReady();
firstStart = true;
......
......@@ -24,7 +24,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'me.tatarka:gradle-retrolambda:3.2.4'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment