moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 03:32:15 -05:00
Code Issues Releases Wiki Activity

fixed regression from previous commit and brought back 'select text'

Browse Source
This commit is contained in:
Daniel Gultsch 2017-05-02 10:42:50 +02:00
parent 7c31a981bb
commit ef78721f94
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -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);
} }

10
src/main/res/menu/message_context.xml
View File

@ -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"

1
src/main/res/values/strings.xml
View File

@ -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>