Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

workaround for startup crash when reading free space fails

Browse source
This commit is contained in:
Arndt 2017-01-07 17:24:09 +01:00
parent 9d5ecb93ad
commit 61ce13ca33
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-routing-app/AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="19" android:versionCode="20"
android:versionName="1.4.8" package="btools.routingapp"> android:versionName="1.4.8" package="btools.routingapp">
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".BRouterActivity" <activity android:name=".BRouterActivity"

13
brouter-routing-app/src/main/java/btools/routingapp/BInstallerView.java
View file

@ -203,8 +203,13 @@ public class BInstallerView extends View
scanExistingFiles( secondary ); scanExistingFiles( secondary );
} }
StatFs stat = new StatFs(baseDir); availableSize = -1;
availableSize = (long)stat.getAvailableBlocks()*stat.getBlockSize(); try
{
StatFs stat = new StatFs(baseDir);
availableSize = (long)stat.getAvailableBlocks()*stat.getBlockSize();
}
catch (Exception e) { /* ignore */ }
} }
private void scanExistingFiles( File dir ) private void scanExistingFiles( File dir )
@ -361,7 +366,7 @@ public class BInstallerView extends View
String totmb = ((totalSize + mb-1)/mb) + " MB"; String totmb = ((totalSize + mb-1)/mb) + " MB";
String freemb = ((availableSize + mb-1)/mb) + " MB"; String freemb = availableSize >= 0 ? ((availableSize + mb-1)/mb) + " MB" : "?";
canvas.drawText( "Selected segments=" + rd5Tiles, 10, 25, paint ); canvas.drawText( "Selected segments=" + rd5Tiles, 10, 25, paint );
canvas.drawText( "Size=" + totmb + " Free=" + freemb , 10, 45, paint ); canvas.drawText( "Size=" + totmb + " Free=" + freemb , 10, 45, paint );
@ -591,7 +596,7 @@ float tx, ty;
// might be -1: server did not report the length // might be -1: server did not report the length
int fileLength = connection.getContentLength(); int fileLength = connection.getContentLength();
currentDownloadSize = fileLength; currentDownloadSize = fileLength;
if ( fileLength > availableSize ) return "not enough space on sd-card"; if ( availableSize >= 0 && fileLength > availableSize ) return "not enough space on sd-card";
// download the file // download the file
input = connection.getInputStream(); input = connection.getInputStream();

13
brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
View file

@ -467,17 +467,18 @@ public class BRouterActivity extends Activity implements OnInitListener
ArrayList<Long> dirFreeSizes = new ArrayList<Long>(); ArrayList<Long> dirFreeSizes = new ArrayList<Long>();
for ( String d : items ) for ( String d : items )
{ {
long size = 0L;
try try
{ {
StatFs stat = new StatFs( d ); StatFs stat = new StatFs( d );
long size = (long) stat.getAvailableBlocks() * stat.getBlockSize(); size = (long) stat.getAvailableBlocks() * stat.getBlockSize();
int idx = 0;
while (idx < availableBasedirs.size() && dirFreeSizes.get( idx ).longValue() > size)
idx++;
availableBasedirs.add( idx, d );
dirFreeSizes.add( idx, Long.valueOf( size ) );
} }
catch (Exception e) { /* ignore */ } catch (Exception e) { /* ignore */ }
int idx = 0;
while (idx < availableBasedirs.size() && dirFreeSizes.get( idx ).longValue() > size)
idx++;
availableBasedirs.add( idx, d );
dirFreeSizes.add( idx, Long.valueOf( size ) );
} }
basedirOptions = new String[items.size() + 1]; basedirOptions = new String[items.size() + 1];