Use serializable userinfo

pull/898/head
Alex Baker 6 years ago
parent c6f0cb59b5
commit 054d05a15e

@ -200,7 +200,7 @@ dependencies {
implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime:${Versions.work}")
implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0") implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0")
implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:4.6.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.crashlytics.sdk.android:crashlytics:${Versions.crashlytics}")
googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.firebase}") googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.firebase}")

@ -62,7 +62,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
Intent intent = getIntent(); Intent intent = getIntent();
caldavAccount = intent.getParcelableExtra(EXTRA_ACCOUNT); 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) { if (userInfo == null) {
binding.description.setVisibility(View.VISIBLE); binding.description.setVisibility(View.VISIBLE);

@ -14,7 +14,6 @@ import butterknife.OnCheckedChanged;
import com.etesync.journalmanager.Crypto.CryptoManager; import com.etesync.journalmanager.Crypto.CryptoManager;
import com.etesync.journalmanager.Exceptions.IntegrityException; import com.etesync.journalmanager.Exceptions.IntegrityException;
import com.etesync.journalmanager.Exceptions.VersionTooNewException; import com.etesync.journalmanager.Exceptions.VersionTooNewException;
import com.etesync.journalmanager.GsonHelper;
import com.etesync.journalmanager.UserInfoManager.UserInfo; import com.etesync.journalmanager.UserInfoManager.UserInfo;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.helper.UUIDHelper;
@ -89,7 +88,7 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
saveAccountAndFinish(); saveAccountAndFinish();
} else { } else {
Intent intent = new Intent(this, EncryptionSettingsActivity.class); 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); intent.putExtra(EncryptionSettingsActivity.EXTRA_ACCOUNT, account);
startActivityForResult(intent, REQUEST_ENCRYPTION_PASSWORD); startActivityForResult(intent, REQUEST_ENCRYPTION_PASSWORD);
} }
@ -110,10 +109,6 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
return false; return false;
} }
private String toJson(UserInfo userInfo) {
return GsonHelper.gson.toJson(userInfo);
}
@OnCheckedChanged(R.id.show_advanced) @OnCheckedChanged(R.id.show_advanced)
void toggleUrl() { void toggleUrl() {
updateUrlVisibility(); updateUrlVisibility();

Loading…
Cancel
Save