diff --git a/SWADroid/gen/es/ugr/swad/swadroid/R.java b/SWADroid/gen/es/ugr/swad/swadroid/R.java
index 027e6aae..0326dab5 100644
--- a/SWADroid/gen/es/ugr/swad/swadroid/R.java
+++ b/SWADroid/gen/es/ugr/swad/swadroid/R.java
@@ -64,46 +64,47 @@ public final class R {
public static final int menu_main=0x7f080000;
}
public static final class string {
+ public static final int about_preferences=0x7f070012;
public static final int app_name=0x7f070000;
public static final int close_dialog=0x7f070005;
- public static final int content=0x7f070026;
+ public static final int content=0x7f070028;
public static final int coursesModuleLabel=0x7f070003;
- public static final int coursesProgressDescription=0x7f070018;
- public static final int coursesProgressTitle=0x7f070017;
- public static final int dateMsg=0x7f070028;
- public static final int errorConnectionMsg=0x7f07002e;
- public static final int errorCopyMsg_DB=0x7f07001b;
- public static final int errorMsgLaunchingActivity=0x7f070019;
- public static final int errorMsgNoConnection=0x7f07001c;
- public static final int errorMsgWorkaroundEmulator=0x7f07001a;
- public static final int errorServerResponseMsg=0x7f07002d;
- public static final int errorTimeoutMsg=0x7f07002f;
- public static final int examAnnouncement=0x7f070021;
- public static final int firstRunMsg=0x7f07002b;
- public static final int forumReply=0x7f070025;
- public static final int fromMsg=0x7f070027;
- public static final int initialDialogTitle=0x7f07002c;
+ public static final int coursesProgressDescription=0x7f07001a;
+ public static final int coursesProgressTitle=0x7f070019;
+ public static final int dateMsg=0x7f07002a;
+ public static final int errorConnectionMsg=0x7f070030;
+ public static final int errorCopyMsg_DB=0x7f07001d;
+ public static final int errorMsgLaunchingActivity=0x7f07001b;
+ public static final int errorMsgNoConnection=0x7f07001e;
+ public static final int errorMsgWorkaroundEmulator=0x7f07001c;
+ public static final int errorServerResponseMsg=0x7f07002f;
+ public static final int errorTimeoutMsg=0x7f070031;
+ public static final int examAnnouncement=0x7f070023;
+ public static final int firstRunMsg=0x7f07002d;
+ public static final int forumReply=0x7f070027;
+ public static final int fromMsg=0x7f070029;
+ public static final int initialDialogTitle=0x7f07002e;
public static final int loginModuleLabel=0x7f070001;
- public static final int loginProgressDescription=0x7f070014;
- public static final int loginProgressTitle=0x7f070013;
- public static final int loginSuccessfulMsg=0x7f07001e;
- public static final int loginTitle_menu=0x7f070012;
- public static final int marksFile=0x7f070022;
- public static final int message=0x7f070024;
- public static final int noMsg=0x7f07002a;
- public static final int notice=0x7f070023;
+ public static final int loginProgressDescription=0x7f070016;
+ public static final int loginProgressTitle=0x7f070015;
+ public static final int loginSuccessfulMsg=0x7f070020;
+ public static final int loginTitle_menu=0x7f070014;
+ public static final int marksFile=0x7f070024;
+ public static final int message=0x7f070026;
+ public static final int noMsg=0x7f07002c;
+ public static final int notice=0x7f070025;
public static final int notificationsModuleLabel=0x7f070002;
- public static final int notificationsProgressDescription=0x7f070016;
- public static final int notificationsProgressTitle=0x7f070015;
- public static final int notificationsSuccessfulMsg=0x7f07001f;
- public static final int notificationsUpdateButton=0x7f070020;
+ public static final int notificationsProgressDescription=0x7f070018;
+ public static final int notificationsProgressTitle=0x7f070017;
+ public static final int notificationsSuccessfulMsg=0x7f070021;
+ public static final int notificationsUpdateButton=0x7f070022;
public static final int preferencesTitle_menu=0x7f070011;
public static final int saveMsg_preferences=0x7f07000e;
public static final int saveSummary_preferences=0x7f07000f;
public static final int saveTitle_preferences=0x7f070010;
public static final int set_preferences=0x7f070006;
public static final int title_error_dialog=0x7f070004;
- public static final int upgradeMsg_DB=0x7f07001d;
+ public static final int upgradeMsg_DB=0x7f07001f;
public static final int userIDName_preferences=0x7f070008;
public static final int userIDSummary_preferences=0x7f070009;
public static final int userIDTitle_preferences=0x7f07000a;
@@ -111,7 +112,8 @@ public final class R {
public static final int userPasswordSummary_preferences=0x7f07000c;
public static final int userPasswordTitle_preferences=0x7f07000d;
public static final int user_preferences=0x7f070007;
- public static final int yesMsg=0x7f070029;
+ public static final int versionTitle_preferences=0x7f070013;
+ public static final int yesMsg=0x7f07002b;
}
public static final class xml {
public static final int preferences=0x7f040000;
diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml
index 95396144..9acc05c0 100644
--- a/SWADroid/res/values-es/strings.xml
+++ b/SWADroid/res/values-es/strings.xml
@@ -15,7 +15,7 @@
Configuración guardada
Guarda la configuración actual
Guardar configuración
- Configuración
+ ConfiguraciónAcerca deVersión de la aplicación
Conectar
Identificación
Conectando...
diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml
index d1819b5f..f931efa4 100644
--- a/SWADroid/res/values/strings.xml
+++ b/SWADroid/res/values/strings.xml
@@ -15,7 +15,7 @@
Preferences have been saved
Save actual preferences
Save preferences
- Preferences
+ PreferencesAboutApplication version
Login
Login
Connecting...
@@ -45,4 +45,6 @@
+
+
\ No newline at end of file
diff --git a/SWADroid/res/xml/preferences.xml b/SWADroid/res/xml/preferences.xml
index cff27972..c62fde06 100644
--- a/SWADroid/res/xml/preferences.xml
+++ b/SWADroid/res/xml/preferences.xml
@@ -15,5 +15,14 @@
android:title="@string/userPasswordTitle_preferences"
android:key="userPasswordPref"
android:password="true" />
+
+
+
diff --git a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java
index c054f96d..50e19e84 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java
@@ -23,6 +23,7 @@ import es.ugr.swad.swadroid.modules.notifications.Notifications;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
@@ -63,6 +64,10 @@ public class Preferences extends PreferenceActivity implements OnPreferenceChang
* Last application version preference name.
*/
private static final String LASTVERSIONPREF = "lastVersionPref";
+ /**
+ * Current application version preference name.
+ */
+ private static final String CURRENTVERSIONPREF = "currentVersionPref";
/**
* User ID preference
*/
@@ -71,6 +76,10 @@ public class Preferences extends PreferenceActivity implements OnPreferenceChang
* User password preference
*/
private Preference userPasswordPref;
+ /**
+ * Current application version preference
+ */
+ private Preference currentVersionPref;
/**
* Preferences editor
*/
@@ -95,7 +104,7 @@ public class Preferences extends PreferenceActivity implements OnPreferenceChang
/**
* Gets last application version
*
- * @return returns true, if this is the first run
+ * @return returns last application version
*/
public int getLastVersion() {
return lastVersion;
@@ -153,6 +162,7 @@ public class Preferences extends PreferenceActivity implements OnPreferenceChang
userIDPref = findPreference(USERIDPREF);
userPasswordPref = findPreference(USERPASSWORDPREF);
+ currentVersionPref = findPreference(CURRENTVERSIONPREF);
userIDPref.setOnPreferenceChangeListener(this);
userPasswordPref.setOnPreferenceChangeListener(this);
@@ -181,6 +191,12 @@ public class Preferences extends PreferenceActivity implements OnPreferenceChang
return true;
}
});
+
+ try {
+ currentVersionPref.setSummary(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
+ } catch (NameNotFoundException e) {
+ e.printStackTrace();
+ }
}
public boolean onPreferenceChange(Preference preference, Object newValue) {