diff --git a/Runtime/Plugins/Android.meta b/Runtime/Plugins/Android.meta
deleted file mode 100644
index 6afc8856..00000000
--- a/Runtime/Plugins/Android.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b38684a80edc040678173b245ee173a2
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED b/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED
deleted file mode 100644
index 4baa107d..00000000
--- a/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED.meta b/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED.meta
deleted file mode 100644
index a196ba33..00000000
--- a/Runtime/Plugins/Android/AndroidManifest.xml.DISABLED.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 59311d222ebd1434e9bf450746cb88f0
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Runtime/Plugins/Android/mel.aar b/Runtime/Plugins/Android/mel.aar
deleted file mode 100644
index 7f8ca334..00000000
Binary files a/Runtime/Plugins/Android/mel.aar and /dev/null differ
diff --git a/Runtime/Plugins/Android/mel.aar.meta b/Runtime/Plugins/Android/mel.aar.meta
deleted file mode 100644
index 70dcdd1d..00000000
--- a/Runtime/Plugins/Android/mel.aar.meta
+++ /dev/null
@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 2f0f861aee8e445c8972dcabe4f7dcf0
-PluginImporter:
- externalObjects: {}
- serializedVersion: 2
- iconMap: {}
- executionOrder: {}
- defineConstraints: []
- isPreloaded: 0
- isOverridable: 1
- isExplicitlyReferenced: 0
- validateReferences: 1
- platformData:
- - first:
- Android: Android
- second:
- enabled: 1
- settings: {}
- - first:
- Any:
- second:
- enabled: 0
- settings: {}
- - first:
- Editor: Editor
- second:
- enabled: 0
- settings:
- DefaultValueInitialized: true
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Runtime/Plugins/MobiledgeX.MatchingEngineGrpc.dll b/Runtime/Plugins/MobiledgeX.MatchingEngineGrpc.dll
index 501c7d28..90133358 100644
Binary files a/Runtime/Plugins/MobiledgeX.MatchingEngineGrpc.dll and b/Runtime/Plugins/MobiledgeX.MatchingEngineGrpc.dll differ
diff --git a/Runtime/Scripts/EdgeEventsManager.cs b/Runtime/Scripts/EdgeEventsManager.cs
index 883f958b..ddba8ac0 100644
--- a/Runtime/Scripts/EdgeEventsManager.cs
+++ b/Runtime/Scripts/EdgeEventsManager.cs
@@ -482,8 +482,8 @@ private void HandleReceivedEvents(ServerEdgeEvent edgeEvent)
{
errorMsg = $"Received EventAppinstHealth Event but NewCloudlet is null, {edgeEvent.ErrorMsg}";
PropagateError(AppInstHealthChanged, EventTriggeredButFindCloudletError, errorMsg);
- if (edgeEvent.HealthCheck == HealthCheck.FailRootlbOffline
- || edgeEvent.HealthCheck == HealthCheck.FailServerFail
+ if (edgeEvent.HealthCheck == HealthCheck.RootlbOffline
+ || edgeEvent.HealthCheck == HealthCheck.ServerFail
|| edgeEvent.HealthCheck == HealthCheck.CloudletOffline
|| edgeEvent.HealthCheck == HealthCheck.Unknown)
{
diff --git a/Runtime/Scripts/MelMessaging.cs b/Runtime/Scripts/MelMessaging.cs
deleted file mode 100644
index 84d66814..00000000
--- a/Runtime/Scripts/MelMessaging.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
- * MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using UnityEngine;
-using MobiledgeX;
-using DistributedMatchEngine.Mel;
-
-public class MelMessaging : MelMessagingInterface
-{
- /*
- MEL Interface is disabled untill the DME is updated to handle the AppOfficialFqdnRequest with mel session cookie
- #if UNITY_ANDROID
- AndroidJavaObject getActivity()
- {
- AndroidJavaClass unityPlayer = PlatformIntegrationUtil.GetAndroidJavaClass("com.unity3d.player.UnityPlayer");
- if (unityPlayer == null)
- {
- return null;
- }
- AndroidJavaObject activity = PlatformIntegrationUtil.GetStatic(unityPlayer, "currentActivity");
- if (activity == null)
- {
- return null;
- }
- return activity;
- }
-
- AndroidJavaClass getMel()
- {
- AndroidJavaClass MelCls = PlatformIntegrationUtil.GetAndroidJavaClass("com.mobiledgex.mel.MelMessaging");
- return MelCls;
- }
-
- public MelMessaging(string appName)
- {
- // MobiledgeX Vender Interface. Only for Android.
- AndroidJavaClass MelCls = getMel();
-
- // Fire off intents to update MEL state.
- var activity = getActivity();
- if (activity == null)
- {
- return;
- }
- MelCls.CallStatic("sendForMelStatus", activity, appName);
- }
-
- public bool IsMelEnabled()
- {
- AndroidJavaClass MelCls = getMel();
- if (MelCls == null)
- {
- return false;
- }
- bool enabled = PlatformIntegrationUtil.CallStatic(MelCls, "isMelEnabled");
- return enabled;
- }
-
- public string GetMelVersion()
- {
- AndroidJavaClass MelCls = getMel();
- if (MelCls == null)
- {
- return "";
- }
- return PlatformIntegrationUtil.CallStatic(MelCls, "getMelVersion");
- }
-
- public string GetUid()
- {
- AndroidJavaClass MelCls = getMel();
- if (MelCls == null)
- {
- return "";
- }
- string uid = PlatformIntegrationUtil.CallStatic(MelCls, "getUid");
- return uid;
- }
-
- public string SetToken(string token, string app_name)
- {
- AndroidJavaClass MelCls = getMel();
- if (MelCls == null)
- {
- return "";
- }
- object[] pa = new object[3] { getActivity(), token, app_name };
- string sent_token = PlatformIntegrationUtil.CallStatic(MelCls, "sendSetToken", pa);
- return sent_token;
- }
-
- // MelMessaging related:
- public string GetManufacturer()
- {
- AndroidJavaClass BuildCls = PlatformIntegrationUtil.GetAndroidJavaClass("android.os.Build");
- string manufacturer = PlatformIntegrationUtil.GetStatic(BuildCls, "MANUFACTURER");
- return manufacturer;
- }
- #elif UNITY_IOS
- public MelMessaging(string app_name) { }
- public bool IsMelEnabled() { return false; }
- public string GetMelVersion() { return ""; }
- public string SetToken(string token, string app_name) { return ""; }
- public string GetUid() { return ""; }
- public string GetManufacturer() { return "Apple"; }
- #else
- */
- public MelMessaging(string app_name) { }
- public bool IsMelEnabled() { return false; }
- public string GetMelVersion() { return ""; }
- public string SetToken(string token, string app_name) { return ""; }
- public string GetUid() { return ""; }
- public string GetManufacturer() { return ""; }
- // #endif
-}
diff --git a/Runtime/Scripts/MelMessaging.cs.meta b/Runtime/Scripts/MelMessaging.cs.meta
deleted file mode 100644
index 17f1d925..00000000
--- a/Runtime/Scripts/MelMessaging.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a7340f008066f436c80eb93ec935e0f8
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Runtime/Scripts/MobiledgeXIntegration.cs b/Runtime/Scripts/MobiledgeXIntegration.cs
index f266142e..a8ea438c 100644
--- a/Runtime/Scripts/MobiledgeXIntegration.cs
+++ b/Runtime/Scripts/MobiledgeXIntegration.cs
@@ -1,5 +1,5 @@
/**
-* Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
+* Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,7 +81,6 @@ public partial class MobiledgeXIntegration : IDisposable
AppPort latestAppPort = null;
AppPort[] latestAppPortList = null;
Location fallbackLocation = new Location(0, 0);
- MelMessaging melMessaging;
///
/// EdgeEvents Manager is responsible for Sending and Receiving EdgeEvents according to EdgeEvents Config
@@ -142,12 +141,6 @@ public MobiledgeXIntegration(EdgeEventsManager edgeEventsManager = null, Carrier
uniqueId == null ? pIntegration.UniqueID : uniqueId,
deviceInfo == null ? pIntegration.DeviceInfo : deviceInfo);
- if (settings.MEL_ENABLED)
- {
- melMessaging = new MelMessaging(appName);
- matchingEngine.SetMelMessaging(melMessaging);
- }
-
this.edgeEventsManager = edgeEventsManager;
#if UNITY_EDITOR
matchingEngine.EnableEdgeEvents = false;
@@ -169,12 +162,6 @@ public MobiledgeXIntegration(string orgName, string appName, string appVers, str
matchingEngine = new MatchingEngine(pIntegration.CarrierInfo, pIntegration.NetInterface, pIntegration.UniqueID, pIntegration.DeviceInfo);
- if (settings.MEL_ENABLED)
- {
- melMessaging = new MelMessaging(appName);
- matchingEngine.SetMelMessaging(melMessaging);
- }
-
this.edgeEventsManager = edgeEventsManager;
#if UNITY_EDITOR
matchingEngine.EnableEdgeEvents = false;
diff --git a/Runtime/Scripts/MobiledgeXSettings.cs b/Runtime/Scripts/MobiledgeXSettings.cs
index 143bb178..cbe19f7d 100644
--- a/Runtime/Scripts/MobiledgeXSettings.cs
+++ b/Runtime/Scripts/MobiledgeXSettings.cs
@@ -1,5 +1,5 @@
/**
- * Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
+ * Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,8 +31,6 @@ public class MobiledgeXSettings : ScriptableObject
public string region;
public Logger.LogType logType = Logger.LogType.ErrorsAndWarnings;
public EdgeEventsConfig edgeEventsConfig;
- [Tooltip("Set to true, If MEL mode is Enabled on your device.")]
- public bool MEL_ENABLED;
private void OnEnable()
{