fix(scheme): Fixing collisions in new service messages

actorapp · Feb 5, 2016 · 6fab02b · 6fab02b
1 parent 4c0fb4d
commit 6fab02b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/actor-sdk/sdk-api/actor.json b/actor-sdk/sdk-api/actor.json
@@ -3901,7 +3901,7 @@
             ],
             "trait": {
               "name": "ServiceEx",
-              "key": 16
+              "key": 20
             },
             "expandable": "true",
             "attributes": []
@@ -3916,7 +3916,7 @@
             ],
             "trait": {
               "name": "ServiceEx",
-              "key": 17
+              "key": 21
             },
             "expandable": "true",
             "attributes": []

diff --git a/actor-sdk/sdk-api/api-language/solutions/im.actor.api/models/im/actor/api/scheme.mps b/actor-sdk/sdk-api/api-language/solutions/im.actor.api/models/im/actor/api/scheme.mps
@@ -3663,7 +3663,7 @@
         <property role="w4tQU" value="true" />
         <ref role="w4$XZ" node="55bmeIQ9med" resolve="ServiceEx" />
         <node concept="Nu42z" id="6gbxTdnelwL" role="3BtCOu">
-          <property role="Nu42W" value="10" />
+          <property role="Nu42W" value="14" />
         </node>
         <node concept="NXeRC" id="6gbxTdnelwN" role="NXodf">
           <property role="NXePf" value="Message about chat archived" />
@@ -3675,7 +3675,7 @@
         <property role="tsOgz" value="true" />
         <ref role="w4$XZ" node="55bmeIQ9med" resolve="ServiceEx" />
         <node concept="Nu42z" id="6gbxTdnemQg" role="3BtCOu">
-          <property role="Nu42W" value="11" />
+          <property role="Nu42W" value="15" />
         </node>
         <node concept="NXeRC" id="6gbxTdnemQi" role="NXodf">
           <property role="NXePf" value="Message about chat restored" />

diff --git a/actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/ActorSDK.java b/actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/ActorSDK.java
@@ -24,7 +24,7 @@
 import im.actor.core.PlatformType;
 import im.actor.core.entity.Peer;
 import im.actor.core.events.IncomingCall;
-import im.actor.core.modules.internal.CallsModule;
+import im.actor.core.modules.calls.CallsModule;
 import im.actor.runtime.Log;
 import im.actor.runtime.android.view.BindedViewHolder;
 import im.actor.runtime.eventbus.BusSubscriber;

diff --git a/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/Messenger.java b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/Messenger.java
@@ -43,7 +43,7 @@
 import im.actor.core.events.PeerInfoClosed;
 import im.actor.core.events.PeerInfoOpened;
 import im.actor.core.events.UserVisible;
-import im.actor.core.modules.internal.CallsModule;
+import im.actor.core.modules.calls.CallsModule;
 import im.actor.core.network.NetworkState;
 import im.actor.core.util.ActorTrace;
 import im.actor.core.util.Timing;

diff --git a/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/ModuleContext.java b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/ModuleContext.java
@@ -6,7 +6,7 @@
 import im.actor.core.modules.api.ApiModule;
 import im.actor.core.modules.sequence.Updates;
 import im.actor.core.modules.internal.AppStateModule;
-import im.actor.core.modules.internal.CallsModule;
+import im.actor.core.modules.calls.CallsModule;
 import im.actor.core.modules.internal.ContactsModule;
 import im.actor.core.modules.internal.DeviceInfoModule;
 import im.actor.core.modules.internal.DisplayLists;

diff --git a/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/Modules.java b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/Modules.java
@@ -10,7 +10,7 @@
 import im.actor.core.modules.api.ApiModule;
 import im.actor.core.modules.sequence.Updates;
 import im.actor.core.modules.internal.AppStateModule;
-import im.actor.core.modules.internal.CallsModule;
+import im.actor.core.modules.calls.CallsModule;
 import im.actor.core.modules.internal.ContactsModule;
 import im.actor.core.modules.internal.DeviceInfoModule;
 import im.actor.core.modules.internal.DisplayLists;

diff --git a/...ore/modules/internal/calls/CallActor.java → ...m/actor/core/modules/calls/CallActor.java b/...ore/modules/internal/calls/CallActor.java → ...m/actor/core/modules/calls/CallActor.java
@@ -1,9 +1,8 @@
-package im.actor.core.modules.internal.calls;
+package im.actor.core.modules.calls;
 
 import java.util.ArrayList;
 
 import im.actor.core.modules.ModuleContext;
-import im.actor.core.modules.internal.CallsModule;
 import im.actor.core.util.ModuleActor;
 import im.actor.runtime.Log;
 import im.actor.runtime.actors.messages.PoisonPill;

diff --git a/...or/core/modules/internal/CallsModule.java → ...actor/core/modules/calls/CallsModule.java b/...or/core/modules/internal/CallsModule.java → ...actor/core/modules/calls/CallsModule.java
@@ -1,4 +1,4 @@
-package im.actor.core.modules.internal;
+package im.actor.core.modules.calls;
 
 import java.util.HashMap;
 
@@ -16,7 +16,7 @@
 import im.actor.core.events.NewSessionCreated;
 import im.actor.core.modules.AbsModule;
 import im.actor.core.modules.ModuleContext;
-import im.actor.core.modules.internal.calls.CallActor;
+import im.actor.core.modules.calls.CallActor;
 import im.actor.core.network.RpcCallback;
 import im.actor.core.network.RpcException;
 import im.actor.core.viewmodel.Command;
@@ -43,7 +43,7 @@ public CallsModule(ModuleContext context) {
     public static final int CALL_TIMEOUT = 10;
     public static boolean CALLS_ENABLED = false;
     public static boolean MULTIPLE_CALLS_ENABLED = false;
-    HashMap<Long, ActorRef> calls = new HashMap<Long, ActorRef>();
+    HashMap<Long, ActorRef> calls = new HashMap<>();
 
     public void run() {
         if (CALLS_ENABLED) {