@ -2452,11 +2452,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadId ) ;
LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadId ) ;
outgoingMessage . isFriendRequest = ! isGroupConversation ( ) & & friendRequestStatus ! = LokiThreadFriendRequestStatus . FRIENDS ; // Needed for stageOutgoingMessage(...)
outgoingMessage . isFriendRequest = ! isGroupConversation ( ) & & friendRequestStatus ! = LokiThreadFriendRequestStatus . FRIENDS ; // Needed for stageOutgoingMessage(...)
Permissions . with ( this )
. request ( Manifest . permission . SEND_SMS , Manifest . permission . READ_SMS )
. ifNecessary ( ! isSecureText | | forceSms )
. withPermanentDenialDialog ( getString ( R . string . ConversationActivity_signal_needs_sms_permission_in_order_to_send_an_sms ) )
. onAllGranted ( ( ) - > {
if ( clearComposeBox ) {
if ( clearComposeBox ) {
inputPanel . clearQuote ( ) ;
inputPanel . clearQuote ( ) ;
attachmentManager . clear ( glideRequests , false ) ;
attachmentManager . clear ( glideRequests , false ) ;
@ -2481,9 +2476,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
future . set ( null ) ;
future . set ( null ) ;
}
}
} . executeOnExecutor ( AsyncTask . THREAD_POOL_EXECUTOR ) ;
} . executeOnExecutor ( AsyncTask . THREAD_POOL_EXECUTOR ) ;
} )
. onAnyDenied ( ( ) - > future . set ( null ) )
. execute ( ) ;
return future ;
return future ;
}
}
@ -2512,11 +2504,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadId ) ;
LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadId ) ;
message . isFriendRequest = ! isGroupConversation ( ) & & friendRequestStatus ! = LokiThreadFriendRequestStatus . FRIENDS ; // Needed for stageOutgoingMessage(...)
message . isFriendRequest = ! isGroupConversation ( ) & & friendRequestStatus ! = LokiThreadFriendRequestStatus . FRIENDS ; // Needed for stageOutgoingMessage(...)
Permissions . with ( this )
. request ( Manifest . permission . SEND_SMS )
. ifNecessary ( forceSms | | ! isSecureText )
. withPermanentDenialDialog ( getString ( R . string . ConversationActivity_signal_needs_sms_permission_in_order_to_send_an_sms ) )
. onAllGranted ( ( ) - > {
silentlySetComposeText ( "" ) ;
silentlySetComposeText ( "" ) ;
final long id = fragment . stageOutgoingMessage ( message ) ;
final long id = fragment . stageOutgoingMessage ( message ) ;
@ -2535,9 +2522,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
sendComplete ( result ) ;
sendComplete ( result ) ;
}
}
} . executeOnExecutor ( AsyncTask . THREAD_POOL_EXECUTOR , message ) ;
} . executeOnExecutor ( AsyncTask . THREAD_POOL_EXECUTOR , message ) ;
} )
. execute ( ) ;
}
}
private void showDefaultSmsPrompt ( ) {
private void showDefaultSmsPrompt ( ) {