From 6fab02b1c1259ade31b3eb349d98f0758420e529 Mon Sep 17 00:00:00 2001 From: Steve Kite Date: Fri, 5 Feb 2016 17:21:44 +0300 Subject: [PATCH] fix(scheme): Fixing collisions in new service messages --- actor-sdk/sdk-api/actor.json | 4 ++-- .../solutions/im.actor.api/models/im/actor/api/scheme.mps | 4 ++-- .../android-sdk/src/main/java/im/actor/sdk/ActorSDK.java | 2 +- .../core-shared/src/main/java/im/actor/core/Messenger.java | 2 +- .../src/main/java/im/actor/core/modules/ModuleContext.java | 2 +- .../src/main/java/im/actor/core/modules/Modules.java | 2 +- .../actor/core/modules/{internal => }/calls/CallActor.java | 3 +-- .../actor/core/modules/{internal => calls}/CallsModule.java | 6 +++--- 8 files changed, 12 insertions(+), 13 deletions(-) rename actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/{internal => }/calls/CallActor.java (97%) rename actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/{internal => calls}/CallsModule.java (97%) diff --git a/actor-sdk/sdk-api/actor.json b/actor-sdk/sdk-api/actor.json index 6d2234439e..fbcf44a2e0 100644 --- 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 index 56f6210192..9394872ac1 100644 --- 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 @@ - + @@ -3675,7 +3675,7 @@ - + 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 index 43a4b06c30..4d5d6fe23b 100644 --- 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 index 1db83626f3..180a9e61be 100644 --- 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 index c037014a69..d0ce68cd8e 100644 --- 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 index 011c9ed14f..63989df453 100644 --- 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/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/calls/CallActor.java b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/calls/CallActor.java similarity index 97% rename from actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/calls/CallActor.java rename to actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/calls/CallActor.java index 27c2ec69b2..c5f0055d64 100644 --- a/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/calls/CallActor.java +++ b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/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/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/CallsModule.java b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/calls/CallsModule.java similarity index 97% rename from actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/CallsModule.java rename to actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/calls/CallsModule.java index 570f0e82f9..2b3bc7ce9f 100644 --- a/actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/internal/CallsModule.java +++ b/actor-sdk/sdk-core/core/core-shared/src/main/java/im/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 calls = new HashMap(); + HashMap calls = new HashMap<>(); public void run() { if (CALLS_ENABLED) {