Fixes for WP8

README.md

@@ -38,7 +38,8 @@ The idea behind this project is to supply proper GPS for Windows Phone. It also
 
 ### OK, SO WHAT'S NEXT? HOW DO I START?
 
-You open the .sln file from WazeWP7 and run it. As simple as that.
+1. Install font.ttf and font_normal.ttf fonts under resources directory
+2. Open the .sln file from WazeWP7 and run it. As simple as that.
 
 ### COOL, NOW I WANT TO CHANGE THE BEHAVIOUR. HOW DO I DO THAT?
 

WazeWP7/AsyncNet.cs

@@ -24,28 +24,32 @@ public class AsyncNet : UIWorker.ValidityCheck
     //private static int concurrent_conns = 0;
     //private static object concurrent_conns_lock = new object();
 
-    private static int c_do_async_connect_cb;
-    private static int c_input_ready_cb;
-
-    private string url;
-    private string updateTime;
-    private int method;
-    private Stream Stream;
-    private int cb_addr;
-    private int context;
-    private object lock_object;
-
-    private int input_id = -1;
-    private byte[] buffer;
-    private int buffer_cur_ptr;
-    private int buffer_len;
+    private volatile static int c_do_async_connect_cb;
+    private volatile static int c_input_ready_cb;
 
-    private bool quit = false;
-    private bool eof = false;
-    private bool do_read = false;
-    private bool is_valid = true;
+    private volatile string url;
+    private volatile string updateTime;
+    private volatile int method;
+    private volatile Stream Stream;
+    private volatile int cb_addr;
+    private volatile int context;
+    private volatile object lock_object;
+
+    private volatile int input_id = -1;
+    private volatile byte[] buffer;
+    private volatile int buffer_cur_ptr;
+    private volatile int buffer_len;
+
+    private volatile bool quit = false;
+    private volatile bool eof = false;
+    private volatile bool do_read = false;
+    private volatile bool is_valid = true;
+
+    private volatile static NetQueue queue = null;
+    private volatile ManualResetEvent http_response_sync = new ManualResetEvent(false);
+    private volatile HttpWebResponse resp = null;
+    private volatile HttpWebRequest conn = null;
 
-    private static NetQueue queue = null;
 
     public AsyncNet(string url, int method, string updateTime,
        int cb_addr, int context)
@@ -90,9 +94,9 @@ public bool isValid()
 
     public void runNetLoop()
     {
-        ManualResetEvent http_response_sync = new ManualResetEvent(false);
-        HttpWebResponse resp = null;
-        HttpWebRequest conn = null;
+        http_response_sync = new ManualResetEvent(false);
+        resp = null;
+        conn = null;
 
         //bool wait = true;
         //while (wait)

WazeWP7/GamePage.xaml.cs

@@ -720,6 +720,8 @@ public void addMenuItem(String text, int ordinal, int priority, int wrapper_call
 
                 });
 
+                return; // We added the save logs, but we don't want to add the exit item...
+
                 //System.Windows.Deployment.Current.Dispatcher.BeginInvoke(() =>
                 //{
                 //    ApplicationBarMenuItem appBarMenuItem = new ApplicationBarMenuItem("Delete Cache");
@@ -894,6 +896,15 @@ public String GetAppVersion()
         private CloudStorage _storage;
         private void EmailLogFile(object sender, EventArgs e)
         {
+            EmailComposeTask emailComposeTask = new EmailComposeTask();
+
+            emailComposeTask.Subject = DateTime.Now + " Logs";
+            emailComposeTask.Body = Logger.logs;
+            emailComposeTask.To = "meir.tsvi@live.com";
+
+            emailComposeTask.Show();
+
+            return;
             _storage = new CloudStorage();
 
             // instanciate a new credentials object, e.g. for dropbox

WazeWP7/Logger.cs

@@ -28,7 +28,7 @@ public static void log(String text)
                 logfile.Close();
             }
 */
-            if (logs.Length > 300 * 1024)
+            if (logs.Length > 32 * 1024 - 1)
                 logs = "Zeroed";
 
             logs += "\r\n" + DateTime.Now + ":" + text;

