Return "Invalid Qt version" error code if Qt version mismatch.

3 files changed, 21 insertions, 2 deletions

diff --git a/Ministro/res/values/strings.xml b/Ministro/res/values/strings.xml
index 207321c..7885699 100644
--- a/Ministro/res/values/strings.xml
+++ b/Ministro/res/values/strings.xml
@@ -21,4 +21,5 @@
     <string name="dependencies_error">Ministro can not satisfy your application dependencies</string>
     <string name="check_frequency">Check for updates frequency (days)</string>
     <string name="extracting_look_n_feel_msg">Extracting the device look&amp;feel information. Please wait...</string>
+    <string name="invalid_qt_version">Invalid Qt version</string>
 </resources>
diff --git a/Ministro/src/org/kde/necessitas/ministro/MinistroService.java b/Ministro/src/org/kde/necessitas/ministro/MinistroService.java
index 28292ca..44610da 100644
--- a/Ministro/src/org/kde/necessitas/ministro/MinistroService.java
+++ b/Ministro/src/org/kde/necessitas/ministro/MinistroService.java
@@ -73,6 +73,7 @@ public class MinistroService extends Service
     private static final String NATIVE_LIBRARIES_KEY="native.libraries";
     private static final String ENVIRONMENT_VARIABLES_KEY="environment.variables";
     private static final String APPLICATION_PARAMETERS_KEY="application.parameters";
+    private static final String QT_VERSION_PARAMETER_KEY="qt.version.parameter";
     /// loader parameter keys
 
     /// loader error codes
@@ -80,6 +81,7 @@ public class MinistroService extends Service
     private static final int EC_INCOMPATIBLE=1;
     private static final int EC_NOT_FOUND=2;
     private static final int EC_INVALID_PARAMETERS=3;
+    private static final int EC_INVALID_QT_VERSION=3;
     /// loader error codes
 
 
@@ -378,7 +380,23 @@ public class MinistroService extends Service
         int qtApiLevel = parameters.getInt(MINIMUM_QT_VERSION_KEY);
         if (qtApiLevel > m_qtVersion) // the application needs a newer qt version
         {
+            if (parameters.getBoolean(QT_VERSION_PARAMETER_KEY, false))
+            {
+                Bundle loaderParams = new Bundle();
+                loaderParams.putInt(ERROR_CODE_KEY, EC_INVALID_QT_VERSION);
+                loaderParams.putString(ERROR_MESSAGE_KEY, getResources().getString(R.string.invalid_qt_version));
+                try
+                {
+                    callback.loaderReady(loaderParams);
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+                Log.e(TAG, "Invalid qt verson");
+                return;
+            }
             startRetrieval(callback, null, null, appName, parameters);
+            parameters.putBoolean(QT_VERSION_PARAMETER_KEY, true);
             return;
         }
 
diff --git a/MinistroConfigurationTool/AndroidManifest.xml b/MinistroConfigurationTool/AndroidManifest.xml
index 64e5ce8..175529f 100644
--- a/MinistroConfigurationTool/AndroidManifest.xml
+++ b/MinistroConfigurationTool/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.kde.ministro.config"
-      android:versionCode="1"
-      android:versionName="1.0">
+      android:versionCode="2"
+      android:versionName="2.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".MinistroConfigurationToolActivity"
                   android:label="@string/app_name">