iOS: ReachabilityHelper is now used to detect connection change and r…

…estart the HTTP server when wifi comes available. Updated views after changes on Android. Updated project files after changes on Android. Related to issue #405.
ycastonguay · Jul 22, 2013 · e0a4f51 · e0a4f51
1 parent 4945faa
commit e0a4f51
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 33 deletions.
diff --git a/MPfm/MPfm.Library/MPfm.Library.csproj b/MPfm/MPfm.Library/MPfm.Library.csproj
@@ -160,6 +160,7 @@
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
     <Compile Include="ILibrary.cs" />
+    <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />
     <Compile Include="Objects\Setting.cs" />

diff --git a/MPfm/MPfm.Library/MPfm.Library.iOS.csproj b/MPfm/MPfm.Library/MPfm.Library.iOS.csproj
@@ -198,12 +198,16 @@
     <EmbeddedResource Include="WebApp\js\jquery.upload-1.0.2.min.js" />
     <EmbeddedResource Include="WebApp\images\app_logo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Lib\iOS\Newtonsoft.Json.dll" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Database\MonoSQLiteGateway.cs" />
     <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
     <Compile Include="ILibrary.cs" />
+    <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />
     <Compile Include="Objects\Setting.cs" />
@@ -238,7 +242,4 @@
     <Compile Include="Objects\UpdateLibraryEntity.cs" />
     <Compile Include="Objects\SyncClientDownloadAudioFileProgressEntity.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Lib\iOS\Newtonsoft.Json.dll" />
-  </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -108,6 +108,7 @@
   </ProjectExtensions>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />

diff --git a/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj b/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -175,6 +175,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
@@ -297,4 +298,4 @@
     <Compile Include="Presenters\SyncDownloadPresenter.cs" />
     <Compile Include="Messages\PlayerPlaylistUpdatedMessage.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/MPfm/MPfm.Player/MPfm.Player.iOS.csproj b/MPfm/MPfm.Player/MPfm.Player.iOS.csproj
@@ -138,9 +138,6 @@
       <HintPath>..\MPfm.Sound\Lib\iOS\Bass.Net.iOS.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Lib\Bass.Net.dll" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 

diff --git a/MPfm/MPfm.Sound/BassNetKey.cs b/MPfm/MPfm.Sound/BassNetKey.cs
@@ -1,12 +1,11 @@
-
 // To build MPfm correctly, you need to generate your own BASS.NET key at this website: http://bass.radio42.com/bass_register.html
 // Simply uncomment this file and add your email/key.
 
-namespace MPfm.Sound
-{
-    public static class BassNetKey
-    {
-        public const string Email = "yanick.castonguay@gmail.com";
-        public const string RegistrationKey = "2X3433427152222";
-    }
-}
+//namespace MPfm.Sound
+//{
+//    public static class BassNetKey
+//    {
+//        public const string Email = "";
+//        public const string RegistrationKey = "";
+//    }
+//}
diff --git a/MPfm/MPfm.Sound/MPfm.Sound.csproj b/MPfm/MPfm.Sound/MPfm.Sound.csproj
@@ -150,7 +150,6 @@
     <Compile Include="BassNetWrapper\WASAPI\BaseWASAPI.cs" />
     <Compile Include="Readers\XingInfoHeaderReader.cs" />
     <Compile Include="BassNetKey.cs" />
-    <Compile Include="MyBassNetKey.cs" />
     <Compile Include="BassNetWrapper\BassWrapper.cs" />
     <Compile Include="BassNetWrapper\BaseFx.cs" />
   </ItemGroup>

diff --git a/MPfm/MPfm.Sound/MPfm.Sound.iOS.csproj b/MPfm/MPfm.Sound/MPfm.Sound.iOS.csproj
@@ -212,8 +212,8 @@
     <Compile Include="BassNetWrapper\WASAPI\BaseWASAPI.cs" />
     <Compile Include="Readers\XingInfoHeaderReader.cs" />
     <Compile Include="BassNetKey.cs" />
-    <Compile Include="MyBassNetKey.cs" />
     <Compile Include="BassNetWrapper\BassWrapper.cs" />
     <Compile Include="BassNetWrapper\BaseFx.cs" />
+    <Compile Include="MyBassNetKey.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SplashViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SplashViewController.cs
@@ -82,10 +82,11 @@ public void RefreshStatus(string message)
             });
         }
 
-        public void InitDone()
+        public void InitDone(bool isAppFirstStart)
         {
         }
 
         #endregion    
+
     }
 }
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SyncDownloadViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SyncDownloadViewController.cs
@@ -66,7 +66,6 @@ public override void ConfirmedBackButton()
         #region ISyncDownloadView implementation
 
         public Action OnCancelDownload { get; set; }
-        public Action OnButtonPressed { get; set; }
 
         public void SyncDownloadError(Exception ex)
         {
@@ -76,6 +75,10 @@ public void SyncDownloadError(Exception ex)
             });
         }
 
