diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a90f0154bc1d04fe131c1bc7617e389c732015f7..fb0dac9bce8cf2136e97439be21b3526f47aab7a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cs.si.stavor" - android:versionCode="1120" - android:versionName="1.1.2" > + android:versionCode="1130" + android:versionName="1.1.3" > <!-- VersionCode: [3]version+[1]architecture e.g 1.0.2arm is 1020, 1.1.3x86 is 1131 --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> diff --git a/src/cs/si/stavor/dialogs/ResetAppDialogFragment.java b/src/cs/si/stavor/dialogs/ResetAppDialogFragment.java index d28a93de98568c3fabff6f203eec1c7b396da2eb..b913d256065817effea830b39623f2d2442d7f83 100644 --- a/src/cs/si/stavor/dialogs/ResetAppDialogFragment.java +++ b/src/cs/si/stavor/dialogs/ResetAppDialogFragment.java @@ -66,13 +66,21 @@ public class ResetAppDialogFragment extends DialogFragment { * Restarts the application in order to reload all configurations */ private void resetApplication(){ - Context context = getActivity().getBaseContext(); + /*Context context = getActivity().getBaseContext(); Intent mStartActivity = new Intent(context, MainActivity.class); int mPendingIntentId = 123456; PendingIntent mPendingIntent = PendingIntent.getActivity(context, mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT); AlarmManager mgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE); mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent); - System.exit(0); + System.exit(0);*/ + + + /*Intent i = getActivity().getBaseContext().getPackageManager() + .getLaunchIntentForPackage( getActivity().getBaseContext().getPackageName() ); + i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(i);*/ + + getActivity().recreate(); } } diff --git a/src/cs/si/stavor/dialogs/ResetDbDialogFragment.java b/src/cs/si/stavor/dialogs/ResetDbDialogFragment.java index d5721b30921b20c95eaaf1a4f3a9b8b473b0485c..e558b0e2e8c5636595f14634202b3e9a1973b536 100644 --- a/src/cs/si/stavor/dialogs/ResetDbDialogFragment.java +++ b/src/cs/si/stavor/dialogs/ResetDbDialogFragment.java @@ -72,13 +72,21 @@ public class ResetDbDialogFragment extends DialogFragment { * deleted */ private void resetApplication(){ - Context context = getActivity().getBaseContext(); + /*Context context = getActivity().getBaseContext(); Intent mStartActivity = new Intent(context, MainActivity.class); int mPendingIntentId = 123456; PendingIntent mPendingIntent = PendingIntent.getActivity(context, mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT); AlarmManager mgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE); mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent); - System.exit(0); + System.exit(0);*/ + + + /*Intent i = getActivity().getBaseContext().getPackageManager() + .getLaunchIntentForPackage( getActivity().getBaseContext().getPackageName() ); + i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(i);*/ + + getActivity().recreate(); } } diff --git a/src/cs/si/stavor/fragments/SimulatorFragment.java b/src/cs/si/stavor/fragments/SimulatorFragment.java index df1815aa5d4f7e545c00948437832753581184e3..49b016d5898272ad5b30f4fd9586ede2072eac4d 100644 --- a/src/cs/si/stavor/fragments/SimulatorFragment.java +++ b/src/cs/si/stavor/fragments/SimulatorFragment.java @@ -249,7 +249,6 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks MissionEntry._ID, MissionEntry.COLUMN_NAME_CLASS }; - Cursor c = ((StavorApplication)((MainActivity)getActivity()).getApplication()).db .query( MissionEntry.TABLE_NAME, // The table to query