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

Notify duration, cleanup

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-20 21:09:46 +02:00
parent 937c91eefa
commit 45706e6534
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
View File

@@ -155,10 +155,8 @@ public class OperationResultParcel implements Parcelable {
if ((resultType & OperationResultParcel.RESULT_ERROR) == 0) { if ((resultType & OperationResultParcel.RESULT_ERROR) == 0) {
if (getLog().containsWarnings()) { if (getLog().containsWarnings()) {
duration = 0;
color = Style.ORANGE; color = Style.ORANGE;
} else { } else {
duration = SuperToast.Duration.LONG;
color = Style.GREEN; color = Style.GREEN;
} }
@@ -167,7 +165,6 @@ public class OperationResultParcel implements Parcelable {
} else { } else {
duration = 0;
color = Style.RED; color = Style.RED;
str = "operation failed"; str = "operation failed";
@@ -180,8 +177,8 @@ public class OperationResultParcel implements Parcelable {
button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD, button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD,
Style.getStyle(color, SuperToast.Animations.POPUP)); Style.getStyle(color, SuperToast.Animations.POPUP));
toast.setText(str); toast.setText(str);
toast.setDuration(duration); toast.setDuration(SuperToast.Duration.EXTRA_LONG);
toast.setIndeterminate(duration == 0); toast.setIndeterminate(false);
toast.setSwipeToDismiss(true); toast.setSwipeToDismiss(true);
// If we have a log and it's non-empty, show a View Log button // If we have a log and it's non-empty, show a View Log button
if (button) { if (button) {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -85,8 +85,6 @@ public class KeyListFragment extends LoaderFragment
private Button mButtonEmptyCreate; private Button mButtonEmptyCreate;
private Button mButtonEmptyImport; private Button mButtonEmptyImport;
public static final int REQUEST_CODE_CREATE_OR_IMPORT_KEY = 0x00007012;
/** /**
* Load custom layout with StickyListView from library * Load custom layout with StickyListView from library
*/ */
@@ -105,7 +103,7 @@ public class KeyListFragment extends LoaderFragment
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(getActivity(), CreateKeyActivity.class); Intent intent = new Intent(getActivity(), CreateKeyActivity.class);
startActivityForResult(intent, REQUEST_CODE_CREATE_OR_IMPORT_KEY); startActivityForResult(intent, 0);
} }
}); });
mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import); mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import);
@@ -115,7 +113,7 @@ public class KeyListFragment extends LoaderFragment
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(getActivity(), ImportKeysActivity.class); Intent intent = new Intent(getActivity(), ImportKeysActivity.class);
intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN); intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
startActivityForResult(intent, REQUEST_CODE_CREATE_OR_IMPORT_KEY); startActivityForResult(intent, 0);
} }
}); });