moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-31 23:20:20 -05:00
Code Issues Releases Wiki Activity

fix a couple remaining AppMsgs

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-07-29 14:00:36 +02:00
parent 377d0f09fa
commit 4457b4a24c
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View File

@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
@ -31,13 +30,10 @@ import android.util.Patterns;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView; import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
import com.devspark.appmsg.AppMsg;
import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.bcpg.sig.KeyFlags;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
@ -45,6 +41,7 @@ import org.sufficientlysecure.keychain.helper.ContactHelper;
import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.util.Notify;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -206,8 +203,8 @@ public class CreateKeyActivity extends ActionBarActivity {
super.handleMessage(message); super.handleMessage(message);
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
AppMsg.makeText(CreateKeyActivity.this, R.string.key_send_success, Notify.showNotify(CreateKeyActivity.this, R.string.key_send_success,
AppMsg.STYLE_INFO).show(); Notify.Style.INFO);
CreateKeyActivity.this.setResult(RESULT_OK); CreateKeyActivity.this.setResult(RESULT_OK);
CreateKeyActivity.this.finish(); CreateKeyActivity.this.finish();

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java
View File

@ -23,8 +23,6 @@ import android.support.v7.app.ActionBarActivity;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import com.devspark.appmsg.AppMsg;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.ActionBarHelper; import org.sufficientlysecure.keychain.helper.ActionBarHelper;
@ -32,6 +30,8 @@ import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Notify;
import org.sufficientlysecure.keychain.util.Notify.Style;
import org.sufficientlysecure.keychain.util.QrCodeUtils; import org.sufficientlysecure.keychain.util.QrCodeUtils;
public class QrCodeActivity extends ActionBarActivity { public class QrCodeActivity extends ActionBarActivity {
@ -81,7 +81,7 @@ public class QrCodeActivity extends ActionBarActivity {
KeychainContract.KeyRings.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB); KeychainContract.KeyRings.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB);
if (blob == null) { if (blob == null) {
Log.e(Constants.TAG, "key not found!"); Log.e(Constants.TAG, "key not found!");
AppMsg.makeText(this, R.string.error_key_not_found, AppMsg.STYLE_ALERT).show(); Notify.showNotify(this, R.string.error_key_not_found, Style.ERROR);
finish(); finish();
} }
@ -90,7 +90,7 @@ public class QrCodeActivity extends ActionBarActivity {
mFingerprintQrCode.setImageBitmap(QrCodeUtils.getQRCodeBitmap(qrCodeContent, QR_CODE_SIZE)); mFingerprintQrCode.setImageBitmap(QrCodeUtils.getQRCodeBitmap(qrCodeContent, QR_CODE_SIZE));
} catch (ProviderHelper.NotFoundException e) { } catch (ProviderHelper.NotFoundException e) {
Log.e(Constants.TAG, "key not found!", e); Log.e(Constants.TAG, "key not found!", e);
AppMsg.makeText(this, R.string.error_key_not_found, AppMsg.STYLE_ALERT).show(); Notify.showNotify(this, R.string.error_key_not_found, Style.ERROR);
finish(); finish();
} }
} }