aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-28 20:53:37 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-28 20:54:14 +0200
commit6d7a9ec48a6517adfe94ed2edfa875def538d088 (patch)
tree3988619474f229b3d4b640e3020cbaf5b312278b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent3acb7fb0878afb369e5bf91db3c6a83a10e0a6ed (diff)
downloadopen-keychain-6d7a9ec48a6517adfe94ed2edfa875def538d088.tar.gz
open-keychain-6d7a9ec48a6517adfe94ed2edfa875def538d088.tar.bz2
open-keychain-6d7a9ec48a6517adfe94ed2edfa875def538d088.zip
pass import results through to viewkeyactivity on update
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java93
1 files changed, 93 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 6c44b01f1..e5d06ccbb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -1,6 +1,19 @@
package org.sufficientlysecure.keychain.service;
+import android.app.Activity;
+import android.content.Intent;
import android.os.Parcel;
+import android.os.Parcelable;
+import android.view.View;
+
+import com.github.johnpersano.supertoasts.SuperCardToast;
+import com.github.johnpersano.supertoasts.SuperToast;
+import com.github.johnpersano.supertoasts.util.OnClickWrapper;
+import com.github.johnpersano.supertoasts.util.Style;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.LogDisplayActivity;
+import org.sufficientlysecure.keychain.ui.LogDisplayFragment;
public abstract class OperationResults {
@@ -67,6 +80,86 @@ public abstract class OperationResults {
}
};
+ public void displayToast(final Activity activity) {
+
+ int resultType = getResult();
+
+ String str;
+ int duration, color;
+
+ // Not an overall failure
+ if ((resultType & ImportResult.RESULT_ERROR) == 0) {
+ String withWarnings;
+
+ // Any warnings?
+ if ((resultType & ImportResult.RESULT_WITH_WARNINGS) > 0) {
+ duration = 0;
+ color = Style.ORANGE;
+ withWarnings = activity.getResources().getString(R.string.import_with_warnings);
+ } else {
+ duration = SuperToast.Duration.LONG;
+ color = Style.GREEN;
+ withWarnings = "";
+ }
+
+ // New and updated keys
+ if (this.isOkBoth()) {
+ str = activity.getResources().getQuantityString(
+ R.plurals.import_keys_added_and_updated_1, mNewKeys, mNewKeys);
+ str += activity.getResources().getQuantityString(
+ R.plurals.import_keys_added_and_updated_2, mUpdatedKeys, mUpdatedKeys, withWarnings);
+ } else if (isOkUpdated()) {
+ str = activity.getResources().getQuantityString(
+ R.plurals.import_keys_updated, mUpdatedKeys, mUpdatedKeys, withWarnings);
+ } else if (isOkNew()) {
+ str = activity.getResources().getQuantityString(
+ R.plurals.import_keys_added, mNewKeys, mNewKeys, withWarnings);
+ } else {
+ duration = 0;
+ color = Style.RED;
+ str = "internal error";
+ }
+
+ } else {
+ duration = 0;
+ color = Style.RED;
+ if (isFailNothing()) {
+ str = activity.getString(R.string.import_error_nothing);
+ } else {
+ str = activity.getString(R.string.import_error);
+ }
+ }
+
+ boolean button = getLog() != null && !getLog().isEmpty();
+ SuperCardToast toast = new SuperCardToast(activity,
+ button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD,
+ Style.getStyle(color, SuperToast.Animations.POPUP));
+ toast.setText(str);
+ toast.setDuration(duration);
+ toast.setIndeterminate(duration == 0);
+ toast.setSwipeToDismiss(true);
+ // If we have a log and it's non-empty, show a View Log button
+ if (button) {
+ toast.setButtonIcon(R.drawable.ic_action_view_as_list,
+ activity.getResources().getString(R.string.import_view_log));
+ toast.setButtonTextColor(activity.getResources().getColor(R.color.black));
+ toast.setTextColor(activity.getResources().getColor(R.color.black));
+ toast.setOnClickWrapper(new OnClickWrapper("supercardtoast",
+ new SuperToast.OnClickListener() {
+ @Override
+ public void onClick(View view, Parcelable token) {
+ Intent intent = new Intent(
+ activity, LogDisplayActivity.class);
+ intent.putExtra(LogDisplayFragment.EXTRA_RESULT, ImportResult.this);
+ activity.startActivity(intent);
+ }
+ }
+ ));
+ }
+ toast.show();
+
+ }
+
}
public static class SaveKeyringResult extends OperationResultParcel {