Merge pull request #90 from Backendless/BKNDLSS-28938/login_fix

stayLoggedIn fix for Unity

Author: markpiller

Backendless/Messaging/DeviceRegistrationDto.cs

@@ -1,6 +1,10 @@
 using System;
 using Weborb.Service;
+using System.Diagnostics;
+using System.Text;
+#if !UNITY
 using Plugin.DeviceInfo;
+#endif
 using System.Collections.Generic;
 
 namespace BackendlessAPI.Messaging
@@ -29,8 +33,11 @@ public class DeviceRegistration
     public String RegistrationId { get; set; }
 
     [SetClientClassMemberName( "deviceId" )]
+#if !UNITY
     public String DeviceId { get; } = CrossDeviceInfo.Current.Id;
-
+#else
+    public String DeviceId { get; } = DeviceIdGenerator();
+#endif
     public void AddChannel( String channel )
     {
       if( Channels == null )
@@ -46,5 +53,13 @@ public void ClearRegistration()
       RegistrationId = null;
       DeviceToken = null;
     }
+#if UNITY
+    public static String DeviceIdGenerator()
+    {
+      Guid guid = Guid.NewGuid();
+      string str = guid.ToString();
+      return str;
+    }
+#endif
   }
 }

Backendless/Service/MessagingService.cs

@@ -29,8 +29,8 @@ public class MessagingService
     private static string DEFAULT_CHANNEL_NAME = "default";
     private static string deviceId;
     private static int CHANNEL_NAME_MAX_LENGTH = 46;
-    //private static Messaging.DeviceRegistration _deviceRegistrationDto;
-  #if UNITY
+#if UNITY
+    private static Messaging.DeviceRegistration _deviceRegistrationDto;
     private static AsyncCallback<string> _deviceRegisterCallback = null;
     private static AsyncCallback<bool> _deviceUnregisterCallback = null;
     public delegate void UnityRegisterDevice( string GCMSenderID, List<String> channels, DateTime? expiration );

Backendless/Utils/LoginStorage.cs

@@ -55,9 +55,16 @@ private bool LoadData()
 #else
       try
       {
-          // Retrieve an IsolatedStorageFile for the current Domain and Assembly.
-          IsolatedStorageFileStream isoStream = null;
-#if !WINDOWS_PHONE && !WINDOWS_PHONE8
+        // Retrieve an IsolatedStorageFile for the current Domain and Assembly.
+        IsolatedStorageFileStream isoStream = null;
+
+#if NET_471 && UNITY
+        var userData = System.IO.File.ReadAllLines("BackendlessUserInfoUnity.txt");
+        this.UserToken = userData[ 0 ];
+        this.ObjectId = userData[ 1 ];
+        return true;
+
+#elif !WINDOWS_PHONE && !WINDOWS_PHONE8 && !UNITY
           IsolatedStorageFile isoFile =
             IsolatedStorageFile.GetStore( IsolatedStorageScope.User |
             IsolatedStorageScope.Assembly |
@@ -111,10 +118,12 @@ private bool LoadData()
         return false;
       }
 #endif
-    }
+      }
 
     public void SaveData()
     {
+      // Retrieve an IsolatedStorageFile for the current Domain and Assembly.
+      IsolatedStorageFileStream isoStream = null;
 #if UNIVERSALW8
       ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
       ApplicationDataCompositeValue userInfo = new ApplicationDataCompositeValue();
@@ -125,40 +134,43 @@ public void SaveData()
 #else
       try
       {
-#if !WINDOWS_PHONE && !WINDOWS_PHONE8
+#if NET_471  && UNITY
+        System.IO.File.WriteAllLines( "BackendlessUserInfoUnity.txt", new string[] { this.UserToken, this.ObjectId } );
+        return;
+#elif !WINDOWS_PHONE && !WINDOWS_PHONE8 && !UNITY
         IsolatedStorageFile isoFile;
         isoFile = IsolatedStorageFile.GetUserStoreForDomain();
 
         // Open or create a writable file.
-        IsolatedStorageFileStream isoStream =
+        isoStream =
             new IsolatedStorageFileStream( "BackendlessUserInfo",
             FileMode.OpenOrCreate,
             FileAccess.Write,
             isoFile ); 
 #else
           IsolatedStorageFile isoFile =
     IsolatedStorageFile.GetUserStoreForApplication();
-
         IsolatedStorageFileStream isoStream = new IsolatedStorageFileStream( "BackendlessUserInfo",
             FileMode.OpenOrCreate,
             FileAccess.Write,
             isoFile );
 #endif
-
+#if !UNITY
         StreamWriter writer = new StreamWriter( isoStream );
         writer.WriteLine( this.UserToken );
         writer.WriteLine( this.ObjectId );
         // StreamWriter.Close implicitly closes isoStream.
         writer.Close();
-        isoFile.Dispose();
+        isoStream.Close();
+#endif
       }
       catch( IsolatedStorageException ex )
       {
         // Add code here to handle the exception.
         Console.WriteLine( ex );
       }
 #endif
-    }
+      }
 
     public void DeleteFiles()
     {
@@ -168,17 +180,19 @@ public void DeleteFiles()
 #else
       try
       {
-#if !WINDOWS_PHONE && !WINDOWS_PHONE8 && !PURE_CLIENT_LIB
+#if NET_471 && UNITY
+        System.IO.File.Delete("BackendlessUserInfoUnity.txt");
+#elif !WINDOWS_PHONE && !WINDOWS_PHONE8 && !PURE_CLIENT_LIB && !UNITY
         IsolatedStorageFile isoFile = IsolatedStorageFile.GetStore( IsolatedStorageScope.User |
             IsolatedStorageScope.Assembly |
             IsolatedStorageScope.Domain,
             typeof( System.Security.Policy.Url ),
             typeof( System.Security.Policy.Url ) );
 #else
-          IsolatedStorageFile isoFile =
+        IsolatedStorageFile isoFile =
     IsolatedStorageFile.GetUserStoreForDomain();
 #endif
-
+#if !UNITY
         //String[] dirNames = isoFile.GetDirectoryNames( "*" );
         String[] fileNames = isoFile.GetFileNames( "*" );
 
@@ -195,13 +209,14 @@ public void DeleteFiles()
           // Confirm that no files remain.
           fileNames = isoFile.GetFileNames( "*" );
         }
+#endif
       }
       catch( System.Exception e )
       {
         Console.WriteLine( e.ToString() );
       }
 #endif
