vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-05-05 15:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.7.1

Browse source
This commit is contained in:
DrKLO 2019-06-04 13:14:50 +03:00
parent 96247ca2bc
commit 9ffc7787d6
923 changed files with 208929 additions and 3107 deletions
Download patch file Download diff file Expand all files Collapse all files

58
TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
View file

@ -63,6 +63,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
public class NotificationsController {
@ -2201,6 +2202,52 @@ public class NotificationsController {
return true;
}
@TargetApi(26)
public void deleteNotificationChannel(long dialogId) {
notificationsQueue.postRunnable(() -> {
if (Build.VERSION.SDK_INT < 26) {
return;
}
try {
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
String key = "org.telegram.key" + dialogId;
String channelId = preferences.getString(key, null);
if (channelId != null) {
preferences.edit().remove(key).remove(key + "_s").commit();
systemNotificationManager.deleteNotificationChannel(channelId);
}
} catch (Exception e) {
FileLog.e(e);
}
});
}
@TargetApi(26)
public void deleteAllNotificationChannels() {
notificationsQueue.postRunnable(() -> {
if (Build.VERSION.SDK_INT < 26) {
return;
}
try {
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
Map<String, ?> values = preferences.getAll();
SharedPreferences.Editor editor = preferences.edit();
for (Map.Entry<String, ?> entry : values.entrySet()) {
String key = entry.getKey();
if (key.startsWith("org.telegram.key")) {
if (!key.endsWith("_s")) {
systemNotificationManager.deleteNotificationChannel((String) entry.getValue());
}
editor.remove(key);
}
}
editor.commit();
} catch (Exception e) {
FileLog.e(e);
}
});
}
@TargetApi(26)
private String validateChannelId(long dialogId, String name, long[] vibrationPattern, int ledColor, Uri sound, int importance, long[] configVibrationPattern, Uri configSound, int configImportance) {
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
@ -2783,13 +2830,16 @@ public class NotificationsController {
mBuilder.setSound(Settings.System.DEFAULT_NOTIFICATION_URI, AudioManager.STREAM_NOTIFICATION);
} else {
if (Build.VERSION.SDK_INT >= 24 && choosenSoundPath.startsWith("file://") && !AndroidUtilities.isInternalUri(Uri.parse(choosenSoundPath))) {
Uri uri = FileProvider.getUriForFile(ApplicationLoader.applicationContext, BuildConfig.APPLICATION_ID + ".provider", new File(choosenSoundPath.replace("file://", "")));
ApplicationLoader.applicationContext.grantUriPermission("com.android.systemui", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
mBuilder.setSound(uri, AudioManager.STREAM_NOTIFICATION);
try {
Uri uri = FileProvider.getUriForFile(ApplicationLoader.applicationContext, BuildConfig.APPLICATION_ID + ".provider", new File(choosenSoundPath.replace("file://", "")));
ApplicationLoader.applicationContext.grantUriPermission("com.android.systemui", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
mBuilder.setSound(uri, AudioManager.STREAM_NOTIFICATION);
} catch (Exception e) {
mBuilder.setSound(Uri.parse(choosenSoundPath), AudioManager.STREAM_NOTIFICATION);
}
} else {
mBuilder.setSound(Uri.parse(choosenSoundPath), AudioManager.STREAM_NOTIFICATION);
}
mBuilder.setSound(Uri.parse(choosenSoundPath), AudioManager.STREAM_NOTIFICATION);
}
}
}