mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Skip importing channels without group

This commit is contained in:
M66B 2019-05-29 10:16:38 +02:00
parent 0d2bd37772
commit fe615f022a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@ -35,6 +35,7 @@ import android.os.Build;
import android.os.DeadSystemException; import android.os.DeadSystemException;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils;
import android.view.OrientationEventListener; import android.view.OrientationEventListener;
import android.webkit.CookieManager; import android.webkit.CookieManager;
@ -375,6 +376,12 @@ public class ApplicationEx extends Application {
for (int c = 0; c < jchannels.length(); c++) { for (int c = 0; c < jchannels.length(); c++) {
JSONObject jchannel = (JSONObject) jchannels.get(c); JSONObject jchannel = (JSONObject) jchannels.get(c);
// Legacy
if (!jchannel.has("group") ||
jchannel.isNull("group") ||
TextUtils.isEmpty(jchannel.getString("group")))
continue;
String id = jchannel.getString("id"); String id = jchannel.getString("id");
if (nm.getNotificationChannel(id) == null) { if (nm.getNotificationChannel(id) == null) {
NotificationChannel channel = new NotificationChannel( NotificationChannel channel = new NotificationChannel(
@ -382,12 +389,10 @@ public class ApplicationEx extends Application {
jchannel.getString("name"), jchannel.getString("name"),
jchannel.getInt("importance")); jchannel.getInt("importance"));
if (jchannel.has("group") && !jchannel.isNull("group")) { String groupName = jchannel.getString("group");
String groupName = jchannel.getString("group"); NotificationChannelGroup group = new NotificationChannelGroup(groupName, groupName);
NotificationChannelGroup group = new NotificationChannelGroup(groupName, groupName); nm.createNotificationChannelGroup(group);
nm.createNotificationChannelGroup(group); channel.setGroup(groupName);
channel.setGroup(groupName);
}
if (jchannel.has("description") && !jchannel.isNull("description")) if (jchannel.has("description") && !jchannel.isNull("description"))
channel.setDescription(jchannel.getString("description")); channel.setDescription(jchannel.getString("description"));
@ -407,7 +412,6 @@ public class ApplicationEx extends Application {
channel.enableVibration(jchannel.getBoolean("vibrate")); channel.enableVibration(jchannel.getBoolean("vibrate"));
Log.i("Creating channel=" + channel); Log.i("Creating channel=" + channel);
nm.deleteNotificationChannel(id);
nm.createNotificationChannel(channel); nm.createNotificationChannel(channel);
} }
} }