+        public void RefreshDevice(SyncDevice device)
+        {
+        }
+
         public void RefreshStatus(SyncClientDownloadAudioFileProgressEntity entity)
         {
             InvokeOnMainThread(() => {

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SyncMenuViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SyncMenuViewController.cs
@@ -26,6 +26,7 @@
 using MPfm.Sound.AudioFiles;
 using MPfm.MVP.Models;
 using MPfm.iOS.Classes.Controls;
+using MPfm.Library.Objects;
 
 namespace MPfm.iOS
 {
@@ -239,6 +240,18 @@ public void SyncMenuError(Exception ex)
             });
         }
 
+        public void SyncEmptyError(Exception ex)
+        {
+            InvokeOnMainThread(() => {
+                var alertView = new UIAlertView("Sync Error", ex.Message, null, "OK", null);
+                alertView.Show();
+            });
+        }
+
+        public void RefreshDevice(SyncDevice device)
+        {
+        }
+
         public void RefreshLoading(bool isLoading, int progressPercentage)
         {
             //Console.WriteLine("SyncMenuViewController - isLoading: {0} progressPercentage: {1}", isLoading, progressPercentage);

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SyncViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SyncViewController.cs
@@ -106,7 +106,7 @@ public void RowSelected(UITableView tableView, NSIndexPath indexPath)
         {
             tableView.DeselectRow(indexPath, true);
             OnCancelDiscovery();
-            OnConnectDevice(_devices[indexPath.Row].Url);
+            OnConnectDevice(_devices[indexPath.Row]);
         }
 
         partial void actionConnectDeviceManually(NSObject sender)
@@ -119,7 +119,7 @@ public void RowSelected(UITableView tableView, NSIndexPath indexPath)
 
         public Action OnStartDiscovery { get; set; }
         public Action OnCancelDiscovery { get; set; }
-        public Action<string> OnConnectDevice { get; set; }
+        public Action<SyncDevice> OnConnectDevice { get; set; }
         public Action<string> OnConnectDeviceManually { get; set; }
 
         public void SyncError(Exception ex)

diff --git a/MPfm/MPfm.iOS/Classes/Helpers/ReachabilityHelper.cs b/MPfm/MPfm.iOS/Classes/Helpers/ReachabilityHelper.cs
@@ -1,5 +1,3 @@
-// This code is taken from https://github.com/xamarin/monotouch-samples/blob/master/ReachabilitySample/reachability.cs
-
 using System;
 using System.Net;
 using MonoTouch.Foundation;
@@ -9,7 +7,18 @@
 
 namespace MPfm.iOS.Helpers
 {
-    public static class ReachabilityHelper {
+    public enum NetworkStatus {
+        NotReachable,
+        ReachableViaCarrierDataNetwork,
+        ReachableViaWiFiNetwork
+    }
+
+    /// <summary>
+    /// Reachability helper class, taken from:
+    /// https://github.com/xamarin/monotouch-samples/blob/master/ReachabilitySample/reachability.cs
+    /// </summary>
+    public static class ReachabilityHelper 
+    {
         public static string HostName = "www.google.com";
 
         public static bool IsReachableWithoutRequiringConnection (NetworkReachabilityFlags flags)
@@ -86,7 +95,7 @@ static bool IsNetworkAvailable (out NetworkReachabilityFlags flags)
                 defaultRouteReachability.SetCallback (OnChange);
                 defaultRouteReachability.Schedule (CFRunLoop.Current, CFRunLoop.ModeDefault);
             }
-            if (!defaultRouteReachability.TryGetFlags (out flags))
+            if (defaultRouteReachability.TryGetFlags (out flags))
                 return false;
             return IsReachableWithoutRequiringConnection (flags);
         }   
@@ -145,10 +154,4 @@ public static NetworkStatus LocalWifiConnectionStatus ()
             return NetworkStatus.NotReachable;
         }
     }
-
-    public enum NetworkStatus {
-        NotReachable,
-        ReachableViaCarrierDataNetwork,
-        ReachableViaWiFiNetwork
-    }
 }
diff --git a/MPfm/MPfm.iOS/Classes/Helpers/iOSSyncDeviceSpecifications.cs b/MPfm/MPfm.iOS/Classes/Helpers/iOSSyncDeviceSpecifications.cs
@@ -29,6 +29,19 @@ namespace MPfm.iOS.Helpers
     /// </summary>
     public class iOSSyncDeviceSpecifications : NSObject, ISyncDeviceSpecifications
     {
+        public event NetworkStateChanged OnNetworkStateChanged;
+
+        public iOSSyncDeviceSpecifications()
+        {
+            Console.WriteLine(">>>>>>>>>>>>>>>>>> SETTING REACHABILITY EVENT");
+            ReachabilityHelper.ReachabilityChanged += HandleReachabilityChanged;
+        }
+
+        private void HandleReachabilityChanged(object sender, EventArgs e)
+        {
+            Console.WriteLine(">>>>>>>>>>>>>>>>>> REACHABILITY CHANGED");
+        }
+
         public SyncDeviceType GetDeviceType()
         {
             return SyncDeviceType.iOS;
@@ -65,5 +78,11 @@ public string GetMusicFolderPath()
         {
             return Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
         }
+
+        public void ReportNetworkStateChange(NetworkState networkState)
+        {
+            if(OnNetworkStateChanged != null)
+                OnNetworkStateChanged(networkState);
+        }
     }
 }