fix: merge 10.0.1

NextAlone · Aug 15, 2023 · b65bb2d · b65bb2d
1 parent 504d79b
commit b65bb2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/OSMDroidMapsProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/OSMDroidMapsProvider.java
@@ -311,6 +311,11 @@ public float getMaxZoomLevel() {
             return (float) this.mapView.getMaxZoomLevel();
         }
 
+        @Override
+        public float getMinZoomLevel() {
+            return (float) this.mapView.getMinZoomLevel();
+        }
+
         @Override
         public void setMyLocationEnabled(boolean enabled) {
             if (myLocationOverlay != null) {
@@ -343,6 +348,11 @@ public IUISettings getUiSettings() {
             return this.uiSettings;
         }
 
+        @Override
+        public void setOnCameraIdleListener(Runnable callback) {
+
+        }
+
         @Override
         public void setOnCameraMoveStartedListener(OnCameraMoveStartedListener onCameraMoveStartedListener) {
             this.mapView.addMapListener(new MapListener() {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/NotificationPermissionDialog.java b/TMessagesProj/src/main/java/org/telegram/ui/NotificationPermissionDialog.java
@@ -32,6 +32,7 @@
 import org.telegram.messenger.NotificationCenter;
 import org.telegram.messenger.NotificationsController;
 import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
 import org.telegram.messenger.UserConfig;
 import org.telegram.messenger.Utilities;
 import org.telegram.ui.ActionBar.BottomSheet;
@@ -114,7 +115,7 @@ public NotificationPermissionDialog(Context context, Utilities.Callback<Boolean>
         });
         linearLayout.addView(textView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48, 14, 14, 14, 10));
 
-        for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; ++a) {
+        for (int a : SharedConfig.activeAccounts) {
             try {
                 NotificationCenter.getInstance(a).addObserver(this, NotificationCenter.updateInterfaces);
             } catch (Exception ignore) {}
@@ -133,7 +134,7 @@ public void didReceivedNotification(int id, int account, Object... args) {
 
     public void updateCounter() {
         int counter = 0;
-        for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; ++a) {
+        for (int a : SharedConfig.activeAccounts) {
             MessagesStorage messagesStorage = MessagesStorage.getInstance(a);
             if (messagesStorage != null) {
                 counter += messagesStorage.getMainUnreadCount();
@@ -172,7 +173,7 @@ public void dismiss() {
                 askLater();
             }
         }
-        for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; ++a) {
+        for (int a : SharedConfig.activeAccounts) {
             try {
                 NotificationCenter.getInstance(a).removeObserver(this, NotificationCenter.updateInterfaces);
             } catch (Exception ignore) {}