cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Toasts in ViewKeyActivity

Browse Source
This commit is contained in:
Daniel Haß
2014-04-09 14:39:59 +02:00
parent 01991aa127
commit 2a9eaaa1fb
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -30,7 +30,8 @@ import android.support.v7.app.ActionBarActivity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.Window; import android.view.Window;
import android.widget.Toast;
import com.devspark.appmsg.AppMsg;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.Id;
@@ -194,8 +195,8 @@ public class ViewKeyActivity extends ActionBarActivity {
String fingerprint = PgpKeyHelper.convertFingerprintToHex(data); String fingerprint = PgpKeyHelper.convertFingerprintToHex(data);
content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
} else { } else {
Toast.makeText(getApplicationContext(), "Bad key selected!", AppMsg.makeText(this, "Bad key selected!",
Toast.LENGTH_LONG).show(); AppMsg.STYLE_ALERT).show();
return; return;
} }
} else { } else {
@@ -211,8 +212,8 @@ public class ViewKeyActivity extends ActionBarActivity {
// Android will fail with android.os.TransactionTooLargeException if key is too big // Android will fail with android.os.TransactionTooLargeException if key is too big
// see http://www.lonestarprod.com/?p=34 // see http://www.lonestarprod.com/?p=34
if (content.length() >= 86389) { if (content.length() >= 86389) {
Toast.makeText(getApplicationContext(), R.string.key_too_big_for_sharing, AppMsg.makeText(this, R.string.key_too_big_for_sharing,
Toast.LENGTH_LONG).show(); AppMsg.STYLE_ALERT).show();
return; return;
} }
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
@@ -247,11 +248,14 @@ public class ViewKeyActivity extends ActionBarActivity {
this, new long[]{masterKeyId}); this, new long[]{masterKeyId});
ClipboardReflection.copyToClipboard(this, keyringArmored.get(0)); ClipboardReflection.copyToClipboard(this, keyringArmored.get(0));
Toast.makeText(getApplicationContext(), R.string.key_copied_to_clipboard, Toast.LENGTH_LONG) AppMsg.makeText(this, R.string.key_copied_to_clipboard, AppMsg.STYLE_INFO)
.show(); .show();
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
Log.e(Constants.TAG, "key not found!", e); Log.e(Constants.TAG, "key not found!", e);
} }
ClipboardReflection.copyToClipboard(this, keyringArmored.get(0));
AppMsg.makeText(this, R.string.key_copied_to_clipboard, AppMsg.STYLE_INFO)
.show();
} }
private void shareNfc() { private void shareNfc() {