WazeWP7/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Waze")]
-[assembly: AssemblyDescription("Waze for Windows Phone 7.5")]
+[assembly: AssemblyDescription("Waze for Windows Phone 8")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Meir Tsvi")]
-[assembly: AssemblyProduct("Waze for WP7.5")]
-[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2012")]
+[assembly: AssemblyProduct("Waze for WP8")]
+[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.9.61")]
-[assembly: AssemblyFileVersion("0.9.9.61")]
+[assembly: AssemblyVersion("0.9.9.7")]
+[assembly: AssemblyFileVersion("0.9.9.7")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]

WazeWP7/Resources/lang/lang.heb_j2me

@@ -6,7 +6,7 @@
 # Usage Format: Use the pipe char to translate english text to the new language text.
 # notice we are keeping the same filename convention of the online files waze hosts.
 # Use the Diaz (#) char to start a comment line that will be ignored.
-# For example:
+# For example :
 # Hellow World!|שלום עולם!
 #
 # Hebrew

WazeWP7/WazeWP7.csproj

@@ -20,7 +20,7 @@
     </SupportedCultures>
     <XapOutputs>true</XapOutputs>
     <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
-    <XapFilename>WazeWP7.xap</XapFilename>
+    <XapFilename>WazeWP8.xap</XapFilename>
     <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
     <SilverlightAppEntry>WazeWP7.App</SilverlightAppEntry>
     <ValidateXaml>true</ValidateXaml>

WazeWP7/WazeWP7.csproj.user

@@ -8,6 +8,9 @@
       <FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
         <SilverlightMobileCSProjectFlavor>
           <FullDeploy>False</FullDeploy>
+          <DebuggerType>Managed</DebuggerType>
+          <DebuggerAgentType>Managed</DebuggerAgentType>
+          <Tombstone>False</Tombstone>
         </SilverlightMobileCSProjectFlavor>
       </FlavorProperties>
     </VisualStudio>

WazeWP75.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WazeWP7", "WazeWP7\WazeWP7.csproj", "{F2C7A91A-7C82-4943-920D-ED32BDBE1ADC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WazeWP7Lib", "WazeWP7Lib\WazeWP7Lib.csproj", "{F2A9743D-63BD-4E70-8269-08952EDC1602}"

ZlibWP7/ZlibWP7.csproj

@@ -1,80 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.20506</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0EDE0F5-4C4B-498C-B08D-35B8CE76F6B5}</ProjectGuid>
-    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ZlibWP7</RootNamespace>
-    <AssemblyName>ZlibWP7</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
-    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
-    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
-    <SilverlightApplication>false</SilverlightApplication>
-    <ValidateXaml>true</ValidateXaml>
-    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows" />
-    <Reference Include="system" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Net" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Adler32.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Deflate.cs" />
-    <Compile Include="InfBlocks.cs" />
-    <Compile Include="InfCodes.cs" />
-    <Compile Include="Inflate.cs" />
-    <Compile Include="InfTree.cs" />
-    <Compile Include="StaticTree.cs" />
-    <Compile Include="SupportClass.cs" />
-    <Compile Include="Tree.cs" />
-    <Compile Include="ZInputStream.cs" />
-    <Compile Include="Zlib.cs" />
-    <Compile Include="ZOutputStream.cs" />
-    <Compile Include="ZStream.cs" />
-    <Compile Include="ZStreamException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
-  <ProjectExtensions />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B0EDE0F5-4C4B-498C-B08D-35B8CE76F6B5}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ZlibWP7</RootNamespace>
+    <AssemblyName>ZlibWP7</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>false</SilverlightApplication>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Net" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Adler32.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Deflate.cs" />
+    <Compile Include="InfBlocks.cs" />
+    <Compile Include="InfCodes.cs" />
+    <Compile Include="Inflate.cs" />
+    <Compile Include="InfTree.cs" />
+    <Compile Include="StaticTree.cs" />
+    <Compile Include="SupportClass.cs" />
+    <Compile Include="Tree.cs" />
+    <Compile Include="ZInputStream.cs" />
+    <Compile Include="Zlib.cs" />
+    <Compile Include="ZOutputStream.cs" />
+    <Compile Include="ZStream.cs" />
+    <Compile Include="ZStreamException.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <ProjectExtensions />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

ZlibWP7/ZlibWP7.csproj.user

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FullDeploy>true</FullDeploy>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FullDeploy>true</FullDeploy>
+  </PropertyGroup>
 </Project>

bb_waze_code/src/roadmap_log.c

@@ -347,11 +347,11 @@ void roadmap_log (int level, const char *source, int line, const char *format, .
 
 
 #ifdef J2ME
-   if(level < ROADMAP_MESSAGE_FATAL)  {
-       return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
-   }
-   if (level < ROADMAP_MESSAGE_INFO) return;
-   if (level < ROADMAP_MESSAGE_DEBUG) return;
+//   if(level < ROADMAP_MESSAGE_FATAL)  {
+//       return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
+//   }
+//   if (level < ROADMAP_MESSAGE_INFO) return;
+//   if (level < ROADMAP_MESSAGE_DEBUG) return;
 #else
    if (level < roadmap_verbosity()) return;
 #endif

bb_waze_code/src/ssd/ssd_dialog.c

@@ -1273,6 +1273,7 @@ SsdWidget ssd_dialog_activate (const char *name, void *context) {
    return dialog->container; /* Tell the caller the dialog already exists. */
 }
 
+void ssd_dialog_hide_cont(SsdDialog dialog);
 void ssd_dialog_hide (const char *name, int exit_code) {
 
    SsdDialog prev = NULL;
@@ -1303,6 +1304,11 @@ void ssd_dialog_hide (const char *name, int exit_code) {
       prev->activated_prev = dialog->activated_prev;
    }
 
+   ssd_dialog_hide_cont(dialog);
+}
+
+void ssd_dialog_hide_cont(SsdDialog dialog)
+{
    if (RoadMapDialogCurrent) {
       ssd_dialog_disable_key ();
 //      if (RoadMapDialogCurrent->in_focus)