aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-30 22:01:17 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-30 22:01:17 +0200
commitc2ba7e2420f09e4aa6d604f4af073668520138da (patch)
tree8deb32f70703c789953a5a01a5be385966c04e65 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
parent6d7a9ec48a6517adfe94ed2edfa875def538d088 (diff)
downloadopen-keychain-c2ba7e2420f09e4aa6d604f4af073668520138da.tar.gz
open-keychain-c2ba7e2420f09e4aa6d604f4af073668520138da.tar.bz2
open-keychain-c2ba7e2420f09e4aa6d604f4af073668520138da.zip
work on edit key
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java21
1 files changed, 4 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 0d8c8233a..3ff3b56bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -18,7 +18,6 @@
package org.sufficientlysecure.keychain.ui;
import android.annotation.TargetApi;
-import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Intent;
import android.net.Uri;
@@ -37,11 +36,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-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.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.OtherHelper;
@@ -55,6 +49,7 @@ import org.sufficientlysecure.keychain.service.OperationResults.ImportResult;
import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter;
import org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout;
import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.Notify;
import java.util.ArrayList;
import java.util.Locale;
@@ -382,11 +377,7 @@ public class ImportKeysActivity extends ActionBarActivity {
private boolean isFingerprintValid(String fingerprint) {
if (fingerprint == null || fingerprint.length() < 40) {
- SuperCardToast toast = SuperCardToast.create(this,
- getString(R.string.import_qr_code_too_short_fingerprint),
- SuperToast.Duration.LONG);
- toast.setBackground(SuperToast.Background.RED);
- toast.show();
+ Notify.showNotify(this, R.string.import_qr_code_too_short_fingerprint, Notify.Style.ERROR);
return false;
} else {
return true;
@@ -460,7 +451,7 @@ public class ImportKeysActivity extends ActionBarActivity {
return;
}
- result.displayToast(ImportKeysActivity.this);
+ result.displayNotify(ImportKeysActivity.this);
}
}
};
@@ -546,11 +537,7 @@ public class ImportKeysActivity extends ActionBarActivity {
startService(intent);
} else {
- SuperCardToast toast = SuperCardToast.create(this,
- getString(R.string.error_nothing_import),
- SuperToast.Duration.LONG);
- toast.setBackground(SuperToast.Background.RED);
- toast.show();
+ Notify.showNotify(this, R.string.error_nothing_import, Notify.Style.ERROR);
}
}