From 054d05a15e13df3e34bb685b489f06f17951a2c8 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 12 Feb 2020 09:30:14 -0600
Subject: [PATCH] Use serializable userinfo

---
 app/build.gradle.kts                                       | 2 +-
 .../java/org/tasks/etesync/EncryptionSettingsActivity.java | 2 +-
 .../org/tasks/etesync/EteSyncAccountSettingsActivity.java  | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ac0a52145..6a2fc9ae4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -200,7 +200,7 @@ dependencies {
     implementation("androidx.work:work-runtime:${Versions.work}")
     implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0")
     implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:4.6.0")
-    implementation("com.etesync:journalmanager:1.0.3")
+    implementation("com.etesync:journalmanager:1.0.4")
 
     googleplayImplementation("com.crashlytics.sdk.android:crashlytics:${Versions.crashlytics}")
     googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.firebase}")
diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
index de942db16..0abae8851 100644
--- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
+++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
@@ -62,7 +62,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
 
     Intent intent = getIntent();
     caldavAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);
-    userInfo = GsonHelper.gson.fromJson(intent.getStringExtra(EXTRA_USER_INFO), UserInfo.class);
+    userInfo = (UserInfo) intent.getSerializableExtra(EXTRA_USER_INFO);
 
     if (userInfo == null) {
       binding.description.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java
index 76fec646d..4bfd5a58b 100644
--- a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java
@@ -14,7 +14,6 @@ import butterknife.OnCheckedChanged;
 import com.etesync.journalmanager.Crypto.CryptoManager;
 import com.etesync.journalmanager.Exceptions.IntegrityException;
 import com.etesync.journalmanager.Exceptions.VersionTooNewException;
-import com.etesync.journalmanager.GsonHelper;
 import com.etesync.journalmanager.UserInfoManager.UserInfo;
 import com.google.common.base.Strings;
 import com.todoroo.astrid.helper.UUIDHelper;
@@ -89,7 +88,7 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
       saveAccountAndFinish();
     } else {
       Intent intent = new Intent(this, EncryptionSettingsActivity.class);
-      intent.putExtra(EncryptionSettingsActivity.EXTRA_USER_INFO, toJson(userInfo));
+      intent.putExtra(EncryptionSettingsActivity.EXTRA_USER_INFO, userInfo);
       intent.putExtra(EncryptionSettingsActivity.EXTRA_ACCOUNT, account);
       startActivityForResult(intent, REQUEST_ENCRYPTION_PASSWORD);
     }
@@ -110,10 +109,6 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
     return false;
   }
 
-  private String toJson(UserInfo userInfo) {
-    return GsonHelper.gson.toJson(userInfo);
-  }
-
   @OnCheckedChanged(R.id.show_advanced)
   void toggleUrl() {
     updateUrlVisibility();