diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-09 00:59:45 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-09 00:59:45 +0200 |
| commit | b3f56c927b47565bdaa7e3b4ea2a8a214aa56652 (patch) | |
| tree | 2282eaab83733ea4bb1524052872c14fc6ec58ab /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui | |
| parent | a13bcbbb5b8b6e9e6998d561182ded77d0602ae2 (diff) | |
| download | open-keychain-b3f56c927b47565bdaa7e3b4ea2a8a214aa56652.tar.gz open-keychain-b3f56c927b47565bdaa7e3b4ea2a8a214aa56652.tar.bz2 open-keychain-b3f56c927b47565bdaa7e3b4ea2a8a214aa56652.zip | |
Revert "Replace PgpGeneralException with NotFoundException where appropriate"
This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui')
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index 421231fa2..b43dec2f1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -27,12 +27,13 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; import org.sufficientlysecure.keychain.service.results.SingletonResult; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.util.Log; public class AccountSettingsActivity extends ActionBarActivity { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index fe56d5ead..a7eb58377 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -67,7 +67,7 @@ public class AccountSettingsFragment extends Fragment { } public void setAccSettings(AccountSettings accountSettings) { - mAccSettings = accountSettings; + this.mAccSettings = accountSettings; mAccNameView.setText(accountSettings.getAccountName()); mSelectKeySpinner.setSelectedKeyId(accountSettings.getKeyId()); |