diff --git a/src/com/froop/app/kegs/ConfigFile.java b/src/com/froop/app/kegs/ConfigFile.java index 19926c4..bb74252 100644 --- a/src/com/froop/app/kegs/ConfigFile.java +++ b/src/com/froop/app/kegs/ConfigFile.java @@ -5,7 +5,6 @@ import android.util.Log; import java.io.File; import java.io.BufferedInputStream; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.util.zip.ZipInputStream; import java.util.zip.ZipEntry; diff --git a/src/com/froop/app/kegs/KegsMain.java b/src/com/froop/app/kegs/KegsMain.java index 4829474..f9a0b1e 100644 --- a/src/com/froop/app/kegs/KegsMain.java +++ b/src/com/froop/app/kegs/KegsMain.java @@ -175,6 +175,12 @@ public class KegsMain extends Activity implements KegsKeyboard.StickyReset, Asse dialog.setCanceledOnTouchOutside(false); // lame return dialog; } + + @Override + public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); + finish(); + } } class ErrorDialogFragment extends DialogFragment { @@ -186,6 +192,18 @@ public class KegsMain extends Activity implements KegsKeyboard.StickyReset, Asse // TODO setCanceledOnTouchOutside(false) ? otherwise can accidentally dismiss the error. return builder.create(); } + + @Override + public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); + finish(); + } + + @Override + public void onDismiss(DialogInterface dialog) { + super.onDismiss(dialog); + finish(); + } } class AssetFragment extends DialogFragment { diff --git a/src/com/froop/app/kegs/RomDialogFragment.java b/src/com/froop/app/kegs/RomDialogFragment.java index 4e600ca..8e0c8cb 100644 --- a/src/com/froop/app/kegs/RomDialogFragment.java +++ b/src/com/froop/app/kegs/RomDialogFragment.java @@ -29,4 +29,10 @@ public class RomDialogFragment extends DialogFragment { dialog.setCanceledOnTouchOutside(false); // lame return dialog; } + + @Override + public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); + ((KegsMain)getActivity()).finish(); + } }