kopia lustrzana https://github.com/ryukoposting/Signal-Android
				
				
				
			
							rodzic
							
								
									715b1ea10d
								
							
						
					
					
						commit
						b44acd82e6
					
				| 
						 | 
				
			
			@ -120,6 +120,10 @@
 | 
			
		|||
    <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string>
 | 
			
		||||
    <string name="ConversationFragment_saving_attachment">Saving attachment</string>
 | 
			
		||||
    <string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string>
 | 
			
		||||
    <string name="ConversationFragment_pending">PENDING</string>
 | 
			
		||||
    <string name="ConversationFragment_push">PUSH</string>
 | 
			
		||||
    <string name="ConversationFragment_mms">MMS</string>
 | 
			
		||||
    <string name="ConversationFragment_sms">SMS</string>
 | 
			
		||||
 | 
			
		||||
    <!-- ConversationListFragment -->
 | 
			
		||||
    <string name="ConversationListFragment_delete_threads_question">Delete threads?</string>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -198,10 +198,10 @@ public class ConversationFragment extends ListFragment
 | 
			
		|||
 | 
			
		||||
    String transport;
 | 
			
		||||
 | 
			
		||||
    if      (message.isPending()) transport = "pending";
 | 
			
		||||
    else if (message.isPush())    transport = "push";
 | 
			
		||||
    else if (message.isMms())     transport = "mms";
 | 
			
		||||
    else                          transport = "sms";
 | 
			
		||||
    if      (message.isPending()) transport = getString(R.string.ConversationFragment_pending);
 | 
			
		||||
    else if (message.isPush())    transport = getString(R.string.ConversationFragment_push);
 | 
			
		||||
    else if (message.isMms())     transport = getString(R.string.ConversationFragment_mms);
 | 
			
		||||
    else                          transport = getString(R.string.ConversationFragment_sms);
 | 
			
		||||
 | 
			
		||||
    SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
 | 
			
		||||
    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 | 
			
		||||
| 
						 | 
				
			
			@ -212,13 +212,13 @@ public class ConversationFragment extends ListFragment
 | 
			
		|||
    if (dateReceived == dateSent || message.isOutgoing()) {
 | 
			
		||||
      builder.setMessage(String.format(getActivity()
 | 
			
		||||
                                       .getString(R.string.ConversationFragment_transport_s_sent_received_s),
 | 
			
		||||
                                       transport.toUpperCase(),
 | 
			
		||||
                                       transport,
 | 
			
		||||
                                       dateFormatter.format(new Date(dateSent))));
 | 
			
		||||
    } else {
 | 
			
		||||
      builder.setMessage(String.format(getActivity()
 | 
			
		||||
                                       .getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s),
 | 
			
		||||
                                       message.getIndividualRecipient().getNumber(),
 | 
			
		||||
                                       transport.toUpperCase(),
 | 
			
		||||
                                       transport,
 | 
			
		||||
                                       dateFormatter.format(new Date(dateSent)),
 | 
			
		||||
                                       dateFormatter.format(new Date(dateReceived))));
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue