import-log: more interface work

2 files changed, 20 insertions, 17 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 9932e3e18..61d7e7949 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -378,37 +378,37 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O
                     final ImportResult result =
                             returnData.<ImportResult>getParcelable(KeychainIntentService.RESULT);
 
-                    // , make pessimistic assumptions
-                    String str = Integer.toString(result.getResult());
-                    int duration = 0, color = Style.RED;
+                    String str = "";
+                    boolean hasWarnings = result.getLog().containsWarnings();
+                    int duration = 0, color = hasWarnings ? Style.ORANGE : Style.GREEN;
+                    String withWarnings = hasWarnings
+                            ? getResources().getString(R.string.with_warnings) : "";
 
                     switch(result.getResult()) {
                         case ImportResult.RESULT_OK_NEWKEYS:
-                            color = Style.GREEN;
-                            duration = SuperToast.Duration.LONG;
+                            if (!hasWarnings) {
+                                duration = SuperToast.Duration.LONG;
+                            }
                             str = getResources().getQuantityString(
-                                    R.plurals.keys_added, result.mNewKeys, result.mNewKeys);
+                                    R.plurals.keys_added, result.mNewKeys, result.mNewKeys, withWarnings);
                             break;
 
                         case ImportResult.RESULT_OK_UPDATED:
-                            color = Style.GREEN;
-                            duration = SuperToast.Duration.LONG;
+                            if (!hasWarnings) {
+                                duration = SuperToast.Duration.LONG;
+                            }
                             str = getResources().getQuantityString(
-                                    R.plurals.keys_updated, result.mNewKeys, result.mNewKeys);
+                                    R.plurals.keys_updated, result.mNewKeys, result.mNewKeys, withWarnings);
                             break;
 
                         case ImportResult.RESULT_OK_BOTHKEYS:
-                            color = Style.GREEN;
-                            duration = SuperToast.Duration.LONG;
+                            if (!hasWarnings) {
+                                duration = SuperToast.Duration.LONG;
+                            }
                             str = getResources().getQuantityString(
                                     R.plurals.keys_added_and_updated_1, result.mNewKeys, result.mNewKeys);
                             str += getResources().getQuantityString(
-                                    R.plurals.keys_added_and_updated_2, result.mUpdatedKeys, result.mUpdatedKeys);
-                            break;
-
-                        case ImportResult.RESULT_OK_WITH_WARNINGS:
-                            str = "ok with warnings";
-                            color = Style.ORANGE;
+                                    R.plurals.keys_added_and_updated_2, result.mUpdatedKeys, result.mUpdatedKeys, withWarnings);
                             break;
 
                         case ImportResult.RESULT_PARTIAL_WITH_ERRORS:
@@ -435,6 +435,8 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O
                     toast.setSwipeToDismiss(true);
                     toast.setButtonIcon(R.drawable.ic_action_view_as_list,
                             getResources().getString(R.string.view_log));
+                    toast.setButtonTextColor(R.color.emphasis_dark);
+                    toast.setTextColor(R.color.emphasis_dark);
                     toast.setOnClickWrapper(new OnClickWrapper("supercardtoast",
                         new SuperToast.OnClickListener() {
                             @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
index 5e038d3f6..275c9ac18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
@@ -73,6 +73,7 @@ public class LogDisplayFragment extends ListFragment {
             text.setPadding(entry.mIndent*dipFactor, 0, 0, 0);
             text.setText(getResources().getString(entry.mType.getMsgId(), (Object[]) entry.mParameters));
             switch (entry.mLevel) {
+                case OK: text.setTextColor(Color.GREEN); break;
                 case DEBUG: text.setTextColor(Color.GRAY); break;
                 case INFO: text.setTextColor(Color.BLACK); break;
                 case WARN: text.setTextColor(Color.YELLOW); break;