From 415b0365603c6639b169308a966602135293790b Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 30 May 2013 20:09:17 +0300 Subject: [PATCH] Show readme dialog before download selection dialog --- project/java/DataDownloader.java | 6 +++++- project/java/Settings.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java index 5d6bd5ff1..54b9d05a2 100644 --- a/project/java/DataDownloader.java +++ b/project/java/DataDownloader.java @@ -334,8 +334,10 @@ class DataDownloader extends Thread Log.i("SDL", "Connecting to: " + url); request = new HttpGet(url); request.addHeader("Accept", "*/*"); - if( partialDownloadLen > 0 ) + if( partialDownloadLen > 0 ) { request.addHeader("Range", "bytes=" + partialDownloadLen + "-"); + Log.i("SDL", "Trying to resume download at pos " + partialDownloadLen); + } try { DefaultHttpClient client = HttpWithDisabledSslCertCheck(); client.getParams().setBooleanParameter("http.protocol.handle-redirects", true); @@ -443,6 +445,8 @@ class DataDownloader extends Thread Log.i("SDL", "Resuming download of file '" + path + "' at pos " + partialDownloadLen); } } + else + Log.i("SDL", "Server does not support partial downloads. " + (range.length == 0 ? "" : range[0].getValue())); } catch (Exception e) { } } if( out == null ) diff --git a/project/java/Settings.java b/project/java/Settings.java index 5a2ce7ea3..5d7a25156 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -508,7 +508,7 @@ class Settings hidden = true; } if( ! hidden ) - menuStack.add(m); + menuStack.add(0, m); } } goBack(p);