@ -497,11 +497,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleResetSecureSession ( ) {
private void handleResetSecureSession ( ) {
AlertDialog . Builder builder = new AlertDialog . Builder ( this ) ;
AlertDialog . Builder builder = new AlertDialog . Builder ( this ) ;
builder . setTitle ( R . string . ConversationActivity_reset_secure_session_ confirma tion) ;
builder . setTitle ( R . string . ConversationActivity_reset_secure_session_ ques tion) ;
builder . setIconAttribute ( R . attr . dialog_alert_icon ) ;
builder . setIconAttribute ( R . attr . dialog_alert_icon ) ;
builder . setCancelable ( true ) ;
builder . setCancelable ( true ) ;
builder . setMessage ( R . string . ConversationActivity_ are_you_sure_that_you_want_to_reset_this_secure_session_question ) ;
builder . setMessage ( R . string . ConversationActivity_ this_may_help_if_youre_having_encryption_problems ) ;
builder . setPositiveButton ( R . string . yes, new DialogInterface . OnClickListener ( ) {
builder . setPositiveButton ( R . string . ConversationActivit y_r eset , new DialogInterface . OnClickListener ( ) {
@Override
@Override
public void onClick ( DialogInterface dialog , int which ) {
public void onClick ( DialogInterface dialog , int which ) {
if ( isSingleConversation ( ) ) {
if ( isSingleConversation ( ) ) {
@ -524,7 +524,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
}
}
}
} ) ;
} ) ;
builder . setNegativeButton ( R. string . no , null ) ;
builder . setNegativeButton ( android. R . string . cancel , null ) ;
builder . show ( ) ;
builder . show ( ) ;
}
}
@ -645,11 +645,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleDeleteThread ( ) {
private void handleDeleteThread ( ) {
AlertDialog . Builder builder = new AlertDialog . Builder ( this ) ;
AlertDialog . Builder builder = new AlertDialog . Builder ( this ) ;
builder . setTitle ( R . string . ConversationActivity_delete_thread_ confirma tion) ;
builder . setTitle ( R . string . ConversationActivity_delete_thread_ ques tion) ;
builder . setIconAttribute ( R . attr . dialog_alert_icon ) ;
builder . setIconAttribute ( R . attr . dialog_alert_icon ) ;
builder . setCancelable ( true ) ;
builder . setCancelable ( true ) ;
builder . setMessage ( R . string . ConversationActivity_ are_you_sure_that_you_want_to_permanently_delete_this_conversation_ques tion) ;
builder . setMessage ( R . string . ConversationActivity_ this_will_permanently_delete_all_messages_in_this_conversa tion) ;
builder . setPositiveButton ( R . string . yes , new DialogInterface . OnClickListener ( ) {
builder . setPositiveButton ( R . string . delete , new DialogInterface . OnClickListener ( ) {
@Override
@Override
public void onClick ( DialogInterface dialog , int which ) {
public void onClick ( DialogInterface dialog , int which ) {
if ( threadId > 0 ) {
if ( threadId > 0 ) {
@ -661,7 +661,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
}
} ) ;
} ) ;
builder . setNegativeButton ( R. string . no , null ) ;
builder . setNegativeButton ( android. R . string . cancel , null ) ;
builder . show ( ) ;
builder . show ( ) ;
}
}