From cf718780f6bcb0afa8166921219c54923b17d8d3 Mon Sep 17 00:00:00 2001 From: Joe Steele Date: Fri, 4 Jul 2014 19:23:43 -0400 Subject: [PATCH] Fixes needed after merging in master Also, fix unit tests. --- .../fsck/k9/activity/setup/AccountSetupCheckSettings.java | 6 +++--- tests/src/com/fsck/k9/mail/store/ImapStoreUriTest.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java index 5ed8bcab0..e60ddb53c 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java @@ -3,14 +3,14 @@ package com.fsck.k9.activity.setup; import android.app.Activity; import android.app.AlertDialog; +import android.app.DialogFragment; +import android.app.FragmentTransaction; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Process; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentTransaction; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -524,7 +524,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList } } - FragmentTransaction ta = getSupportFragmentManager().beginTransaction(); + FragmentTransaction ta = getFragmentManager().beginTransaction(); ta.add(fragment, getDialogTag(dialogId)); ta.commitAllowingStateLoss(); diff --git a/tests/src/com/fsck/k9/mail/store/ImapStoreUriTest.java b/tests/src/com/fsck/k9/mail/store/ImapStoreUriTest.java index 442b443ce..92ef27dda 100644 --- a/tests/src/com/fsck/k9/mail/store/ImapStoreUriTest.java +++ b/tests/src/com/fsck/k9/mail/store/ImapStoreUriTest.java @@ -82,7 +82,7 @@ public class ImapStoreUriTest extends TestCase { extra.put("pathPrefix", "customPathPrefix"); ServerSettings settings = new ServerSettings(ImapStore.STORE_TYPE, "server", 143, - ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", extra); + ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", null, extra); String uri = Store.createStoreUri(settings); @@ -95,7 +95,7 @@ public class ImapStoreUriTest extends TestCase { extra.put("pathPrefix", ""); ServerSettings settings = new ServerSettings(ImapStore.STORE_TYPE, "server", 143, - ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", extra); + ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", null, extra); String uri = Store.createStoreUri(settings); @@ -104,7 +104,7 @@ public class ImapStoreUriTest extends TestCase { public void testCreateStoreUriImapNoExtra() { ServerSettings settings = new ServerSettings(ImapStore.STORE_TYPE, "server", 143, - ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass"); + ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", null); String uri = Store.createStoreUri(settings); @@ -116,7 +116,7 @@ public class ImapStoreUriTest extends TestCase { extra.put("autoDetectNamespace", "true"); ServerSettings settings = new ServerSettings(ImapStore.STORE_TYPE, "server", 143, - ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", extra); + ConnectionSecurity.NONE, AuthType.PLAIN, "user", "pass", null, extra); String uri = Store.createStoreUri(settings);