aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-09-12 22:32:47 +0200
committerChristian Schneppe <christian@pix-art.de>2018-09-13 17:29:36 +0200
commit46b77bf34219aa47e916f0ab980d3bd5bb05ba34 (patch)
tree0a73271b9cdea5577b7d69dbdbf525f24bcc31b7 /src/main/java/de/pixart/messenger/ui
parente50ba72e8ae024e64b1e2b2838f73faf64330adb (diff)
initial work toward api 26+
* introduce notification channels * always use foreground service on 26+
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/SettingsActivity.java3
-rw-r--r--src/main/java/de/pixart/messenger/ui/SettingsFragment.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java6
3 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index 1ace03e5e..4bf9d26cc 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -17,6 +17,7 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.LayoutInflater;
@@ -541,7 +542,7 @@ public class SettingsActivity extends XmppActivity implements
}
private void startExport() {
- startService(new Intent(getApplicationContext(), ExportLogsService.class));
+ ContextCompat.startForegroundService(this, new Intent(this, ExportLogsService.class));
}
private void displayToast(final String msg) {
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
index b40875f7c..ec4898f89 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
@@ -10,6 +10,7 @@ import android.text.TextUtils;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
+import de.pixart.messenger.utils.Compatibility;
public class SettingsFragment extends PreferenceFragment {
@@ -30,6 +31,7 @@ public class SettingsFragment extends PreferenceFragment {
mCategory.removePreference(cleanPrivateStorage);
}
}
+ Compatibility.removeUnusedPreferences(this);
if (!TextUtils.isEmpty(page)) {
openPreferenceScreen(page);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 3ab6bfc6a..acb970e82 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -536,7 +536,11 @@ public abstract class XmppActivity extends ActionBarActivity {
intent.setAction(Intent.ACTION_SEND);
intent.setData(uri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- startService(intent);
+ try {
+ startService(intent);
+ } catch (Exception e) {
+ Log.e(Config.LOGTAG, "unable to delegate uri permission", e);
+ }
}
protected void inviteToConversation(Conversation conversation) {