Merge branch 'task/adjust-megaintegermap' into 'develop'

CHT-822. Adjust MegaIntegerMap getters (v2) See merge request megachat/MEGAchat!1521
meganz · Feb 16, 2023 · 0fdcf61 · 0fdcf61
2 parents e34e437 + 5724bc4
commit 0fdcf61
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/bindings/Objective-C/MEGAChatScheduledRules.mm b/bindings/Objective-C/MEGAChatScheduledRules.mm
@@ -87,12 +87,14 @@ - (uint64_t)until {
 
     for (int i = 0; i < integerMap->size(); i++)
     {
-        long long key;
-        long long value;
-        integerMap->at(i, key, value);
-
-        NSMutableArray<NSNumber *> *keyValueArray = @[[NSNumber.alloc initWithInt:key], [NSNumber.alloc initWithInt:value]];
-        [integerArray addObject:keyValueArray];
+        MegaIntegerList *keyList = integerMap->getKeys();
+        for (int i = 0; i < keyList->size(); i++)
+        {
+            uint64_t key = keyList->get(i);
+            MegaIntegerList *valueList = integerMap->get(key);
+            NSMutableArray<NSNumber *> *keyValueArray = @[[NSNumber.alloc initWithInt:key], [NSNumber.alloc initWithInt:valueList->get(0)]];
+            [integerArray addObject:keyValueArray];
+        }
     }
 
     delete integerMap;

diff --git a/src/chatClient.cpp b/src/chatClient.cpp
@@ -5538,12 +5538,14 @@ KarereScheduledRules::KarereScheduledRules(const mega::MegaScheduledRules *rules
     if (rules->byMonthWeekDay() && rules->byMonthWeekDay()->size())
     {
         mByMonthWeekDay.reset(new karere_rules_map());
-        for (size_t i = 0; i < rules->byMonthWeekDay()->size(); i++)
+        std::unique_ptr<::mega::MegaIntegerList> keys(rules->byMonthWeekDay()->getKeys());
+        for (auto i = 0 ; i < keys->size(); i++)
         {
-            long long key;
-            long long value;
-            if (rules->byMonthWeekDay()->at(i, key, value))
+            int64_t key = keys->get(i);
+            std::unique_ptr<::mega::MegaIntegerList> values(rules->byMonthWeekDay()->get(key));
+            for (auto j = 0 ; j < values->size(); j++)
             {
+                int64_t value = values->get(j);
                 mByMonthWeekDay->emplace(key, value);
             }
         }
@@ -5616,13 +5618,15 @@ bool KarereScheduledRules::equalTo(const ::mega::MegaScheduledRules* r) const
         }
 
         karere_rules_map auxMap;
-        for (unsigned long long i = 0; i < r->byMonthWeekDay()->size(); i++)
+        std::unique_ptr<::mega::MegaIntegerList> keys(r->byMonthWeekDay()->getKeys());
+        for (auto i = 0 ; i < keys->size(); i++)
         {
-            long long auxkey;
-            long long auxvalue;
-            if (r->byMonthWeekDay()->at(i, auxkey, auxvalue))
+            int64_t key = keys->get(i);
+            std::unique_ptr<::mega::MegaIntegerList> values(r->byMonthWeekDay()->get(key));
+            for (auto j = 0 ; j < values->size(); j++)
             {
-                auxMap.emplace(auxkey, auxvalue);
+                int64_t value = values->get(j);
+                auxMap.emplace(key, value);
             }
         }