felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1231 from vector-im/riot_1207

Browse Source 
Bug Fix: iOS should have 'Send a message (encrypted)' in placeholder

Available only for the iPads, and the iPhones with a large screen (>= 4p7Inch)
This commit is contained in:
giomfo
2017-06-06 10:10:26 +02:00
committed by GitHub
parent f149acadcd b34797525c
commit 4b9650b09e
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/ViewController/RoomViewController.m
+2 -4
View File
@@ -2444,15 +2444,13 @@
completion (finished);
}
// Here the placeholder may have been defined temporarily to display IRC command usage.
// The original placeholder (savedInputToolbarPlaceholder) will be restored during the handling of the next typing notification
// Consider here the saved placeholder only if no new placeholder has been defined during the height animation.
if (!toolbarView.placeholder)
{
// Restore the placeholder if any
toolbarView.placeholder = savedInputToolbarPlaceholder.length ? savedInputToolbarPlaceholder : nil;
savedInputToolbarPlaceholder = nil;
}
savedInputToolbarPlaceholder = nil;
}];
}
}