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

unzip and prepare to the right place

Browse source
This commit is contained in:
ligi 2013-02-08 01:27:34 +01:00
parent 200a2fe739
commit 96f976f5e1
4 changed files with 99 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/ligi/ticketviewer/TicketImportActivity.java
View file

@ -34,7 +34,7 @@ public class TicketImportActivity extends SherlockActivity {
i.putExtra("path", path);
(new File(path)).mkdirs();
UnzipPasscodeDialog.show(result, path, ticketImportActivity, new Callable<Void>() {
UnzipPasscodeDialog.show(result, ticketImportActivity, new Callable<Void>() {
@Override
public Void call() throws Exception {
return null; //To change body of implemented methods use File | Settings | File Templates.

4
src/org/ligi/ticketviewer/TicketListActivity.java
View file

@ -93,10 +93,8 @@ public class TicketListActivity extends SherlockListActivity {
@Override
protected void onPostExecute(InputStream result) {
if (result != null) {
String path = TicketDefinitions.getTmpDir(ticketImportActivity);
(new File(path)).mkdirs();
UnzipPasscodeDialog.show(result, path, ticketImportActivity, new Callable<Void>() {
UnzipPasscodeDialog.show(result, ticketImportActivity, new Callable<Void>() {
@Override
public Void call() throws Exception {

38
src/org/ligi/ticketviewer/TicketViewActivityBase.java
View file

@ -12,7 +12,6 @@ import android.view.Display;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import org.json.JSONException;
import org.json.JSONObject;
import org.ligi.ticketviewer.helper.BarcodeHelper;
import org.ligi.ticketviewer.helper.FileHelper;
@ -37,32 +36,7 @@ public class TicketViewActivityBase extends SherlockActivity {
Display display = getWindowManager().getDefaultDisplay();
Log.i("TicketView", "is temp" + TicketDefinitions.getTmpDir(this) + " " + path);
if (path.equals(TicketDefinitions.getTmpDir(this))) {
Log.i("TicketView", "is temp");
JSONObject manifest_json = null;
try {
manifest_json = new JSONObject(FileHelper.file2String(new File(path + "/manifest.json")));
} catch (Exception e) {
DisplayError("Invalid Passbook", "Problem with manifest.json: " + e);
//return false;
return;
}
try {
String rename_str = TicketDefinitions.getPassesDir(this) + "/" + manifest_json.getString("pass.json");
File rename_file = new File(rename_str);
Log.i("TicketView", "Renaming to " + rename_str + " " + rename_file);
if (rename_file.exists())
FileHelper.DeleteRecursive(rename_file);
new File(path + "/").renameTo(rename_file);
path = rename_str;
} catch (JSONException e) {
DisplayError("Invalid Passbook", "Problem with pass.json: " + e);
return;
}
}
JSONObject pass_json;
try {
@ -75,7 +49,7 @@ public class TicketViewActivityBase extends SherlockActivity {
barcode_bitmap = BarcodeHelper.generateBarCode(barcode_json.getString("message"), format);
} catch (Exception e) {
DisplayError("Invalid Passbook", "Problem with pass.json: " + e);
UnzipPasscodeDialog.DisplayError(this, "thInvalid Passbook", "Problem with pass.json: " + e);
//return false;
return;
}
@ -102,16 +76,6 @@ public class TicketViewActivityBase extends SherlockActivity {
Log.i("", "loading " + path);
}
public void DisplayError(String title, String err) {
new AlertDialog.Builder(this).setTitle(title).setMessage(err)
.setPositiveButton("OK", new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
}
}).show();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {

133
src/org/ligi/ticketviewer/UnzipPasscodeDialog.java
View file

@ -1,12 +1,18 @@
package org.ligi.ticketviewer;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.util.Log;
import org.json.JSONException;
import org.json.JSONObject;
import org.ligi.ticketviewer.helper.FileHelper;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@ -15,6 +21,96 @@ public class UnzipPasscodeDialog {
public final static String TAG = "TicketViewer";
public static void DisplayError(final Activity ctx, final String title, final String err) {
ctx.runOnUiThread(new Runnable() {
@Override
public void run() {
new AlertDialog.Builder(ctx).setTitle(title).setMessage(err)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ctx.finish();
}
}).show();
}
});
}
/**
* @param activity - if the alert should close when connection is established
*/
public static void show(final InputStream ins, final Activity activity, Callable<Void> intent_after_finish) {
ProgressDialog dialog = ProgressDialog.show(activity, "", "Opening the Passbook. Please wait...", true);
class AlertDialogUpdater implements Runnable {
private ProgressDialog myProgress;
private Callable intent_after_finish;
public AlertDialogUpdater(Activity activity, ProgressDialog progress, Callable intent_after_finish) {
this.intent_after_finish = intent_after_finish;
myProgress = progress;
}
public void run() {
String path = activity.getCacheDir() + "/temp/" + UUID.randomUUID() + "/";
File dir_file = new File(path);
dir_file.mkdirs();
if (!dir_file.exists()) {
DisplayError(activity, "Problem", "Problem creating the temp dir: " + path);
return;
}
new Decompress(ins, path).unzip();
Log.i("TicketView", "is temp");
JSONObject manifest_json = null;
try {
manifest_json = new JSONObject(FileHelper.file2String(new File(path + "/manifest.json")));
} catch (Exception e) {
DisplayError(activity, "Invalid Passbook", "Problem with manifest.json: " + e);
//return false;
return;
}
try {
String rename_str = TicketDefinitions.getPassesDir(activity) + "/" + manifest_json.getString("pass.json");
File rename_file = new File(rename_str);
Log.i("TicketView", "Renaming to " + rename_str + " " + rename_file);
if (rename_file.exists())
FileHelper.DeleteRecursive(rename_file);
new File(path + "/").renameTo(rename_file);
path = rename_str;
} catch (JSONException e) {
DisplayError(activity, "Invalid Passbook", "Problem with pass.json: " + e);
return;
}
myProgress.dismiss();
try {
intent_after_finish.call();
} catch (Exception e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
// activity.startActivity(intent_after_finish);
// activity.finish();
}
}
new Thread(new AlertDialogUpdater(activity, dialog, intent_after_finish)).start();
}
public static class Decompress {
private InputStream _zipFile;
private String _location;
@ -66,41 +162,4 @@ public class UnzipPasscodeDialog {
}
}
}
/**
* @param activity - if the alert should close when connection is established
*/
public static void show(final InputStream ins, final String path, Activity activity, Callable<Void> intent_after_finish) {
ProgressDialog dialog = ProgressDialog.show(activity, "", "Opening the Passbook. Please wait...", true);
class AlertDialogUpdater implements Runnable {
private ProgressDialog myProgress;
private Callable intent_after_finish;
public AlertDialogUpdater(Activity activity, ProgressDialog progress, Callable intent_after_finish) {
this.intent_after_finish = intent_after_finish;
myProgress = progress;
}
public void run() {
new Decompress(ins, path).unzip();
myProgress.dismiss();
try {
intent_after_finish.call();
} catch (Exception e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
// activity.startActivity(intent_after_finish);
// activity.finish();
}
}
new Thread(new AlertDialogUpdater(activity, dialog, intent_after_finish)).start();
}
}