-    }
+      }
     // This method deletes directories in the specified Isolated Storage, after first 
     // deleting the files they contain. In this example, the Archive directory is deleted. 
     // There should be no other directories in this Isolated Storage.

Projects/Backendless.NET.Framework4.7.1/Backendless.NET.Framework4.7.1.csproj

@@ -18,7 +18,7 @@
     <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;PURE_CLIENT_LIB;WITHRT</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;PURE_CLIENT_LIB;WITHRT;NET_471</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -50,6 +50,9 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
+    </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
@@ -69,6 +72,7 @@
       <HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Management" />
     <Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
       <Private>True</Private>
@@ -291,7 +295,7 @@
     <Compile Include="..\..\Backendless\Transaction\Operations\OperationSetRelation.cs" />
     <Compile Include="..\..\Backendless\Transaction\Operations\OperationUpdate.cs" />
     <Compile Include="..\..\Backendless\Transaction\Operations\OperationUpdateBulk.cs" />
-	<Compile Include="..\..\Backendless\Transaction\Operations\OperationUpsert.cs" />
+    <Compile Include="..\..\Backendless\Transaction\Operations\OperationUpsert.cs" />
     <Compile Include="..\..\Backendless\Transaction\Operations\OperationUpsertBulk.cs" />
     <Compile Include="..\..\Backendless\Transaction\Operations\OperationFind.cs" />
     <Compile Include="..\..\Backendless\Transaction\Payload\Selector.cs" />
@@ -308,7 +312,7 @@
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkExecutorImpl.cs" />
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkFindImpl.cs" />
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkUpdateImpl.cs" />
-	<Compile Include="..\..\Backendless\Transaction\UnitOfWorkUpsertImpl.cs" />
+    <Compile Include="..\..\Backendless\Transaction\UnitOfWorkUpsertImpl.cs" />
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkResult.cs" />
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkAddRelationImpl.cs" />
     <Compile Include="..\..\Backendless\Transaction\UnitOfWorkSetRelationImpl.cs" />
@@ -320,7 +324,7 @@
     <Compile Include="..\..\Backendless\Transaction\TransactionHelper.cs" />
     <Compile Include="..\..\Backendless\Utils\DeviceCheck.cs" />
     <Compile Include="..\..\Backendless\Utils\ILoginStorage.cs" />
-	<Compile Include="..\..\Backendless\Utils\InitAppData.cs" />
+    <Compile Include="..\..\Backendless\Utils\InitAppData.cs" />
     <Compile Include="..\..\Backendless\Utils\ITimeoutManager.cs" />
     <Compile Include="..\..\Backendless\Utils\Json.cs" />
     <Compile Include="..\..\Backendless\Utils\LoginStorage.cs" />
@@ -518,8 +522,10 @@
     <Compile Include="..\..\Backendless\WebORB\Writer\V3ObjectSerializer.cs" />
     <Compile Include="..\..\Backendless\WebORB\Writer\V3ReferenceCache.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\Backendless\Messaging\DeviceRegistrationDto.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />