From f3e61f9c6d723c26bf50ae6372fdb049496019ef Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 26 Aug 2016 23:56:57 +0200
Subject: [PATCH] Finished the first implementation of hybrid backlog storage
---
.../java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java | 7 +++++++
build.gradle | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
index 6e5c5e9f2..36ad8cf3f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
@@ -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;
diff --git a/build.gradle b/build.gradle
index 45ba42786..3792c8a3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
}
--
GitLab