TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-23 16:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up routing activity actions.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-10-20 14:55:34 -07:00
parent 5fcc135f81
commit 20cf775b1e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/RoutingActivity.java
View File

@ -122,17 +122,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
final ConversationParameters parameters = getConversationParameters(); final ConversationParameters parameters = getConversationParameters();
final Intent intent; final Intent intent;
scheduleRefreshActions();
if (isShareAction()) intent = getShareIntent(parameters); if (isShareAction()) intent = getShareIntent(parameters);
else if (parameters.recipients != null) intent = getConversationIntent(parameters); else if (parameters.recipients != null) intent = getConversationIntent(parameters);
else intent = getConversationListIntent(); else intent = getConversationListIntent();
if (TextSecurePreferences.isPushRegistered(this) &&
!TextSecurePreferences.isSignedPreKeyRegistered(this))
{
PreKeyService.initiateCreateSigned(this, masterSecret);
}
startActivity(intent); startActivity(intent);
finish(); finish();
} }
@ -185,6 +180,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
Intent intent = new Intent(this, GcmRegistrationService.class); Intent intent = new Intent(this, GcmRegistrationService.class);
startService(intent); startService(intent);
} }
if (TextSecurePreferences.isPushRegistered(this) &&
!TextSecurePreferences.isSignedPreKeyRegistered(this))
{
PreKeyService.initiateCreateSigned(this, masterSecret);
}
} }
private int getApplicationState() { private int getApplicationState() {