diff options
| author | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
| commit | d6a076e11281d4c3fb6b9504fe99d799b04ebbbb (patch) | |
| tree | 7cbbe209ed0a883bcf29389d91979974444447c1 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | bfb3cb844578d06fad9aade3a7576ee44d785f70 (diff) | |
| parent | 5eedce91f9d92e5139f13fddb57314570f42b9ad (diff) | |
Merge tag '1.11.3' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 880641b9..29c9ee0c 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -958,6 +958,10 @@ public abstract class XmppActivity extends Activity { } } + protected boolean neverCompressPictures() { + return getPreferences().getString("picture_compression", "auto").equals("never"); + } + protected void unregisterNdefPushMessageCallback() { NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this); if (nfcAdapter != null && nfcAdapter.isEnabled()) { |