From 196a0d189d0c4dcfa7edcfad40c5f9811b379b7b Mon Sep 17 00:00:00 2001
From: Xavier <xavier.gibert@c-s.fr>
Date: Tue, 15 Jul 2014 17:29:25 +0200
Subject: [PATCH] Versioning and so
---
AndroidManifest.xml | 4 ++--
src/cs/si/stavor/dialogs/ResetAppDialogFragment.java | 12 ++++++++++--
src/cs/si/stavor/dialogs/ResetDbDialogFragment.java | 12 ++++++++++--
src/cs/si/stavor/fragments/SimulatorFragment.java | 1 -
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a90f0154..fb0dac9b 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 d28a93de..b913d256 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 d5721b30..e558b0e2 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 df1815aa..49b016d5 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
--
GitLab