wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nicer error when manifest not found

Browse source
This commit is contained in:
ligi 2014-09-04 14:01:06 +02:00
parent a9e38ecc01
commit b8cdeae13f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/ligi/passandroid/ui/UnzipPassController.java
View file

@ -13,7 +13,7 @@ import org.ligi.passandroid.Tracker;
import org.ligi.passandroid.model.InputStreamWithSource;
import java.io.File;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.util.UUID;
public class UnzipPassController {
@ -45,7 +45,7 @@ public class UnzipPassController {
processFile(new FileUnzipControllerSpec(tempFile.getAbsolutePath(), spec));
tempFile.delete();
} catch (Exception e) {
Tracker.get().trackException("problem processing InputStream",e,false);
Tracker.get().trackException("problem processing InputStream", e, false);
spec.failCallback.fail("problem with temp file" + e);
}
}
@ -74,6 +74,9 @@ public class UnzipPassController {
JSONObject manifest_json;
try {
manifest_json = new JSONObject(AXT.at(new File(path + "/manifest.json")).readToString());
} catch (FileNotFoundException e) {
spec.failCallback.fail("Pass contains no Manifest - or PassAndroid could not read it");
return;
} catch (Exception e) {
spec.failCallback.fail("Problem with manifest.json: " + e);
return;