Fix package upgrade

3 files changed, 14 insertions, 5 deletions

diff --git a/Ministro/src/eu/licentia/necessitas/ministro/MinistroActivity.java b/Ministro/src/eu/licentia/necessitas/ministro/MinistroActivity.java
index 8a0cd81..7997b29 100644
--- a/Ministro/src/eu/licentia/necessitas/ministro/MinistroActivity.java
+++ b/Ministro/src/eu/licentia/necessitas/ministro/MinistroActivity.java
@@ -349,13 +349,22 @@ public class MinistroActivity extends Activity {
                 DocumentBuilder builder = factory.newDocumentBuilder();
                 Document dom = null;
                 Element root = null;
-
+                double oldVersion=MinistroService.instance().getVersion();
                 if (update[0] || MinistroService.instance().getVersion()<0)
                     version = downloadVersionXmlFile(MinistroActivity.this, false);
                 else
                     version = MinistroService.instance().getVersion();
 
-                ArrayList<Library> libraries = MinistroService.instance().getAvailableLibraries();
+                ArrayList<Library> libraries;
+                if (update[0])
+                {
+                    if (oldVersion!=version)
+                        libraries = MinistroService.instance().getDownloadedLibraries();
+                    else 
+                        return version;
+                }
+                else
+                    libraries = MinistroService.instance().getAvailableLibraries();
                 ArrayList<String> notFoundModules = new ArrayList<String>();
                 if (m_modules!=null)
                 {
@@ -442,7 +451,7 @@ public class MinistroActivity extends Activity {
                         if (update[0])
                         { // check for updates
                             for (int j=0;j<libraries.size();j++)
-                                if (libraries.get(j).name.equals(lib.name) && !libraries.get(j).sha1.equals(lib.sha1))
+                                if (libraries.get(j).name.equals(lib.name))
                                 {
                                     newLibs.add(lib);
                                     break;
diff --git a/Ministro/src/eu/licentia/necessitas/ministro/MinistroService.java b/Ministro/src/eu/licentia/necessitas/ministro/MinistroService.java
index 954fea6..894025a 100644
--- a/Ministro/src/eu/licentia/necessitas/ministro/MinistroService.java
+++ b/Ministro/src/eu/licentia/necessitas/ministro/MinistroService.java
@@ -167,7 +167,7 @@ public class MinistroService extends Service {
                     {
                         Library lib= Library.getLibrary((Element)node, false);
                         File file=new File(m_qtLibsRootPath + lib.filePath);
-                        if ((file).exists())
+                        if (file.exists())
                         {
                             if (checkCrc && !Library.checkCRC(file.getAbsolutePath(), lib.sha1))
                                 file.delete();
diff --git a/MinistroConfigurationTool/AndroidManifest.xml b/MinistroConfigurationTool/AndroidManifest.xml
index 07eb50c..8bba169 100644
--- a/MinistroConfigurationTool/AndroidManifest.xml
+++ b/MinistroConfigurationTool/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="eu.licentia.ministro.configurator"
+      package="eu.licentia.ministro.config"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">