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

show notification if KeyListActivity is spawned with an EXTRA_RESULT

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-16 13:50:25 +01:00
parent 92b8d874ed
commit 6935509d22
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
View File

@@ -96,7 +96,7 @@ public class FirstTimeActivity extends ActionBarActivity {
if (srcData != null) {
intent.putExtras(srcData);
}
startActivityForResult(intent, 0);
startActivity(intent);
finish();
}
@@ -105,4 +105,5 @@ public class FirstTimeActivity extends ActionBarActivity {
public boolean onKeyDown(int keyCode, KeyEvent event) {
return keyCode == KeyEvent.KEYCODE_MENU || super.onKeyDown(keyCode, event);
}
}

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
View File

@@ -65,6 +65,13 @@ public class KeyListActivity extends DrawerActivity {
setContentView(R.layout.key_list_activity);
Intent data = getIntent();
// If we got an EXTRA_RESULT in the intent, show the notification
if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
result.createNotify(this).show();
}
// now setup navigation drawer in DrawerActivity...
activateDrawerNavigation(savedInstanceState);
}