Skip to content
Snippets Groups Projects
Commit 196a0d18 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

Versioning and so

parent 7c21605e
No related branches found
Tags 11.1 11.1-RC1
No related merge requests found
<?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" />
......
......@@ -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();
}
}
......@@ -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();
}
}
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment