fixed regression from previous commit and brought back 'select text'
This commit is contained in:
parent
7c31a981bb
commit
ef78721f94
|
@ -612,6 +612,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
|
MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
|
||||||
MenuItem deleteFile = menu.findItem(R.id.delete_file);
|
MenuItem deleteFile = menu.findItem(R.id.delete_file);
|
||||||
MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
|
MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
|
||||||
|
if (!treatAsFile && !GeoHelper.isGeoUri(m.getBody()) && !m.treatAsDownloadable()) {
|
||||||
|
selectText.setVisible(ListSelectionManager.isSupported());
|
||||||
|
}
|
||||||
if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
|
if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
|
||||||
retryDecryption.setVisible(true);
|
retryDecryption.setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,18 +5,18 @@
|
||||||
android:id="@+id/select_text"
|
android:id="@+id/select_text"
|
||||||
android:title="@string/select_text"
|
android:title="@string/select_text"
|
||||||
android:visible="false"/>
|
android:visible="false"/>
|
||||||
|
<item
|
||||||
|
android:id="@+id/share_with"
|
||||||
|
android:title="@string/share_with"
|
||||||
|
android:visible="false"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/retry_decryption"
|
android:id="@+id/retry_decryption"
|
||||||
android:title="Retry decryption"
|
android:title="@string/retry_decryption"
|
||||||
android:visible="false"/>
|
android:visible="false"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/correct_message"
|
android:id="@+id/correct_message"
|
||||||
android:title="@string/correct_message"
|
android:title="@string/correct_message"
|
||||||
android:visible="false"/>
|
android:visible="false"/>
|
||||||
<item
|
|
||||||
android:id="@+id/share_with"
|
|
||||||
android:title="@string/share_with"
|
|
||||||
android:visible="false"/>
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/copy_url"
|
android:id="@+id/copy_url"
|
||||||
android:title="@string/copy_original_url"
|
android:title="@string/copy_original_url"
|
||||||
|
|
|
@ -744,4 +744,5 @@
|
||||||
<string name="block_stranger">Block stranger</string>
|
<string name="block_stranger">Block stranger</string>
|
||||||
<string name="block_entire_domain">Block entire domain</string>
|
<string name="block_entire_domain">Block entire domain</string>
|
||||||
<string name="online_right_now">online right now</string>
|
<string name="online_right_now">online right now</string>
|
||||||
|
<string name="retry_decryption">Retry decryption</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue