mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-23 08:27:30 +00:00
Fix up routing activity actions.
This commit is contained in:
parent
5fcc135f81
commit
20cf775b1e
@ -122,17 +122,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
|
||||
final ConversationParameters parameters = getConversationParameters();
|
||||
final Intent intent;
|
||||
|
||||
scheduleRefreshActions();
|
||||
|
||||
if (isShareAction()) intent = getShareIntent(parameters);
|
||||
else if (parameters.recipients != null) intent = getConversationIntent(parameters);
|
||||
else intent = getConversationListIntent();
|
||||
|
||||
if (TextSecurePreferences.isPushRegistered(this) &&
|
||||
!TextSecurePreferences.isSignedPreKeyRegistered(this))
|
||||
{
|
||||
PreKeyService.initiateCreateSigned(this, masterSecret);
|
||||
}
|
||||
|
||||
startActivity(intent);
|
||||
finish();
|
||||
}
|
||||
@ -185,6 +180,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
|
||||
Intent intent = new Intent(this, GcmRegistrationService.class);
|
||||
startService(intent);
|
||||
}
|
||||
|
||||
if (TextSecurePreferences.isPushRegistered(this) &&
|
||||
!TextSecurePreferences.isSignedPreKeyRegistered(this))
|
||||
{
|
||||
PreKeyService.initiateCreateSigned(this, masterSecret);
|
||||
}
|
||||
}
|
||||
|
||||
private int getApplicationState() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user