oplossing dropbox

close #10
deRightDirection · May 29, 2016 · 46adeeb · 46adeeb
1 parent e650cee
commit 46adeeb
Show file tree

Hide file tree

Showing 12 changed files with 356 additions and 6 deletions.
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/.vs/BicycleTripsPreparationApp/v14/.suo b/TripPreparationApp/BicycleTripsPreparationApp/.vs/BicycleTripsPreparationApp/v14/.suo
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/DropboxHelper.cs b/TripPreparationApp/BicycleTripsPreparationApp/DropboxHelper.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using theRightDirection.Library.Logging;
 
 namespace BikeTouringGIS
 {
@@ -34,8 +35,10 @@ public static string GetDropBoxFolder()
                         var path = dbBase64Text.Skip(lastIndex + 1).ToArray();
                         _folder = Encoding.UTF8.GetString(path);
                     }
-                    catch (FileNotFoundException e)
+                    catch (Exception e)
                     {
+                        ILogger logger = Logger.GetLogger();
+                        logger.LogException(e);
                         return Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
                     }
                 }

diff --git a/TripPreparationApp/BicycleTripsPreparationApp/MainScreen.xaml b/TripPreparationApp/BicycleTripsPreparationApp/MainScreen.xaml
@@ -157,7 +157,7 @@
                 <project:HyperLinkControl NavigateUri="mailto:info@therightdirection.nl?subject=bike touring gis">mail us</project:HyperLinkControl>
                 </TextBlock>
                 <TextBlock x:Name="version" Margin="50,0,0,0"/>
-                <Button   Margin="10,0,0,0" Content="Update the application" x:Name="updateApp" IsEnabled="False" HorizontalAlignment="Right"/>
+                <Button   Margin="10,0,0,0" Content="Update the application" x:Name="updateApp" IsEnabled="False" HorizontalAlignment="Right" Click="updateApp_Click"/>
             </StackPanel>
         </Grid>
     </Grid>

diff --git a/TripPreparationApp/BicycleTripsPreparationApp/Properties/AssemblyInfo.cs b/TripPreparationApp/BicycleTripsPreparationApp/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.1")]
-[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.2")]
+[assembly: AssemblyFileVersion("1.0.2")]
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/bin/Release/BikeTouringGIS_28052016.xml b/TripPreparationApp/BicycleTripsPreparationApp/bin/Release/BikeTouringGIS_28052016.xml
@@ -0,0 +1,10 @@
+<log4j:event logger="theRightDirection.Library.Logging.Logger" timestamp="1464457928348" level="ERROR" thread="1"><log4j:message>Update.exe not found, not a Squirrel-installed app?
+Squirrel
+   at Squirrel.UpdateManager.getUpdateExe() in c:\Users\paulb\code\squirrel\squirrel.windows\src\Squirrel\UpdateManager.cs:line 287
+   at Squirrel.UpdateManager.getApplicationName() in c:\Users\paulb\code\squirrel\squirrel.windows\src\Squirrel\UpdateManager.cs:line 266
+   at Squirrel.UpdateManager..ctor(String urlOrPath, String applicationName, String rootDirectory, IFileDownloader urlDownloader) in c:\Users\paulb\code\squirrel\squirrel.windows\src\Squirrel\UpdateManager.cs:line 41
+   at Squirrel.UpdateManager.&lt;GitHubUpdateManager&gt;d__2b.MoveNext() in c:\Users\paulb\code\squirrel\squirrel.windows\src\Squirrel\UpdateManager.Factory.cs:line 80
+--- End of stack trace from previous location where exception was thrown ---
+   at System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(Task task)
+   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+   at BikeTouringGIS.MainScreen.&lt;CheckForUpdates&gt;d__8.MoveNext()</log4j:message><log4j:properties><log4j:data name="LogFileDate" value="28052016" /><log4j:data name="log4jmachinename" value="DESKTOP-70387U1" /><log4j:data name="LogFileName" value="theRightDirection.BikeTouringGIS.Logging" /><log4j:data name="log4net:UserName" value="DESKTOP-70387U1\info" /><log4j:data name="log4japp" value="theRightDirection.BikeTouringGIS.exe" /><log4j:data name="log4net:Identity" value="" /><log4j:data name="log4net:HostName" value="DESKTOP-70387U1" /></log4j:properties><log4j:locationInfo class="theRightDirection.Library.Logging.Logger" method="LogMessage" file="" line="0" /></log4j:event>
diff --git a/...icycleTripsPreparationApp/obj/Release/BikeTouringGIS.csprojResolveAssemblyReference.cache b/...icycleTripsPreparationApp/obj/Release/BikeTouringGIS.csprojResolveAssemblyReference.cache
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/Default.baml b/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/Default.baml
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.baml b/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.baml
diff --git a/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.g.cs b/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainScreen.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D303A3FFFA9C3D9B17702EA5AC35AE7D"
+#pragma checksum "..\..\MainScreen.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5B24A79DF5F785C007D404F8CED1F51"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -195,6 +195,12 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             return;
             case 11:
             this.updateApp = ((System.Windows.Controls.Button)(target));
+
+            #line 160 "..\..\MainScreen.xaml"
+            this.updateApp.Click += new System.Windows.RoutedEventHandler(this.updateApp_Click);
+
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;

diff --git a/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.g.i.cs b/TripPreparationApp/BicycleTripsPreparationApp/obj/Release/MainScreen.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainScreen.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D303A3FFFA9C3D9B17702EA5AC35AE7D"
+#pragma checksum "..\..\MainScreen.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E5B24A79DF5F785C007D404F8CED1F51"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

diff --git a/...onApp/BicycleTripsPreparationApp/obj/Release/theRightDirection.BikeTouringGIS.g.resources b/...onApp/BicycleTripsPreparationApp/obj/Release/theRightDirection.BikeTouringGIS.g.resources