v0.1

CHANGELOG.md

@@ -1,30 +1,19 @@
-## v0.004#
+## v0.1#
+
 
-
 # News #
-
+
-*  Conversation opens as child of news item
+*  Native Android image selector for new message
-*  Pull-to-refresh news
+*  Click on contacts shows contact details on news page
-*  Delete Icon
+*  Fix problem with news list after deletion of item
-*  Animated Gif attachments shown below news item
+
-*  Improved image selector for new message
+# Contacts #
-*  Gif attachments for new message
+*  Clean contacts with no news
-*  Timeline reloaded after new message
+
-
+# Images #
-# Contacts #
+*  Upload pictures with description to album (permissions cannot be set due to API problems)
-*  Contact details window mechanism completely reworked
+*  Delete pictures or albums from client and server (long press on picture in overview)
-*  New calendar icon for Friendica contacts
+*  Fix problem when enlarging photo
-*  "Connect" opens connect request page for Friendica contacs
+
-
+# Translations #
-# Calendar #
+*  German, Spanish
-*  new calendar tab
-*  shows own public events and public events of Friendica contacts
-*  list view of events of selected date
-*  click on event to show details
-
-# Config #
-*  the icon of the server is shown if url is correct
-*  Click on icon for server details
-
-# Translations #
-*  German

README.md

@@ -3,14 +3,14 @@
 QML based client for the Friendica Social Network.
  Tabs for news (incl. Direct Messages), friends, photos and events.
  OS: currently Linux and Android(4.3).
- Source code is a QtCreator project.
+ Source code is a QtCreator project.
-
+
 ## Screenshots ##
 
 ![Newstab](Screenshots/NewsTab.jpg)
 ![Friendstab](Screenshots/FriendsTab.jpg)
 ![Photostab](Screenshots/PhotoTab.jpg)
-![Eventstab](Screenshots/EventsTab.jpg)
+![Eventstab](Screenshots/EventsTab.jpg)
 ![Configtab](Screenshots/ConfigTab.jpg)
 
 
@@ -19,38 +19,40 @@ QML based client for the Friendica Social Network.
 # News #
 Currently supported:
 *  Shows Posts from friends, favorited messages, Direct Messages and Notifications
-*  Open links in external browser
+*  Open links in external browser
-*  
Click on contact photo for contact details
+*  
-*  Click on like text for additional contact info
+Click on contact photo for contact details
+*  Click on like text for additional contact info
 *  Deletion, Reposting, Answering of Posts
 *  Liking, disliking, favoriting
-*  Attending for event posts
+*  Attending for event posts
 *  Update fetches new posts (up to last 50) since last in local DB
 *  More shows older posts from local DB
-*  Create new Message with images or direct messages, Contact/Group access rights(can be stored), smileys
+*  Create new Message with images or direct messages, Contact/Group access rights(can be stored), smileys
-*  New image dialog
+*  Native Android image dialog
 
 ToDo:
-
+
-*  Videos and other binary data as attachment (sending and receiving)
+*  Videos and other binary data as attachment (sending and receiving, currently not supported in API)
-*  More than one attachment
+*  More than one attachment (currently not supported in API)
-*  Rich text editing in Send Dialog
+*  Rich text editing in Send Dialog
-*  Attachments for Direct messages (currently not supported in API)
+*  Attachments for Direct messages (currently not supported in API)
-
+
     
 # Friends #
 Currently supported:
-
+
-*  Tabs for friends, other contacts and groups
+*  Tabs for friends, other contacts and groups
-*  Grid of all known contacts with locally downloaded pictures
+*  Grid of all known contacts with locally downloaded pictures
-*  Large friend item for addional information and functionality
+*  Large friend item for addional information and functionality
-*  Show news of contact from local database
+*  Show news of contact from local database
-*  Send direct message, if contact is following
+*  Send direct message, if contact is following
-*  Show public pictures of contact (screenscraping of contact's website, works only with certain theme)
+*  Show public pictures of contact (screenscraping of contact's website, works only with certain theme)
-*  Open website of contact or connect page (for other contacts)
+*  Open website of contact or connect page (for other contacts)
+*  Clean other contacts with no news
      
 ToDo:
-*  More information for contact from description page, possibly private information for friends
+*  More information for contact from description page, possibly private information for friends (currently not supported in API)
 *  Groups: create, change, delete
 
      
@@ -58,45 +60,45 @@ ToDo:
 Currently supported:
 *  Download all own images to local directory
 *  Show albums in grid, show images in album in grid and fullscreen
+*  Upload pictures to albums with description
+*  Delete pictures on client and server
 *  Show albums and images of contacts
-*  Pinch to zoom, swipe to scroll
+*  Pinch to zoom, swipe to scroll
-
+
 ToDo:
 *  Private images of friends
 *  Support for all themes of friends
-*  Delete downloaded own images
 
-
+
-# Events #
+# Events #
-*  download own public events and public events of Friendica contacts
+*  download own public events and show public events of Friendica contacts
-*  list view of events of selected date
+*  list view of events of selected date
-*  click on event to show details
+*  click on event to show details
-
+
-ToDo
+ToDo
-* private events
+* private events
-
+
      
 # Config #
 Currently supported:
 *  Multiple accounts
-*  Maximum news (deleted after use of Quit button)
+*  Maximum news (surplus deleted after use of Quit button)
-*  View mode for news (tree or timeline)
+*  View mode for news (tree or timeline)
 
 ToDo
 *  OAuth?
-
+
      
 # Other #
 ToDo
 *  Video tab
-*  Photo upload to album (needs API change)
 *  Translation
 *  Blingbling
-
 
-# Translations #
+
-*  German
+# Translations #
-
+*  German, Spanish
+
      
 ## License ##
 Pubished under the [GPL v3](http://gplv3.fsf.org).

source-android/android/AndroidManifest.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.4" android:versionCode="4" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.1" android:versionCode="1" android:installLocation="auto">
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/friendiqa" android:logo="@drawable/friendiqa">
+    <application android:hardwareAccelerated="true" android:vmSafeMode="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/friendiqa" android:logo="@drawable/friendiqa" android:theme="@android:style/Theme.Holo.Light">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleTop">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" 
+                  android:name="androidnative.friendiqa.FriendiqaActivity"
+		  android:label="Friendiqa"
+		  android:screenOrientation="unspecified"
+		  android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

source-android/android/androidnative.gradle

@@ -0,0 +1,34 @@
+
+// Obtain androidPackageSourceDir
+// androidPackageSourceDir is the absolute path of the folder containing build.gradle and AndroidManifests.xml
+// This code also works with androiddeployqt.
+
+import groovy.json.JsonSlurper
+
+String getAndroidPackageSourceDir() {
+    String res = System.getProperty("user.dir");
+
+    FileTree tree = fileTree(dir: res + "/..").include("android*deployment-settings.json");
+
+    if (tree.getFiles().size() > 0) {
+        def inputFile =  tree.getFiles().toArray()[0];
+        def InputJSON = new JsonSlurper().parseText(inputFile.text);
+        res = InputJSON["android-package-source-directory"]
+    } else {
+        println("android*deployment-settings.json not found. Set androidPackageSourceDir to user.dir");
+    }
+
+    return res;
+}
+
+String setAndroidNativePath(String path) {
+    String androidPackageSourceDir = getAndroidPackageSourceDir();
+    String androidNativePath = androidPackageSourceDir + path + "/java/src";
+    LinkedHashSet hash = android.sourceSets.main.java.srcDirs;
+    hash.add(androidNativePath);
+    android.sourceSets.main.java.srcDirs = hash;
+}
+
+ext {
+    setAndroidNativePath = this.&setAndroidNativePath;
+}

source-android/android/build.gradle

@@ -55,3 +55,5 @@ android {
         abortOnError false
     }
 }
+    apply from: "androidnative.gradle"
+    setAndroidNativePath("/../androidnative.pri");

source-android/android/gradle.properties

@@ -1,4 +1,4 @@
-androidBuildToolsVersion=23.0.2
+androidBuildToolsVersion=25.0.3
-androidCompileSdkVersion=23
+androidCompileSdkVersion=25
 buildDir=.build
-qt5AndroidDir=/home/pankraz/Qt/5.8/android_armv7/src/android/java
+qt5AndroidDir=/home/pankraz/Qt/5.9.1/android_armv7/src/android/java

source-android/android/gradle.properties~

@@ -0,0 +1,4 @@
+androidBuildToolsVersion=25.0.3
+androidCompileSdkVersion=25
+buildDir=.build
+qt5AndroidDir=/home/pankraz/Qt/5.9.1/android_armv7/src/android/java

source-android/android/local.properties

@@ -1 +1 @@
-sdk.dir=/opt/android-sdk
+sdk.dir=/home/pankraz/android-sdk_alt

source-android/android/local.properties~

@@ -0,0 +1 @@
+sdk.dir=/home/pankraz/android-sdk_alt

source-android/android/src/ExampleService.java

@@ -0,0 +1,96 @@
+package androidnative.example;
+import androidnative.SystemDispatcher;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.util.Log;
+import android.os.Handler;
+import android.app.Activity;
+import android.view.View;
+import android.content.Context;
+import java.util.Map;
+import org.qtproject.qt5.android.QtNative;
+
+public class ExampleService {
+
+    static {
+
+        SystemDispatcher.addListener(new SystemDispatcher.Listener() {
+
+            NotificationManager m_notificationManager;
+            Notification.Builder m_builder;
+
+            private void notificationManagerNotify(Map data) {
+
+                final Activity activity = QtNative.activity();
+                final Map messageData = data;
+
+                Runnable runnable = new Runnable () {
+                    public void run() {
+                        try {
+                            String title = (String) messageData.get("title");
+
+                            String message = (String) messageData.get("message");
+
+                            if (m_notificationManager == null) {
+                                m_notificationManager = (NotificationManager) activity.getSystemService(Context.NOTIFICATION_SERVICE);
+                                m_builder = new Notification.Builder(activity);
+
+                                // Small Icon is a must to make notification works.
+                                // And that is why you need to inherit QtActivity
+                                //m_builder.setSmallIcon(drawable.icon);
+                            }
+
+                            m_builder.setContentTitle(title);
+                            m_builder.setContentText(message);
+                            m_notificationManager.notify(1, m_builder.build());
+
+                            // Test function. Remove it later.
+                            SystemDispatcher.dispatch("Notifier.notifyFinished");
+                        } catch (Exception e) {
+                            Log.d("",e.getMessage());
+                        }
+
+                    };
+                };
+                activity.runOnUiThread(runnable);
+            }
+
+            private void hapticFeedbackPerform(Map data) {
+
+                final Activity activity = QtNative.activity();
+                final Map messageData = data;
+                Runnable runnable = new Runnable () {
+                    public void run() {
+                        int feedbackConstant = (Integer) messageData.get("feedbackConstant");
+                        int flags = (Integer) messageData.get("flags");
+
+                        Log.d("",String.format("hapticFeedbackPerform(%d,%d)",feedbackConstant,flags));
+
+                        View rootView = activity.getWindow().getDecorView().getRootView();
+                        rootView.performHapticFeedback(feedbackConstant, flags);
+
+                        // Test function. Remove it later.
+                        SystemDispatcher.dispatch("hapticFeedbackPerformFinished");
+                    };
+                };
+                activity.runOnUiThread(runnable);
+            }
+
+            public void onDispatched(String name , Map data) {
+
+                if (name.equals("Notifier.notify")) {
+                    notificationManagerNotify(data);
+                    return;
+                } else if (name.equals("hapticFeedbackPerform")) {
+                    hapticFeedbackPerform(data);
+                    return;
+                }
+
+                return;
+            }
+        });
+
+    }
+
+}
+

source-android/android/src/FriendiqaActivity.java

@@ -0,0 +1,16 @@
+package androidnative.friendiqa;
+
+import androidnative.AndroidNativeActivity;
+
+/**
+ * Created by benlau on 8/3/2017.
+ */
+
+public class FriendiqaActivity extends AndroidNativeActivity {
+    public FriendiqaActivity() {
+        super();
+
+        QT_ANDROID_THEMES = new String[] {""};
+        QT_ANDROID_DEFAULT_THEME = "";
+    }
+}

source-android/androidnative.pri

@@ -0,0 +1 @@
+Subproject commit 86774d715cead715661892dd8f95c7854894fa9f

source-android/application.qrc

@@ -4,14 +4,13 @@
         <file>qml/newsqml/NewsTab.qml</file>
         <file>qml/newsqml/Newsitem.qml</file>
         <file>qml/newsqml/MessageSend.qml</file>
-        <file>qml/newsqml/PermissionDialog.qml</file>
         <file>qml/newsqml/Conversation.qml</file>
-        <file>qml/newsqml/ImageDialog.qml</file>
         <file>qml/newsqml/FriendicaActivities.qml</file>
         <file>qml/contactqml/FriendsTab.qml</file>
         <file>qml/contactqml/GroupComponent.qml</file>
         <file>qml/contactqml/ContactComponent.qml</file>
         <file>qml/contactqml/ContactDetailsComponent.qml</file>
+        <file>qml/contactqml/Contactlist.qml</file>
         <file>qml/genericqml/BlueButton.qml</file>
         <file>qml/photoqml/PhotoComponent.qml</file>
         <file>qml/photoqml/PhotogroupComponent.qml</file>
@@ -208,7 +207,14 @@
         <file>qml/calendarqml/EventList.qml</file>
         <file>translations/friendiqa-de.qm</file>
         <file>translations/friendiqa-de.ts</file>
-        <file>translations/friendiqa-es.ts</file>
+        <file>qml/photoqml/ImageUploadDialog.qml</file>
-        <file>translations/friendiqa-es.qm</file>
+        <file>qml/genericqml/ImageDialog.qml</file>
+        <file>qml/genericqml/PermissionDialog.qml</file>
+        <file>images/addImage.png</file>
+        <file>common/imageselectandroid.h</file>
+        <file>common/imageselectandroid.cpp</file>
+        <file>qml/genericqml/ImagePicker.qml</file>
+        <file>common/quickandroid.h</file>
+        <file>common/quickandroid.cpp</file>
     </qresource>
 </RCC>

source-android/common/filesystem.cpp

@@ -54,6 +54,7 @@ void FILESYSTEM::makeDir(QString name)
 void FILESYSTEM::rmDir()
 {
     QDir dir(m_Directory);
+    //qDebug()<<m_Directory;
    if (dir.removeRecursively()){
     emit success(m_Directory);
     }
@@ -63,6 +64,8 @@ void FILESYSTEM::rmDir()
 void FILESYSTEM::rmFile(QString name)
 {
     QDir dir(m_Directory);
+    //qDebug()<<m_Directory;
+    //qDebug(name);
     if(dir.remove(name)){
     emit success(name);
     }
@@ -79,3 +82,47 @@ QFileInfoList FILESYSTEM::fileList()
     //qDebug() << "filelist " << m_Filelist;
     return dir.entryInfoList();
 }
+
+void FILESYSTEM::searchImage()
+{
+    QAndroidJniObject ACTION_PICK = QAndroidJniObject::getStaticObjectField("android/content/Intent", "ACTION_PICK", "Ljava/lang/String;");
+    QAndroidJniObject EXTERNAL_CONTENT_URI = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$Images$Media", "EXTERNAL_CONTENT_URI", "Landroid/net/Uri;");
+
+    QAndroidJniObject intent=QAndroidJniObject("android/content/Intent", "(Ljava/lang/String;Landroid/net/Uri;)V", ACTION_PICK.object<jstring>(), EXTERNAL_CONTENT_URI.object<jobject>());
+
+    if (ACTION_PICK.isValid() && intent.isValid())
+    {
+        intent.callObjectMethod("setType", "(Ljava/lang/String;)Landroid/content/Intent;", QAndroidJniObject::fromString("image/*").object<jstring>());
+        QtAndroid::startActivity(intent.object<jobject>(), 101,this);
+        qDebug() << "OK";
+    }
+    else
+    {
+        qDebug() << "ERRO";
+    }
+}
+
+void FILESYSTEM::handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data)
+{
+    jint RESULT_OK = QAndroidJniObject::getStaticField<jint>("android/app/Activity", "RESULT_OK");
+    if (receiverRequestCode == 101 && resultCode == RESULT_OK)
+    {
+        QAndroidJniObject uri = data.callObjectMethod("getData", "()Landroid/net/Uri;");
+        QAndroidJniObject dadosAndroid = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$MediaColumns", "DATA", "Ljava/lang/String;");
+        QAndroidJniEnvironment env;
+        jobjectArray projecao = (jobjectArray)env->NewObjectArray(1, env->FindClass("java/lang/String"), NULL);
+        jobject projacaoDadosAndroid = env->NewStringUTF(dadosAndroid.toString().toStdString().c_str());
+        env->SetObjectArrayElement(projecao, 0, projacaoDadosAndroid);
+        QAndroidJniObject contentResolver = QtAndroid::androidActivity().callObjectMethod("getContentResolver", "()Landroid/content/ContentResolver;");
+        QAndroidJniObject cursor = contentResolver.callObjectMethod("query", "(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;", uri.object<jobject>(), projecao, NULL, NULL, NULL);
+        jint columnIndex = cursor.callMethod<jint>("getColumnIndex", "(Ljava/lang/String;)I", dadosAndroid.object<jstring>());
+        cursor.callMethod<jboolean>("moveToFirst", "()Z");
+        QAndroidJniObject resultUri = cursor.callObjectMethod("getString", "(I)Ljava/lang/String;", columnIndex);
+        QString imageSelect = "file://" + resultUri.toString();
+        emit imageselected(imageSelect);
+    }
+    else
+    {
+        qDebug() << "Select error";
+    }
+}

source-android/common/filesystem.h

@@ -4,8 +4,9 @@
 #include <QDir>
 #include <QObject>
 #include <QtAndroidExtras>
+#include <QAndroidActivityResultReceiver>
 
-class FILESYSTEM : public QObject
+class FILESYSTEM : public QObject, public QAndroidActivityResultReceiver
 {
     Q_OBJECT
     Q_PROPERTY(QString Directory READ Directory WRITE setDirectory NOTIFY directoryChanged)
@@ -23,8 +24,10 @@ public:
     //bool direxist(QString Directory);
     QString homePath() const;
     QString cameraPath() const;
+    virtual void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data);
 
 signals:
+    void imageselected(QString);
     void directoryChanged();
     //void fileListContent(QList data);
     void success(QString data);
@@ -34,6 +37,7 @@ public slots:
     void makeDir(QString name);
     void rmDir();
     void rmFile(QString name);
+    void searchImage();
     //void fileList();
 
 private:

source-android/common/friendiqa.cpp

@@ -3,6 +3,26 @@
 #include <QtQuick>
 #include "xhr.h"
 #include "filesystem.h"
+//#include "qadrawableprovider.h"
+//#include "androidnative.pri/cpp/AndroidNative/systemdispatcher.h"
+#include "AndroidNative/systemdispatcher.h"
+#include "AndroidNative/environment.h"
+#include "AndroidNative/debug.h"
+#include "AndroidNative/mediascannerconnection.h"
+//#include "debugwrapper.h"
+
+#ifdef Q_OS_ANDROID 
+#include <QtAndroidExtras/QAndroidJniObject> 
+#include <QtAndroidExtras/QAndroidJniEnvironment>
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
+    Q_UNUSED(vm);
+ qDebug("NativeInterface::JNI_OnLoad()"); // It must call this function within JNI_OnLoad to enable System Dispatcher
+
+ AndroidNative::SystemDispatcher::registerNatives();
+ return JNI_VERSION_1_6;
+ } 
+#endif
+
 
 int main(int argc, char *argv[]) {
     QApplication app(argc, argv);
@@ -11,6 +31,8 @@ int main(int argc, char *argv[]) {
     qtTranslator.load("friendiqa-" + QLocale::system().name(),":/translations");
     app.installTranslator(&qtTranslator);
 
+//    qmlRegisterType<QASystemDispatcher>("SystemDispatcher", 0, 1, "SystemDispatcher");
+
     XHR* xhr = XHR::instance();
     view.rootContext()->setContextProperty("xhr", xhr);
     FILESYSTEM* filesystem = FILESYSTEM::instance();

source-android/common/imageselectandroid.cpp

@@ -0,0 +1,56 @@
+#include "imageselectandroid.h"
+
+imageSelectAndroid::imageSelectAndroid()
+{
+
+}
+imageSelectAndroid *imageSelectAndroid::instance()
+{
+    static imageSelectAndroid imageselectandroid;
+    return &imageselectandroid;
+}
+
+void imageSelectAndroid::searchImage()
+{
+    QAndroidJniObject ACTION_PICK = QAndroidJniObject::getStaticObjectField("android/content/Intent", "ACTION_PICK", "Ljava/lang/String;");
+    QAndroidJniObject EXTERNAL_CONTENT_URI = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$Images$Media", "EXTERNAL_CONTENT_URI", "Landroid/net/Uri;");
+
+    QAndroidJniObject intent=QAndroidJniObject("android/content/Intent", "(Ljava/lang/String;Landroid/net/Uri;)V", ACTION_PICK.object<jstring>(), EXTERNAL_CONTENT_URI.object<jobject>());
+
+    if (ACTION_PICK.isValid() && intent.isValid())
+    {
+        intent.callObjectMethod("setType", "(Ljava/lang/String;)Landroid/content/Intent;", QAndroidJniObject::fromString("image/*").object<jstring>());
+        QtAndroid::startActivity(intent.object<jobject>(), 101, this);
+        qDebug() << "OK";
+    }
+    else
+    {
+        qDebug() << "ERRO";
+    }
+}
+
+void imageSelectAndroid::handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data)
+{               qDebug() << "done";
+    jint RESULT_OK = QAndroidJniObject::getStaticField<jint>("android/app/Activity", "RESULT_OK");
+    if (receiverRequestCode == 101 && resultCode == RESULT_OK)
+    {
+                qDebug() << "done";
+        QAndroidJniObject uri = data.callObjectMethod("getData", "()Landroid/net/Uri;");
+        QAndroidJniObject dadosAndroid = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$MediaColumns", "DATA", "Ljava/lang/String;");
+        QAndroidJniEnvironment env;
+        jobjectArray projecao = (jobjectArray)env->NewObjectArray(1, env->FindClass("java/lang/String"), NULL);
+        jobject projacaoDadosAndroid = env->NewStringUTF(dadosAndroid.toString().toStdString().c_str());
+        env->SetObjectArrayElement(projecao, 0, projacaoDadosAndroid);
+        QAndroidJniObject contentResolver = QtAndroid::androidActivity().callObjectMethod("getContentResolver", "()Landroid/content/ContentResolver;");
+        QAndroidJniObject cursor = contentResolver.callObjectMethod("query", "(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;", uri.object<jobject>(), projecao, NULL, NULL, NULL);
+        jint columnIndex = cursor.callMethod<jint>("getColumnIndex", "(Ljava/lang/String;)I", dadosAndroid.object<jstring>());
+        cursor.callMethod<jboolean>("moveToFirst", "()Z");
+        QAndroidJniObject resultUri = cursor.callObjectMethod("getString", "(I)Ljava/lang/String;", columnIndex);
+        QString imageSelect = "file://" + resultUri.toString();
+        emit imageselected(imageSelect);
+    }
+    else
+    {
+        qDebug() << "Select error";
+    }
+}

source-android/common/imageselectandroid.h

@@ -0,0 +1,23 @@
+#ifndef IMAGEPICKANDROID_H
+#define IMAGEPICKANDROID_H
+#include <QObject>
+#include <QtAndroidExtras>
+
+#include <QDebug>
+
+class imageSelectAndroid : public QObject, public QAndroidActivityResultReceiver
+{
+    Q_OBJECT
+
+public:
+    imageSelectAndroid();
+    static imageSelectAndroid *instance();
+    void searchImage();
+
+    virtual void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject & data);
+
+signals:
+    void imageselected(QString);
+};
+
+#endif // IMAGEPICKANDROID_H

source-android/common/qasystemdispatcher.cpp

@@ -0,0 +1,348 @@
+// Author:  Ben Lau (https://github.com/benlau)
+#include <QCoreApplication>
+#include <QPointer>
+#include <QtCore>
+#include <QPair>
+#include <QQueue>
+#include "qasystemdispatcher.h"
+
+static QPointer<QASystemDispatcher> m_instance;
+
+QString QASystemDispatcher::ACTIVITY_RESUME_MESSAGE = "Activity.onResume";
+QString QASystemDispatcher::ACTIVITY_RESULT_MESSAGE = "Activity.onActivityResult";
+
+
+#ifdef Q_OS_ANDROID
+#include <QAndroidJniObject>
+#include <QAndroidJniEnvironment>
+
+#define JCLASS_Name "quickandroid/SystemDispatcher"
+#define DISPATCH_SIGNATURE "(Ljava/lang/String;Ljava/util/Map;)V"
+#define EMIT_SIGNATURE "(Ljava/lang/String;Ljava/util/Map;)V"
+
+static QVariantMap createVariantMap(jobject data);
+static jobject createHashMap(const QVariantMap &data);
+
+static QVariant convertToQVariant(QAndroidJniObject value) {
+    QVariant v;
+    if (!value.isValid()) {
+        return v;
+    }
+
+    QAndroidJniEnvironment env;
+
+    jclass jclass_of_string = env->FindClass("java/lang/String");
+    jclass jclass_of_integer = env->FindClass("java/lang/Integer");
+    jclass jclass_of_boolean = env->FindClass("java/lang/Boolean");
+    jclass jclass_of_list = env->FindClass("java/util/List");
+    jclass jclass_of_map = env->FindClass("java/util/Map");
+
+    if (env->IsInstanceOf(value.object<jobject>(),jclass_of_boolean)) {
+        v = QVariant::fromValue<bool>(value.callMethod<jboolean>("booleanValue","()Z"));
+    } else if (env->IsInstanceOf(value.object<jobject>(),jclass_of_integer)) {
+        v = value.callMethod<jint>("intValue","()I");
+    } else if (env->IsInstanceOf(value.object<jobject>(),jclass_of_string)) {
+        v = value.toString();
+    } else if (env->IsInstanceOf(value.object<jobject>(), jclass_of_map)) {
+        v = createVariantMap(value.object<jobject>());
+    } else if (env->IsInstanceOf(value.object<jobject>(),jclass_of_list)) {
+        QVariantList list;
+        int count = value.callMethod<jint>("size","()I");
+        for (int i = 0 ; i < count ; i++) {
+            QAndroidJniObject item = value.callObjectMethod("get","(I)Ljava/lang/Object;",i);
+            list.append(convertToQVariant(item));
+        }
+        v = list;
+    }
+
+    env->DeleteLocalRef(jclass_of_string);
+    env->DeleteLocalRef(jclass_of_integer);
+    env->DeleteLocalRef(jclass_of_boolean);
+    env->DeleteLocalRef(jclass_of_list);
+    env->DeleteLocalRef(jclass_of_map);
+
+    return v;
+}
+
+static QVariantMap createVariantMap(jobject data) {
+    QVariantMap res;
+
+    QAndroidJniEnvironment env;
+    /* Reference : https://community.oracle.com/thread/1549999 */
+
+    // Get the HashMap Class
+    jclass jclass_of_hashmap = (env)->GetObjectClass(data);
+
+    // Get link to Method "entrySet"
+    jmethodID entrySetMethod = (env)->GetMethodID(jclass_of_hashmap, "entrySet", "()Ljava/util/Set;");
+
+    // Invoke the "entrySet" method on the HashMap object
+    jobject jobject_of_entryset = env->CallObjectMethod(data, entrySetMethod);
+
+    // Get the Set Class
+    jclass jclass_of_set = (env)->FindClass("java/util/Set"); // Problem during compilation !!!!!
+
+    if (jclass_of_set == 0) {
+         qWarning() << "java/util/Set lookup failed\n";
+         return res;
+    }
+
+    // Get link to Method "iterator"
+    jmethodID iteratorMethod = env->GetMethodID(jclass_of_set, "iterator", "()Ljava/util/Iterator;");
+
+    // Invoke the "iterator" method on the jobject_of_entryset variable of type Set
+    jobject jobject_of_iterator = env->CallObjectMethod(jobject_of_entryset, iteratorMethod);
+
+    // Get the "Iterator" class
+    jclass jclass_of_iterator = (env)->FindClass("java/util/Iterator");
+
+    // Get link to Method "hasNext"
+    jmethodID hasNextMethod = env->GetMethodID(jclass_of_iterator, "hasNext", "()Z");
+
+    jmethodID nextMethod = env->GetMethodID(jclass_of_iterator, "next", "()Ljava/lang/Object;");
+
+    while (env->CallBooleanMethod(jobject_of_iterator, hasNextMethod) ) {
+        jobject jEntry = env->CallObjectMethod(jobject_of_iterator,nextMethod);
+        QAndroidJniObject entry = QAndroidJniObject(jEntry);
+        QAndroidJniObject key = entry.callObjectMethod("getKey","()Ljava/lang/Object;");
+        QAndroidJniObject value = entry.callObjectMethod("getValue","()Ljava/lang/Object;");
+        QString k = key.toString();
+
+        QVariant v = convertToQVariant(value);
+
+        env->DeleteLocalRef(jEntry);
+
+        if (v.isNull()) {
+            continue;
+        }
+
+        res[k] = v;
+    }
+
+    if (env->ExceptionOccurred()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+
+    env->DeleteLocalRef(jclass_of_hashmap);
+    env->DeleteLocalRef(jobject_of_entryset);
+    env->DeleteLocalRef(jclass_of_set);
+    env->DeleteLocalRef(jobject_of_iterator);
+    env->DeleteLocalRef(jclass_of_iterator);
+
+    return res;
+}
+
+static jobject convertToJObject(QVariant v) {
+    jobject res = 0;
+    QAndroidJniEnvironment env;
+
+    if (v.type() == QVariant::String) {
+        QString str = v.toString();
+        res = env->NewStringUTF(str.toLocal8Bit().data());
+    } else if (v.type() == QVariant::Int) {
+        jclass integerClass = env->FindClass("java/lang/Integer");
+        jmethodID integerConstructor = env->GetMethodID(integerClass, "<init>", "(I)V");
+
+        res = env->NewObject(integerClass,integerConstructor,v.toInt());
+
+        env->DeleteLocalRef(integerClass);
+    } else if (v.type() == QVariant::Bool) {
+        jclass booleanClass = env->FindClass("java/lang/Boolean");
+        jmethodID booleanConstructor = env->GetMethodID(booleanClass,"<init>","(Z)V");
+
+        res = env->NewObject(booleanClass,booleanConstructor,v.toBool());
+
+        env->DeleteLocalRef(booleanClass);
+
+    } else if (v.type() == QVariant::Map) {
+        res = createHashMap(v.toMap());
+    } else  if (v.type() == QVariant::List){
+        QVariantList list = v.value<QVariantList>();
+        jclass arrayListClass = env->FindClass("java/util/ArrayList");
+        jmethodID init = env->GetMethodID(arrayListClass, "<init>", "(I)V");
+        res = env->NewObject( arrayListClass, init, list.size());
+
+        jmethodID add = env->GetMethodID( arrayListClass, "add",
+                    "(Ljava/lang/Object;)Z");
+
+        for (int i = 0 ; i < list.size() ; i++) {
+            jobject item = convertToJObject(list.at(i));
+            env->CallBooleanMethod(res,add, item);
+            env->DeleteLocalRef(item);
+        }
+
+        env->DeleteLocalRef(arrayListClass);
+    } else {
+        qWarning() << "QASystemDispatcher: Non-supported data type - " <<  v.type();
+    }
+    return res;
+}
+
+static jobject createHashMap(const QVariantMap &data) {
+    QAndroidJniEnvironment env;
+
+    jclass mapClass = env->FindClass("java/util/HashMap");
+
+    if (mapClass == NULL)  {
+        qWarning() << "Failed to find class" << "java/util/HashMap";
+        return NULL;
+    }
+
+    jsize map_len = data.size();
+
+    jmethodID init = env->GetMethodID(mapClass, "<init>", "(I)V");
+    jobject hashMap = env->NewObject( mapClass, init, map_len);
+
+    jmethodID put = env->GetMethodID( mapClass, "put",
+                "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+
+    QMapIterator<QString, QVariant> iter(data);
+    while (iter.hasNext()) {
+        iter.next();
+
+        QString key = iter.key();
+        jstring jkey = env->NewStringUTF(key.toLocal8Bit().data());
+        QVariant v = iter.value();
+        jobject item = convertToJObject(v);
+
+        if (item == 0) {
+            continue;
+        }
+
+        env->CallObjectMethod(hashMap,put,jkey,item);
+        env->DeleteLocalRef(item);
+        env->DeleteLocalRef(jkey);
+     }
+
+    if (env->ExceptionOccurred()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+
+    env->DeleteLocalRef(mapClass);
+
+    return hashMap;
+}
+
+static void jniEmit(JNIEnv* env,jobject object,jstring name,jobject data) {
+    Q_UNUSED(object);
+    Q_UNUSED(env);
+
+    QAndroidJniObject tmp(name);
+    QString str = tmp.toString();
+
+    QVariantMap map;
+
+    if (data != 0) {
+        map = createVariantMap(data);
+    }
+
+    if (m_instance.isNull()) {
+        return;
+    }
+
+    QMetaObject::invokeMethod(m_instance.data(),"dispatched",Qt::AutoConnection,
+                              Q_ARG(QString, str),
+                              Q_ARG(QVariantMap,map));
+}
+
+
+#endif
+
+QASystemDispatcher::QASystemDispatcher(QObject* parent) : QObject(parent)
+{
+
+}
+
+QASystemDispatcher::~QASystemDispatcher()
+{
+
+}
+
+QASystemDispatcher *QASystemDispatcher::instance()
+{
+    if (!m_instance) {
+        QCoreApplication* app = QCoreApplication::instance();
+        m_instance = new QASystemDispatcher(app);
+    }
+    return m_instance;
+}
+
+void QASystemDispatcher::dispatch(QString type, QVariantMap message)
+{
+    Q_UNUSED(type);
+    Q_UNUSED(message);
+#ifdef Q_OS_ANDROID
+    QAndroidJniEnvironment env;
+
+    jstring jType = env->NewStringUTF(type.toLocal8Bit().data());
+    jobject jData = createHashMap(message);
+    QAndroidJniObject::callStaticMethod<void>(JCLASS_Name, "dispatch",
+                                              DISPATCH_SIGNATURE,
+                                              jType,jData);
+    env->DeleteLocalRef(jType);
+    env->DeleteLocalRef(jData);
+
+#else
+    static bool dispatching = false;
+    static QQueue<QPair<QString,QVariantMap> > queue;
+
+
+    if (dispatching) {
+        queue.enqueue(QPair<QString,QVariantMap> (type,message) );
+        return;
+    }
+
+    dispatching = true;
+    emit dispatched(type,message);
+
+
+qWarning() << "QASystemDispatcher: emitted"
+
+    while (queue.size() > 0) {
+        QPair<QString,QVariantMap> pair = queue.dequeue();
+        emit dispatched(pair.first,pair.second);
+    }
+    dispatching = false;
+#endif
+}
+
+void QASystemDispatcher::loadClass(QString javaClassName)
+{
+    QVariantMap message;
+    message["className"] = javaClassName;
+
+    dispatch("quickandroid.SystemDispatcher.loadClass",message);
+}
+
+void QASystemDispatcher::registerNatives()
+{
+#ifdef Q_OS_ANDROID
+    QAndroidJniEnvironment env;
+    jclass clazz = env->FindClass(JCLASS_Name);
+    if (!clazz)
+    {
+        qCritical() << QString("Can't find %1 class").arg(QString(JCLASS_Name));
+        return ;
+    }
+
+    JNINativeMethod methods[] =
+    {
+        {"jniEmit", EMIT_SIGNATURE, (void *)&jniEmit},
+    };
+
+    int numMethods = sizeof(methods) / sizeof(methods[0]);
+    if (env->RegisterNatives(clazz, methods, numMethods) < 0) {
+        if (env->ExceptionOccurred()) {
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+            qCritical() << "Exception occurred!!!";
+            return;
+        }
+    }
+
+    QAndroidJniObject::callStaticMethod<void>(JCLASS_Name, "init",
+                                              "()V");
+#endif
+}

source-android/common/qasystemdispatcher.h

@@ -0,0 +1,47 @@
+// Author:  Ben Lau (https://github.com/benlau)
+#pragma once
+#include <QObject>
+#include <QVariantMap>
+
+/// QASystemDispatcher provides an simple messaging interface between C/C++/QML and Java code.
+
+class QASystemDispatcher : public QObject
+{
+    Q_OBJECT
+public:
+    ~QASystemDispatcher();
+    static QASystemDispatcher* instance();
+
+    /// Dispatch a message via Dispatcher
+    /** The message will be first passed to Java's SystemDispatcher and invoke
+     * registered listener. Once it is finished, it will emit the
+     * "dispatched" signal.
+     *
+     */
+    Q_INVOKABLE void dispatch(QString type , QVariantMap message = QVariantMap());
+
+    /// Load a Java class
+    /** It will dispatch a message to Java and let it to load a Java class. That
+     * will force to run code in static block.
+     *
+     */
+    Q_INVOKABLE void loadClass(QString javaClassName);
+
+    /// Register JNI native methods. This function must be called in JNI_OnLoad. Otherwise, the messenger will not be working
+    static void registerNatives();
+
+    /// The name of message that will be dispatched during Activity.onActivityResult.
+    static QString ACTIVITY_RESULT_MESSAGE;
+
+    /// The name of message that will be dispatched during Activity.onResume.
+    static QString ACTIVITY_RESUME_MESSAGE;
+
+signals:
+    /// The signal is emitted when a message is dispatched.
+    void dispatched(QString type , QVariantMap message);
+
+public:
+    explicit QASystemDispatcher(QObject* parent = 0);
+
+};
+

source-android/common/quickandroid.cpp

@@ -0,0 +1,22 @@
+#include <QtQml>
+#include <QVariantMap>
+#include "quickandroid.h"
+//#include "qadevice.h"
+//#include "qamousesensor.h"
+
+#ifdef Q_OS_ANDROID
+#include <QAndroidJniEnvironment>
+#include <QAndroidJniObject>
+#endif
+
+void QuickAndroid::registerTypes()
+{
+    // "A" has been changed to a QML object. So now this function will do nothing.
+    // Keep here for compatible purpose only.
+}
+
+//qreal QuickAndroid::dp()
+//{
+//    return QADevice::readDp();
+//}
+

source-android/common/quickandroid.h

@@ -0,0 +1,21 @@
+#ifndef QUICKANDROID_H
+#define QUICKANDROID_H
+
+#include <QtGlobal>
+/// Quick Android Context
+
+class QuickAndroid
+{
+public:
+    static void registerTypes();
+
+    /// Obtain the detected "dp" value.
+    /** This function has been deprecated. Please use QADevice::dp()
+       @deprecated.
+     * @brief dp
+     * @return The detected "dp" value
+    */
+    static qreal dp();
+};
+
+#endif // QUICKANDROID_H

source-android/common/xhr.cpp

@@ -3,7 +3,10 @@
 #include <QHttpPart>
 #include <QTextCodec>
 #include <QUrlQuery>
-
+#include <QNetworkCookieJar>
+#include <QNetworkCookie>
+#include <QList>
+#include <QDataStream>
 #include "uploadableimage.h"
 
 XHR *XHR::instance()
@@ -114,7 +117,8 @@ void XHR::get()
     QByteArray loginData = m_login.toLocal8Bit().toBase64();
     QString headerData = "Basic " + loginData;
     request.setRawHeader("Authorization", headerData.toLocal8Bit());
-
+//    QNetworkCookieJar* cJar = new QNetworkCookieJar;
+//    manager.setCookieJar(cJar);
 
     request.setUrl(requrl);
     reply = manager.get(request);
@@ -184,7 +188,7 @@ void XHR::onReplySuccess()
     qDebug() << "!";
     emit this->success( bufferToString() );
     buffer.clear();
-    reply->deleteLater();
+//    reply->deleteLater();
 }
 
 void XHR::onRequestFinished()
@@ -206,6 +210,15 @@ void XHR::onReadyRead()
 {
     qDebug() << ".";
     buffer += reply->readAll();
+//    QList<QNetworkCookie> list =  manager.cookieJar()->cookiesForUrl(m_url);
+//        QFile f("/home/pankraz/cookie.txt");
+//        f.open(QIODevice::ReadWrite);
+//        for(int i = 0; i < list.size(); ++i){
+//            QDataStream s(&f);
+//            s << list.at(i).toRawForm();
+//        }
+//        f.close();
+
 }
 
 //void XHR::updateDownloadProgress(qint64 bytesRead, qint64 totalBytes)
@@ -227,5 +240,3 @@ QString XHR::bufferToString()
 {
     return QTextCodec::codecForName("utf-8")->toUnicode(buffer);
 }
-
-

source-android/friendiqa.pro

@@ -10,14 +10,20 @@
 #   - translation filenames have to be changed
 
 # The name of your application
+TEMPLATE = app
 TARGET = friendiqa
 CONFIG += debug
 QT += qml quick gui widgets androidextras
 
+include(androidnative.pri/androidnative.pri)
+
 SOURCES += common/friendiqa.cpp \
 	common/uploadableimage.cpp \
 	common/xhr.cpp \
-        common/filesystem.cpp
+        common/filesystem.cpp \
+
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+
 
 RESOURCES     = application.qrc
 
@@ -30,18 +36,16 @@ OTHER_FILES += qml/friendiqa.qml \
     qml/configqml/*.qml
     js/*.js
 
-# German translation is enabled as an example. If you aren't
-# planning to localize your app, remember to comment out the
-# following TRANSLATIONS line. And also do not forget to
-# modify the localized app name in the the .desktop file.
 TRANSLATIONS += translations/friendiqa-de.ts \
                 translations/friendiqa-es.ts
+
 HEADERS += \
     common/uploadableimage.h \
     common/xhr.h \
-    common/filesystem.h
+    common/filesystem.h 
-
+    
 DISTFILES += \
+    qml/calendarqml/*.qml \
     android/AndroidManifest.xml \
     android/gradle/wrapper/gradle-wrapper.jar \
     android/gradlew \
@@ -49,8 +53,15 @@ DISTFILES += \
     android/build.gradle \
     android/gradle/wrapper/gradle-wrapper.properties \
     android/gradlew.bat \
-    translations/friendiqa-es.qm
+    translations/*.ts \
-
+    qml/*.qml \
-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+    qml/newsqml/*.qml \
+    qml/contactqml/*.qml \
+    qml/photoqml/*.qml \
+    qml/configqml/*.qml \
+    js/*.js \
+    android/androidnative.gradle \
+    android/src/FriendiqaActivity.java \
+    android/src/ExampleService.java
 
 

source-android/friendiqa.pro.user

@@ -0,0 +1,713 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.4.1, 2017-11-07T21:01:34. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{8825bc46-5cad-4a59-be78-bf9eeaa7217a}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Android</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{8e3757e7-5698-4d0f-9f13-55359b1a832e}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build/debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build/release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation">/home/pankraz/ownCloud/clientsync/android_release.keystore</value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build/profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+      <value type="bool" key="UninstallPreviousPackage">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
+    <value type="QString" key="AndroidDeviceSerialNumber">CB5A22HSB9</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Android.AmStartArgsKey"/>
+    <valuelist type="QVariantList" key="Android.PostFinishShellCmdListKey"/>
+    <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/friendiqa.pro</value>
+    <value type="QString" key="QMakeProjectManager.QmakeAndroidRunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.9.1 for Android armv7)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.9.1 for Android armv7)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{24723259-836b-41bd-b02d-59d6a39363d2}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/build-friendiqa-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_1_for_Android_armv7-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/build-friendiqa-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_1_for_Android_armv7-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/build-friendiqa-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_1_for_Android_armv7-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">true</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+      <value type="bool" key="UninstallPreviousPackage">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Android.AmStartArgsKey"/>
+    <valuelist type="QVariantList" key="Android.PostFinishShellCmdListKey"/>
+    <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/friendiqa.pro</value>
+    <value type="QString" key="QMakeProjectManager.QmakeAndroidRunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">2</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>

source-android/friendiqa.pro.user.feb2a9e

@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.4.0, 2017-09-28T22:07:15. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{feb2a9e8-6b42-4908-9ecd-b9e4d47e7412}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.9.1 for Android armv7)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.9.1 for Android armv7)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d23c4988-3f50-4390-a021-93c3e1352521}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/bin/Friendiqa</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation">/home/pankraz/ownCloud/clientsync/android_release.keystore</value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">false</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/build-friendiqa-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_1_for_Android_armv7-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">false</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/build-friendiqa-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_1_for_Android_armv7-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Anwendungsdaten kopieren</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
+      <value type="QString" key="BuildTargetSdk">android-25</value>
+      <value type="QString" key="KeystoreLocation"></value>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android-APK erstellen</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.AndroidBuildApkStep</value>
+      <value type="int" key="Qt4ProjectManager.AndroidDeployQtStep.DeployQtAction">2</value>
+      <value type="bool" key="UseGradle">false</value>
+      <value type="bool" key="VerboseOutput">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">4</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployQtStep</value>
+      <value type="bool" key="UninstallPreviousPackage">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deployment auf Android-Gerät</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Android.AmStartArgsKey"/>
+    <valuelist type="QVariantList" key="Android.PostFinishShellCmdListKey"/>
+    <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/friendiqa.pro</value>
+    <value type="QString" key="QMakeProjectManager.QmakeAndroidRunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>

source-android/js/helper.js

@@ -22,7 +22,7 @@ function friendicaRequest(login,api,rootwindow,callback) {
         xhrequest.send();
     }
 
-function friendicaPostRequest(login,api,rootwindow,callback) {
+function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
         var xhrequest= new XMLHttpRequest();
         xhrequest.onreadystatechange = function() {
             //print(api+JSON.stringify(login)+Qt.atob(login.password));
@@ -40,9 +40,10 @@ function friendicaPostRequest(login,api,rootwindow,callback) {
 }
             }
         }
-        xhrequest.open("POST", login.server+api,true,login.username,Qt.atob(login.password));
+        xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));
-        xhrequest.send();
+        xhrequest.send(data);
     }
+
 function getCount(database,login,table,field,countvalue){
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     var count=0;
@@ -111,7 +112,7 @@ var where = " AND "+ filter +" = '" + filtervalue+"'";
  });
 }
 
-function showMessage(header,message,rootwindow){print("message: "+message);
+function showMessage(header,message,rootwindow){//print("message: "+message);
     var cleanmessage=message.replace(/"/g,"-");
     var messageString='import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:"'+header+'";standardButtons: StandardButton.Ok; text:" '+cleanmessage+'"}';
     var messageObject=Qt.createQmlObject(messageString,rootwindow,"messageOutput");

source-android/js/news.js

@@ -29,6 +29,30 @@ function requestGroups(login,database,rootwindow,callback){
         });
 })}
 
+function listFriends(login,database,callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+        db.transaction( function(tx) {
+             var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=1'); // check for friends
+             var contactlist=[];
+             for (var i=0;i<result.rows.length;i++){
+                 contactlist.push(result.rows.item(i))
+             }
+             callback(contactlist)
+        });
+}
+
+function deleteGroup(login,database,rootwindow,group, callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    Helperjs.friendicaPostRequest(login,"/api/friendica/group_delete?gid="+group.gid+"&name="+group.groupname,"","POST",rootwindow, function (obj){
+        var deletereturn=JSON.parse(obj);
+        if(deletereturn.success){
+        db.transaction( function(tx) {
+             var result = tx.executeSql('DELETE from groups where username="'+login.username+'" AND groupname="'+group.name+'"'); // delete group
+        callback()
+        });
+}})}
+
+
 function getFriendsTimeline(login,database,contacts,onlynew,rootwindow,callback){
     // retrieve and return timeline since last news, return contacts which are not friends and older than 2 days for update (friends can be updated in Contactstab)
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@@ -37,7 +61,7 @@ function getFriendsTimeline(login,database,contacts,onlynew,rootwindow,callback)
         var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1'); // check for last news id
         try{parameter=parameter+"&since_id="+result.rows.item(0).status_id;}catch(e){};})}
         var newContacts=[];
-        Helperjs.friendicaRequest(login,"/api/statuses/friends_timeline"+parameter, rootwindow,function (obj){print(obj);
+        Helperjs.friendicaRequest(login,"/api/statuses/friends_timeline"+parameter, rootwindow,function (obj){//print("newsjs "+JSON.stringify(contacts));
             var news=JSON.parse(obj);
             var newContacts=findNewContacts(news,contacts);
             callback(news,newContacts)
@@ -62,7 +86,7 @@ function getCurrentContacts(login,database,callback){
 callback(contactlist)
 }
 
-function findNewContacts(news,contacts){//print("contacts: "+JSON.stringify(news))
+function findNewContacts(news,contacts){
     var newContacts=[];
     for (var i=0;i<news.length;i++){
         var url=news[i].user.url;
@@ -88,11 +112,12 @@ function findNewContacts(news,contacts){//print("contacts: "+JSON.stringify(news
                 }
             }
          }
-//         var owner_id=parseInt(news[i].friendica_owner.id);
+
-//         if(contacts.indexOf(owner_id)==-1 &&  !(inArray(newContacts,"id",owner_id))){
+         var owner_url=news[i].friendica_owner.url;
-//             news[i].friendica_owner.isFriend=0;
+         if(contacts.indexOf(owner_url)==-1 &&  !(inArray(newContacts,"url",owner_url))){
-//             newContacts.push(news[i].friendica_owner);
+             news[i].friendica_owner.isFriend=0;
-//             }
+             newContacts.push(news[i].friendica_owner);
+             }
     }
     return newContacts
 }
@@ -233,7 +258,7 @@ function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
     if (messagetype==0){ api="/api/statuses/destroy?id="}
     else if (messagetype==1){ api="/api/direct_messages/destroy?id="}
     else if (messagetype==2){ api="/api/friendica/notifications/seen?id="}
-    Helperjs.friendicaPostRequest(login,api+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,api+newsid,"","POST", rootwindow,function (obj){
         var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
          db.transaction( function(tx) {var result = tx.executeSql('DELETE from news where username="'+login.username+'" AND messagetype='+messagetype+' AND status_id ='+newsid); // delete news id
              callback(obj)
@@ -241,7 +266,7 @@ function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
 })}
 
 function retweetNews(login,database,newsid,rootwindow,callback){
-   Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid, rootwindow,function (obj){
+   Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid,"","POST", rootwindow,function (obj){
         var answer=JSON.parse(obj);
        if(answer.status.error){Helperjs.showMessage("Repost",answer.status.code,rootwindow);}
         else{Helperjs.showMessage("Repost",obj,rootwindow)}
@@ -249,16 +274,14 @@ function retweetNews(login,database,newsid,rootwindow,callback){
 
 function favorite(login,favorite,newsid,rootwindow){
 // toggle favorites 
- if(favorite){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid, rootwindow,function (obj){
+ if(favorite){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid,"","POST", rootwindow,function (obj){
-        print("Favorite "+obj);
    })}
-    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid, rootwindow,function (obj){
+    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid, "POST",rootwindow,function (obj){
-        print("Favorite destroyed "+obj);
    })}
 }
 
 function  likerequest(login,database,verb,newsid,rootwindow){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/"+verb+"?id="+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/"+verb+"?id="+newsid, "","POST",rootwindow,function (obj){
          if (obj=='"ok"'){
             var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
             db.transaction( function(tx) {
@@ -289,7 +312,7 @@ function like(login,database,toggle,verb,newsid,rootwindow){
 }
 
 function attend(login,database,attend,newsid,rootwindow,callback){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, "","POST",rootwindow,function (obj){
             //print("attend: "+attend+obj);
     if (obj=='"ok"')
         var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@@ -364,7 +387,7 @@ function chatsfromdb(database,user,callback,stop_time){
         try{var rs = tx.executeSql('select created_at from news WHERE username="'+username+'" ORDER BY created_at DESC LIMIT 1');
         stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
     else{var stop="<"+stop_time}
-     var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+user+'" AND created_at'+stop+' ORDER BY created_at DESC LIMIT 20');
+     var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+user+'" AND created_at'+stop+' ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
     var conversations=[];
     for(var i = 0; i < conversationsrs.rows.length; i++) {
         conversations.push(conversationsrs.rows.item(i).statusnet_conversation_id);
@@ -372,15 +395,20 @@ function chatsfromdb(database,user,callback,stop_time){
     var newsArray=[];
     for(var j = 0; j< conversations.length; j++) {
         var newsrs=tx.executeSql('select * from news WHERE username="'+user+'"  AND statusnet_conversation_id="'+conversations[j] +'" ORDER BY created_at ASC');
-       // if(newsrs.rows.length>1){
+        var helpernews=newsrs.rows.item(0);
-           var helpernews=newsrs.rows.item(0);
+        helpernews.newscount=newsrs.rows.length;
-            helpernews.newscount=newsrs.rows.length;
+        helpernews=fetchUsersForNews(database,user,helpernews);
-            helpernews=fetchUsersForNews(database,user,helpernews)
+        //var chatArray=[];
-            newsArray.push(helpernews);
+       // for (var k=0;k<newsrs.rows.length;k++){
-            //}
+       //     var helperchat=newsrs.rows.item(k);
-}
+       //     helperchat=fetchUsersForNews(database,user,helperchat);
-     callback(newsArray);
+       //     chatArray.push(helperchat)
- })}
+       //}
+       //helpernews.chatArray=chatArray;
+        newsArray.push(helpernews);
+    }
+    callback(newsArray);
+})}
 
 function inArray(list, prop, val) {
     if (list.length > 0 ) {

source-android/js/newsworker.js

@@ -1,6 +1,11 @@
 WorkerScript.onMessage = function(msg) {
- if(msg.appendnews!==true){   msg.model.clear()};
+if(msg.deleteId)
-
+    {msg.model.remove(msg.deleteId);
+     msg.model.sync()
+}
+else{
+ if(msg.appendnews!==true){msg.model.clear()};
+        msg.model.sync()
  for (var j=0;j<msg.news.length;j++){
     if (msg.news[j]) {
         var newsitemobject=msg.news[j];
@@ -11,9 +16,12 @@ WorkerScript.onMessage = function(msg) {
             newsitemobject.user.profile_image_url="";
             newsitemobject.user.name="";
         }
-        //var forumname="";if (newsitemobject.messagetype==0&&(parseInt(newsitemobject.friendica_owner)!=parseInt(newsitemobject.user.id))){forumname=" via "+newsitemobject.friendica_owner_object.name}
+        var forumname="";try{if (newsitemobject.messagetype==0&&((newsitemobject.friendica_owner)!=(newsitemobject.user.url))){
+            //print(newsitemobject.friendica_owner+" Friendica Owner "+JSON.stringify(newsitemobject));
+            forumname=" via "+Qt.atob(newsitemobject.friendica_owner_object.name)
+        }}catch(e){print("forum name "+e)}
         var likeText="";var dislikeText="";var attendyesText="";var attendnoText="";var attendmaybeText="";  var self={};
-        if (newsitemobject.messagetype==0){
+        try{if (newsitemobject.messagetype==0){
            if (newsitemobject.like.length>0){
               if (newsitemobject.like.length==1){likeText= Qt.atob(newsitemobject.like[0].name)+" "+ qsTr("likes this.")}
               else {likeText= newsitemobject.like.length+" "+ qsTr("like this.")}
@@ -40,33 +48,38 @@ WorkerScript.onMessage = function(msg) {
            if (newsitemobject.friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
            if (newsitemobject.friendica_activities_self.indexOf(1)!=-1){self.liked=1}
            if (newsitemobject.friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
-          }
+          }} catch(e){print("Activities "+e)}
-           var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
+        var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
 
-        var attachmentList=[];if(newsitemobject.attachments){
+        var attachmentList=[];try{if(newsitemobject.attachments){
             var attachArray=JSON.parse(Qt.atob(newsitemobject.attachments));
             for (var image in attachArray){if(attachArray[image].mimetype=="image/gif"){
                 attachmentList.push(attachArray[image])
                 }
             }
-        }
+        }}catch(e){print("attachment "+e)}
         newsitemobject.attachmentList=attachmentList;
         var seconds=(msg.currentTime-newsitemobject.created_at)/1000;
-           var timestring="";
+        var timestring="";
-           if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
+        if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
-                else if (seconds<90){timestring=Math.round(seconds/60)+" "+qsTr("minute") +" "+qsTr("ago");}
+        else if (seconds<90){timestring=Math.round(seconds/60)+" "+qsTr("minute") +" "+qsTr("ago");}
-                else if (seconds<3600){timestring=Math.round(seconds/60)+" "+qsTr("minutes") +" "+qsTr("ago");}
+        else if (seconds<3600){timestring=Math.round(seconds/60)+" "+qsTr("minutes") +" "+qsTr("ago");}
-                else if (seconds<5400){timestring=Math.round(seconds/3600)+" "+qsTr("hour") +" "+qsTr("ago");}
+        else if (seconds<5400){timestring=Math.round(seconds/3600)+" "+qsTr("hour") +" "+qsTr("ago");}
-                else if (seconds<86400){timestring=Math.round(seconds/3600)+" "+qsTr("hours") +" "+qsTr("ago");}
+        else if (seconds<86400){timestring=Math.round(seconds/3600)+" "+qsTr("hours") +" "+qsTr("ago");}
-                else if (seconds<129600){timestring=Math.round(seconds/86400)+" "+qsTr("day") +" "+qsTr("ago");}
+        else if (seconds<129600){timestring=Math.round(seconds/86400)+" "+qsTr("day") +" "+qsTr("ago");}
-                else if (seconds<3888000){timestring=Math.round(seconds/86400)+" "+qsTr("days") +" "+qsTr("ago");}
+        else if (seconds<3888000){timestring=Math.round(seconds/86400)+" "+qsTr("days") +" "+qsTr("ago");}
-                else if (seconds<5832000){timestring=Math.round(seconds/3888000)+" "+qsTr("month") +" "+qsTr("ago");}
+        else if (seconds<5832000){timestring=Math.round(seconds/3888000)+" "+qsTr("month") +" "+qsTr("ago");}
-                else if (seconds<69984000){timestring=Math.round(seconds/3888000)+" "+qsTr("months") +" "+qsTr("ago");}
+        else if (seconds<69984000){timestring=Math.round(seconds/3888000)+" "+qsTr("months") +" "+qsTr("ago");}
-                else {timestring=Math.round(seconds/46656000)+" "+qsTr("years") +" "+qsTr("ago");}
+        else {timestring=Math.round(seconds/46656000)+" "+qsTr("years") +" "+qsTr("ago");}
-            var data=({"newsitemobject": newsitemobject,"dateDiff":timestring,"friendica_activities":friendica_activities})}
+
-          //print("News:"+j+msg.news.length+JSON.stringify(data));
+        var data=({"newsitemobject": newsitemobject,"dateDiff":timestring,"friendica_activities":friendica_activities,"forumname":forumname})}
-            msg.model.append(data);}
+        //print("News:"+j+msg.news.length+JSON.stringify(data));
-             if (j==msg.news.length){
+        msg.model.append(data)
-                 msg.model.sync()
+    }
-            };
+    
+    if (j==msg.news.length){
+        //print("j: "+j+" msg.model.count: "+msg.model.count);
+        msg.model.sync()
+}
+}
 }

source-android/js/service.js

@@ -24,43 +24,79 @@ function requestList(login,database,rootwindow,callback) {
 function dataRequest(login,photoID,database,rootwindow) {
     // check if image exist and call download function
     Helperjs.friendicaRequest(login,"/api/friendica/photo?photo_id="+photoID, rootwindow, function (image){
-            try{ if(image==""){currentimageno=currentimageno+1}else{
+        try{ if(image==""){currentimageno=currentimageno+1}else{
-                var obj = JSON.parse(image);
+            var obj = JSON.parse(image);
-                var helpfilename=obj.filename.substring(0,obj.filename.lastIndexOf("."));
+            var helpfilename=obj.filename.substring(0,obj.filename.lastIndexOf("."));
-                var filesuffix="";
+            var filesuffix="";
-                if (obj.type=="image/jpeg"){filesuffix=".jpg"}
+            if (obj.type=="image/jpeg"){filesuffix=".jpg"}
-                else if (obj.type=="image/png"){filesuffix=".png"}
+            else if (obj.type=="image/png"){filesuffix=".png"}
-                else {filesuffix=""}
+            else {filesuffix=""}
-
+            if (helpfilename==""){// check if file has any filename
-                if (helpfilename==""){// check if file has any filename
+                obj.filename=obj["id"]+filesuffix;
-                    obj.filename=obj["id"]+filesuffix;
+            }
-                }
+            else{obj.filename=helpfilename+filesuffix}
-                else{obj.filename=helpfilename+filesuffix}
+            var link="";
-                
+            if(obj["link"][0]){link=obj["link"][0]} else{link=obj["link"]["4"]}
-                 var link="";
+            xhr.setUrl(Qt.resolvedUrl(link));
-                 if(obj["link"][0]){link=obj["link"][0]} else{link=obj["link"]["4"]}
+            xhr.setFilename(login.imagestore+'albums/'+obj.album+"/"+obj["filename"]);
-                 xhr.setUrl(Qt.resolvedUrl(link));
+            xhr.setDownloadtype("picture");
-                 xhr.setFilename(login.imagestore+'albums/'+obj.album+"/"+obj["filename"]);
+            xhr.download();
-                 xhr.setDownloadtype("picture");
+            var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-                 xhr.download();
+            db.transaction( function(tx) {
-                 var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+               var result = tx.executeSql('SELECT * from imageData where id = "'+obj["id"]+'"');
-                 db.transaction( function(tx) {
+               if(result.rows.length === 1) {// use update
-                    var result = tx.executeSql('SELECT * from imageData where id = "'+obj["id"]+'"');
+               result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+obj.id+'", created="'+obj.created+'", edited="'+obj.edited+'", profile="'+obj.profile+'", link="'+obj["link"]["4"]+'", filename="'+obj.filename+'",title="'+obj.title+'", desc="'+obj.desc+'",   type="'+obj.type+'", width="'+obj.width+'", height="'+obj.height+'", album="'+obj.album+'", location="file://'+login.imagestore+'albums/'+obj.album+'/" where id="'+obj["id"]+'"');
-                    if(result.rows.length === 1) {// use update
+               } else {// use insert print('... does not exists, create it')
-                    result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+obj.id+'", created="'+obj.created+'", edited="'+obj.edited+'", profile="'+obj.profile+'", link="'+obj["link"]["4"]+'", filename="'+obj.filename+'",title="'+obj.title+'", desc="'+obj.desc+'",   type="'+obj.type+'", width="'+obj.width+'", height="'+obj.height+'", album="'+obj.album+'", location="file://'+login.imagestore+'albums/'+obj.album+'/" where id="'+obj["id"]+'"');
+               result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,obj.id,obj.created,obj.edited, obj.title, obj.desc, obj.album, obj.filename, obj.type, obj.height, obj.width,obj. profile,obj["link"]["4"],'file://'+login.imagestore+'albums/'+obj.album+"/"]);
-                    } else {// use insert print('... does not exists, create it')
+               }
-                    result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,obj.id,obj.created,obj.edited, obj.title, obj.desc, obj.album, obj.filename, obj.type, obj.height, obj.width,obj. profile,obj["link"]["4"],'file://'+login.imagestore+'albums/'+obj.album+"/"]);
+           })}}
-                    }
-                })}}
            catch (e){print("Data retrieval failure! "+ e+obj);}
 })}
 
 
-function deleteImageData(database,user,field,selection,callback) { // does nothing useful at the moment
+function deleteImage(database,login,type,location,rootwindow,callback) { // delete image locally and on server
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    var rsfilename=location.substring(location.lastIndexOf("/")+1,location.length);
+    var rslocation=location.substring(0,location.lastIndexOf("/")+1);
+    //print(type+" Name "+ rsfilename+" Location: "+rslocation)
+    db.transaction( function(tx) {
+        if (type=='image'){
+            var rs= tx.executeSql('SELECT * FROM imageData WHERE filename="'+rsfilename+'" AND location="'+rslocation+'"')
+            var imageId=rs.rows.item(0).id;
+            Helperjs.friendicaPostRequest(login,"/api/friendica/photo/delete?photo_id="+imageId,"","DELETE",rootwindow, function (obj){
+                //var deletereturn = JSON.parse(obj); print(obj);
+                //if (deletereturn.result=="deleted"){
+                        db.transaction( function(tx) {
+                            var deleters=tx.executeSql('DELETE  FROM imageData WHERE location="'+rslocation+'" AND filename="'+rsfilename+'"'); });
+                            filesystem.Directory=rslocation.substring(7,rslocation.length-1);
+                            filesystem.rmFile(rsfilename)
+           //}
+            })
+        }
+        else{
+            Helperjs.friendicaPostRequest(login,"/api/friendica/photoalbum/delete?album="+rsfilename,"","DELETE",rootwindow, function (obj){
+                //var deletereturn = JSON.parse(obj);
+                //if (deletereturn.result=="deleted"){
+                    db.transaction( function(tx) {
+                        var rs= tx.executeSql('SELECT DISTINCT location FROM imageData WHERE album="'+rsfilename+'" AND username="'+login.username+'"');
+                        var locationstring=rs.rows.item(0).location;
+                        filesystem.Directory=locationstring.substring(7,locationstring.length-1);
+                        filesystem.rmDir();
+                        var deleters=tx.executeSql('DELETE  FROM imageData WHERE album="'+location+'"');
+                    })
+               //}
+           })
+        }
+        callback(location)
+    })
+}
+
+function deleteContacts(database,user,callback) { // does nothing useful at the moment
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     //print(' delete Image Data() for ' + field +"="+selection)
     db.transaction( function(tx) {
-        result = tx.executeSql('UPDATE imageData SET data="" where '+ field +'="'+selection+'"');
+        result1= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
+        result2= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
     callback(result)})
 }
 
@@ -98,7 +134,6 @@ function requestFriendsPictures(link,rootwindow,callback){
     for (var i=0;i<arr.length-1;i++){
         var photoname=arr[i].substring(arr[i].lastIndexOf('alt')+5,arr[i].lastIndexOf('title')-2);
         var thumblink=arr[i].substring(arr[i].lastIndexOf('<img')+10,arr[i].lastIndexOf('alt')-2);
-
         var imagetype=thumblink.substring(thumblink.lastIndexOf("."));
         var photolink=thumblink.substring(0,thumblink.length-imagetype.length-2)+"-0"+imagetype
         if(thumblink.substring(0,4)!=="http"){thumblink=basehtml+thumblink}
@@ -106,22 +141,23 @@ function requestFriendsPictures(link,rootwindow,callback){
         var photo={'link':photolink,'name':photoname,'thumb':thumblink}
       photoarray.push(photo);
     }
-callback(photoarray)
+    callback(photoarray)
- })
+    })
 }
 
 // CONFIG FUNCTIONS
 
 function initDatabase(database) { // initialize the database object
     var db =Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-            print('initDatabase()'+database[0]+database[1]+database[2]+database[3])
+    print('initDatabase()'+database[0]+database[1]+database[2]+database[3])
     db.transaction( function(tx) {
         tx.executeSql('CREATE TABLE IF NOT EXISTS imageData(username TEXT,id INT, created TEXT,edited TEXT, title TEXT, desc TEXT, album TEXT,filename TEXT, type TEXT, height INT, width INT, profile INT, link TEXT,location TEXT)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS config(server TEXT, username TEXT, password TEXT, imagestore TEXT, maxnews INT, timerInterval INT, newsViewType TEXT,isActive INT, permissions TEXT,maxContactAge INT,APIVersion TEXT,layout TEXT, addons TEXT)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS news(username TEXT, messagetype INT, text TEXT, created_at INT, in_reply_to_status_id INT, source TEXT, status_id INT, in_reply_to_user_id INT, geo TEXT,favorited TEXT, uid INT, statusnet_html TEXT, statusnet_conversation_id TEXT,friendica_activities TEXT, friendica_activities_self TEXT, attachments TEXT, friendica_owner INT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS contacts(username TEXT, id INT, name TEXT, screen_name TEXT, location TEXT,imageAge INT, profile_image_url TEXT, description TEXT, profile_image BLOB, url TEXT, protected TEXT, followers_count INT, friends_count INT, created_at INT, favourites_count TEXT, utc_offset TEXT, time_zone TEXT, statuses_count INT, following TEXT, verified TEXT, statusnet_blocking TEXT, notifications TEXT, statusnet_profile_url TEXT, cid INT, network TEXT, isFriend INT)');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS contacts(username TEXT, id INT, name TEXT, screen_name TEXT, location TEXT,imageAge INT, profile_image_url TEXT, description TEXT, profile_image BLOB, url TEXT, protected TEXT, followers_count INT, friends_count INT, created_at INT, favourites_count TEXT, utc_offset TEXT, time_zone TEXT, statuses_count INT, following TEXT, verified TEXT, statusnet_blocking TEXT, notifications TEXT, statusnet_profile_url TEXT, cid INT, network TEXT, isFriend INT, timestamp INT)');
+        tx.executeSql('CREATE INDEX IF NOT EXISTS  contact_id ON contacts(id)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS groups(username TEXT, groupname TEXT, gid INT, members TEXT)');
-tx.executeSql('CREATE TABLE IF NOT EXISTS events(username TEXT, id INT, start INT, end INT, allday INT, title TEXT, j INT, d TEXT, isFirst INT, uid INT, cid INT, uri TEXT, created INT, edited INT, desc TEXT, location TEXT, type TEXT, nofinish TEXT, adjust INT, ignore INT, permissions TEXT, guid INT, itemid INT, plink TEXT, authorName TEXT, authorAvatar TEXT, authorLink TEXT, html TEXT)');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS events(username TEXT, id INT, start INT, end INT, allday INT, title TEXT, j INT, d TEXT, isFirst INT, uid INT, cid INT, uri TEXT, created INT, edited INT, desc TEXT, location TEXT, type TEXT, nofinish TEXT, adjust INT, ignore INT, permissions TEXT, guid INT, itemid INT, plink TEXT, authorName TEXT, authorAvatar TEXT, authorLink TEXT, html TEXT)');
 })}
 
 function cleanPermissions(oldperms){
@@ -208,6 +244,7 @@ function requestFriendsEvents(login,friend,rootwindow,callback){
  })
 }
 
+
 function savePermissions(database,obj) { // stores config to DB
  var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
  var permissions=JSON.stringify(obj)
@@ -240,7 +277,7 @@ Helperjs.friendicaWebRequest(url+"/api/statusnet/config",rootwindow, function (o
                         "\nText limit: "+serverconfig.site.textlimit+"\nShort Url length: "+serverconfig.site.shorturllength+
                         "\nFriendica version: "+serverconfig.site.friendica.FRIENDICA_VERSION+"\nDFRN version: "+serverconfig.site.friendica.DFRN_PROTOCOL_VERSION +
                         "\nDB Update version: "+serverconfig.site.friendica.DB_UPDATE_VERSION+"'}";
-callback(serverConfigString)
+    callback(serverConfigString)
 })}
 
 
@@ -317,6 +354,21 @@ function  cleanNews(database,callback){
      })
  }
 
+function cleanContacts(login,database,callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    db.transaction( function(tx) {
+        var oldestnewsrs= tx.executeSql('SELECT created_at FROM news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY created_at ASC LIMIT 1');
+        var oldestnewsTime=oldestnewsrs.rows.item(0).created_at-  604800000;  //contacts can be 7 days old
+        //print(login.username+" älteste news: "+ oldestnewsTime);
+        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge<'+oldestnewsTime); // check for friends
+        for (var i=0;i<result.rows.length;i++){
+            filesystem.rmFile(result.rows.item(i).profile_image);
+            var deleters = tx.executeSql('DELETE from contacts WHERE username="'+login.username+'" AND url="'+result.rows.item(i).url+'"');
+        }
+        callback()
+    })
+}
+
 function processNews(callback){
 //    Newsjs.getCurrentContacts(login,db,function(contacts){
 //        contactlist=contacts});
@@ -359,23 +411,34 @@ function updateContactInDB(login,database,isFriend,contact){// for newstab and f
 //    var suffix=contact.profile_image_url.substring(contact.profile_image_url.lastIndexOf("."), contact.profile_image_url.length);
 //    var imagename=login.imagestore+"contacts/"+contact.screen_name.trim()+suffix;
     
-var imagename="";
+    var imagename="";
-contacttimer.restart();
+    contacttimer.restart();
     var currentTime=Date.now();
-    if(contact.profile_image_url==""){root.currentContact=root.currentContact+1 } else{//print(JSON.stringify(contact))
+    var image_timestamp=0;
-        imagename=login.imagestore+"contacts/"+contact.screen_name+"-"+contact.profile_image_url.substring(contact.profile_image_url.lastIndexOf("/")+1, contact.profile_image_url.length);
+    if(contact.profile_image_url==""){root.currentContact=root.currentContact+1 }
-    
+    else{//print(JSON.stringify(contact))
-    xhr.setUrl(Qt.resolvedUrl(contact.profile_image_url));
+        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    xhr.setFilename(imagename);
+        db.transaction( function(tx) {
-    xhr.setDownloadtype("contact");
+            var currentts=0;
-    xhr.download();}
+            var currenttsrs= tx.executeSql('SELECT timestamp FROM contacts WHERE username="'+login.username+'" AND url="'+contact.url+'"');
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+            try{currentts=currenttsrs.rows.item(0).timestamp}catch(e){}
-    var result;
+
-    db.transaction( function(tx) {
+            var imagename_helper=[];
+            imagename_helper=contact.profile_image_url.split('?');//print("substring: "+JSON.stringify(imagename_helper)+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length))
+            imagename=login.imagestore+"contacts/"+contact.screen_name+"-"+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length);
+            try {parseInt(image_timestamp=imagename_helper[1].substring(imagename_helper[1].indexOf("ts=")+3,imagename_helper[1].length))} catch(e){};
+            //print(contact.screen_name+" Timestamp"+image_timestamp+" "+ new Date(parseInt(image_timestamp)*1000));
+            if ((image_timestamp>currentts) || (image_timestamp==0)){
+                xhr.setUrl(Qt.resolvedUrl(contact.profile_image_url));
+                xhr.setFilename(imagename);
+                xhr.setDownloadtype("contact");
+                xhr.download();
+            }
+        var result;
         result = tx.executeSql('SELECT * from contacts where username="'+login.username+'" AND url = "'+contact.url+'"'); // check for news url
         if(result.rows.length === 1) {// use update
-            result = tx.executeSql('UPDATE contacts SET  id='+contact.id+', name="'+Qt.btoa(contact.name)+'", screen_name="'+contact.screen_name+'", location="'+contact.location+'",imageAge='+currentTime+', profile_image_url="'+contact.profile_image_url+'", description="'+Qt.btoa(contact.description)+'", profile_image="'+imagename+'", protected="'+contact.protected+'", followers_count='+contact.followers_count+', friends_count='+contact.friends_count+', created_at="'+ Date.parse(Newsjs.cleanDate(contact.created_at))+'", favourites_count="'+contact.favorites_count+'", utc_offset="'+contact.utc_offset+'", time_zone="'+contact.time_zone+'", statuses_count='+contact.statuses_count+', following="'+contact.following+'", verified ="'+contact.verified+'", statusnet_blocking="'+contact.statusnet_blocking+'", notifications="'+contact.notifictions+'", statusnet_profile_url="'+contact.statusnet_profile_url+'", cid='+contact.cid+', network="'+contact.network+'", isFriend='+isFriend+' where username="'+login.username+'" AND  url="'+contact.url+'"');
+            result = tx.executeSql('UPDATE contacts SET  id='+contact.id+', name="'+Qt.btoa(contact.name)+'", screen_name="'+contact.screen_name+'", location="'+contact.location+'",imageAge='+currentTime+', profile_image_url="'+contact.profile_image_url+'", description="'+Qt.btoa(contact.description)+'", profile_image="'+imagename+'", protected="'+contact.protected+'", followers_count='+contact.followers_count+', friends_count='+contact.friends_count+', created_at="'+ Date.parse(Newsjs.cleanDate(contact.created_at))+'", favourites_count="'+contact.favorites_count+'", utc_offset="'+contact.utc_offset+'", time_zone="'+contact.time_zone+'", statuses_count='+contact.statuses_count+', following="'+contact.following+'", verified ="'+contact.verified+'", statusnet_blocking="'+contact.statusnet_blocking+'", notifications="'+contact.notifictions+'", statusnet_profile_url="'+contact.statusnet_profile_url+'", cid='+contact.cid+', network="'+contact.network+'", isFriend='+isFriend+', timestamp='+ image_timestamp+' where username="'+login.username+'" AND  url="'+contact.url+'"');
         } else {// use insert
-        result = tx.executeSql('INSERT INTO contacts VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,contact.id,Qt.btoa(contact.name),contact.screen_name,contact.location,currentTime,contact.profile_image_url, Qt.btoa(contact.description),imagename,contact.url,contact.protected,contact.followers_count, contact.friends_count,Date.parse(Newsjs.cleanDate(contact.created_at)),contact.favorites_count,contact.utc_offset,contact.time_zone,contact.statuses_count,contact.following,contact.verfied,contact.statusnet_blocking,contact.notifications,contact.statusnet_profile_url,contact.cid,contact.network,isFriend]);}
+        result = tx.executeSql('INSERT INTO contacts VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,contact.id,Qt.btoa(contact.name),contact.screen_name,contact.location,currentTime,contact.profile_image_url, Qt.btoa(contact.description),imagename,contact.url,contact.protected,contact.followers_count, contact.friends_count,Date.parse(Newsjs.cleanDate(contact.created_at)),contact.favorites_count,contact.utc_offset,contact.time_zone,contact.statuses_count,contact.following,contact.verfied,contact.statusnet_blocking,contact.notifications,contact.statusnet_profile_url,contact.cid,contact.network,isFriend,image_timestamp]);}
     });
-}
+}}

source-android/qml/calendarqml/CalendarTab.qml

@@ -18,7 +18,7 @@ Rectangle {
     property int offsetTime: currentTime.getTimezoneOffset() * 60 * 1000
     property var events:[]
     property var eventdays:[]
-    onEventdaysChanged: print(JSON.stringify(eventdays))
+    //onEventdaysChanged: print(JSON.stringify(eventdays))
 
     function showEvents(friend){
         if(friend=="backButton"){Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
@@ -32,10 +32,10 @@ Rectangle {
             eventdays=dayArray})
         }
         else {calendartab.calendartabstatus="Events";
- Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
+            Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
-            events=eventArray;
+                events=eventArray;
-            eventdays=dayArray;
+                eventdays=dayArray;
-            calBusy.running=false
+                calBusy.running=false
             })
         }
     }

source-android/qml/configqml/ConfigTab.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
+
 import "qrc:/js/service.js" as Service
 import "qrc:/js/layout.js" as Layoutjs
 import "qrc:/js/helper.js" as Helperjs

source-android/qml/configqml/InfoBox.qml

@@ -10,15 +10,17 @@ Rectangle{
         anchors.top:closeButton.bottom
         anchors.topMargin: mm
         textFormat: Text.RichText
-        wrapMode: Text.Wrap
+        width: parent.width
-        text: "<b>Friendiqa v0.003 </b><br>Licensed under GPL 3<br> "+
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        text: "<b>Friendiqa v0.1 </b><br>Licensed under GPL 3<br> "+
               "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+
               "Sourcecode: <a href='https://github.com/LubuWest/Friendiqa'>https://github.com/LubuWest/Friendica</a><br>"+
                "C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+
                "QML and Javascript code by <a href='https://freunde.ma-nic.de/profile/marco'>Marco</a><br>"+
                "Qt Framework <a href='https://www.qt.io'>www.qt.io</a><br>"+
                "Icons by <a href='http://fontawesome.io'>FontAwesome</a><br>"+
-               "Folder Icon by <a href='https://github.com/KDE/breeze-icons'>KDE Breeze Icons</a>"
+               "Folder Icon by <a href='https://github.com/KDE/breeze-icons'>KDE Breeze Icons</a><br>"+
+               "AndroidNative by <a href='https://github.com/benlau/androidnative.pri'>Ben Lau</a>"
          onLinkActivated:{
             Qt.openUrlExternally(link)}
      }
@@ -28,7 +30,7 @@ Rectangle{
             anchors.topMargin: 1*mm
             anchors.right: parent.right
             anchors.rightMargin: 1*mm
-        text:   "\uf057" //qsTr("Close")
+        text:   "\uf057"
         onClicked:{configStack.pop()}
      }
 }

source-android/qml/contactqml/ContactComponent.qml

@@ -20,7 +20,7 @@ Rectangle {
         width: 10*mm
         height:10*mm
         source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
-        onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+        onStatusChanged: {if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}}
         }
 
     Label {

source-android/qml/contactqml/ContactDetailsComponent.qml

@@ -13,8 +13,8 @@ property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?""
 Rectangle {
     id: wrapper
 
-    width:friendsTabView.width;
+    width:root.width-2*mm //friendsTabView.width;
-    height:friendsTabView.height-15*mm
+    height:root.height-20*mm// friendsTabView.height-15*mm
     border.color:  "grey"
     color:"white"
     Image {
@@ -30,7 +30,7 @@ Rectangle {
     Label {
         id: namelabel
         x: mm
-        width:friendsTabView.width-4*mm
+        width: root.width-6*mm //friendsTabView.width-4*mm
         height: 3*mm
         text:Qt.atob(contact.name)+" (@"+contact.screen_name+")"
         elide:Text.ElideRight
@@ -50,7 +50,7 @@ Rectangle{
        frameVisible: true
        id:namelabelflickable
        width: root.width-10*mm
-       height:friendsTabView.height-45*mm
+       height:root.height-50*mm//friendsTabView.height-45*mm
        x: mm
        clip:true
        Text{
@@ -83,6 +83,7 @@ Rectangle{
                     root.currentIndex=2;
                     fotostab.active=true;
                     root.fotoSignal(contact) ;
+                    contactLargeComponent.destroy();
                     }
              }
 
@@ -93,6 +94,7 @@ Rectangle{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.messageSignal(contact.id) ;
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -104,6 +106,7 @@ Rectangle{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.directmessageSignal(contact.screen_name);
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -117,6 +120,7 @@ Rectangle{
                     calendartab.active=true;
                     calendartab.calendartabstatus="Friend"
                     root.eventSignal(contact.url);
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -124,8 +128,7 @@ Rectangle{
                 id: closeButton
                 text: "\uf057" //"close"
                 onClicked:{contactLargeComponent.destroy();
-                    //contactComponent.state="";
+                }
-                    friendsTabView.contactSignal}
             }
         }
     }

source-android/qml/contactqml/Contactlist.qml

@@ -0,0 +1,101 @@
+// List of people
+import QtQuick 2.0
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle {
+    id:contactlistRectangle
+    property var contacts:[]
+    property var possibleUsers: []
+    //y:8*mm
+    color: "white"
+    border.color: "light grey"
+    radius:0.5*mm
+    width:groupListView.width
+    height:groupListView.height
+
+    ListView {
+          id: contactView
+          x:mm
+          y:6*mm
+          width: contactlistRectangle.width-2*mm
+          height: contactlistRectangle.height-10*mm
+          clip: true
+          spacing: 0
+          model: contactModel
+          delegate: listContact
+          }
+
+       ListModel{id: contactModel}
+
+       Component {  id:listContact
+               Rectangle{
+                  border.color: "#EEEEEE"
+                  border.width: 1
+                  radius:0.5*mm
+                  width:contactView.width
+                  height:6*mm
+                  Image {
+                      id: contactImage
+                      x:1
+                      y:1
+                      width: 5*mm
+                      height:5*mm
+                      source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
+                      onStatusChanged: if (contactImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+                      }
+                  Text{
+                    font.pixelSize: 3*mm
+                    anchors.left: contactImage.right
+                    anchors.margins: 1*mm
+                    text:Qt.atob(contact.name)
+                  }
+            Text {
+                id:selected
+                anchors.right:parent.right
+                visible: contactlist.indexOf(contact)>-1
+                z:4
+                text: "\u2713"
+                width: 5*mm
+                anchors.top: parent.top
+                color: "green"
+                font.pixelSize: 3*mm
+            }
+
+           MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                    if(selected.visible==true){
+                                contacts.splice(Helperjs.inArray(contacts,"id",contact.id),1);
+                                selected.visible=false
+                            }
+                            else{
+                                contacts.push(contact);
+                                selected.visible=true;
+                            }
+                        }
+                 }
+            }
+           }
+
+    BlueButton {
+            id: closeButton
+            anchors.top: parent.top
+            anchors.topMargin: 1*mm
+            anchors.right: parent.right
+            anchors.rightMargin: 1*mm
+            color:"white"
+            text: "\uf057"
+            onClicked: {
+               groupModelAppend(contacts,function(){
+                   contactlistRectangle.destroy()
+                 });
+            }
+    }
+
+    Component.onCompleted: {
+        for (var user in possibleUsers){
+            contactModel.append({"contact":possibleUsers[user]})
+        }
+    }
+}

source-android/qml/contactqml/FriendsTab.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/js/news.js" as Newsjs
+import "qrc:/js/service.js" as Service
 import "qrc:/qml/contactqml"
 import "qrc:/qml/genericqml"
 
@@ -20,6 +21,9 @@ Rectangle {
            var contactDetails = component.createObject(friendstab,{"contact": contact})
         }
     }
+
+
+
     TabView{
         id:friendsTabView
         tabPosition: Qt.TopEdge
@@ -63,7 +67,7 @@ Rectangle {
             id: friendsGridTab
             function showFriends(contact){
                 try {friendsModel.clear()} catch(e){print(e)};
-                Helperjs.readData(db,"contacts",root.login.username,function(friendsobject){
+                Helperjs.readData(db,"contacts",login.username,function(friendsobject){
                     for (var i=0;i<friendsobject.length;i++){
                          if(Helperjs.getCount(db,login,"contacts","screen_name",friendsobject[i].screen_name)>1){
                             friendsobject[i].screen_name=friendsobject[i].screen_name+"+"+friendsobject[i].cid
@@ -140,13 +144,30 @@ Rectangle {
                     }
                 },"isFriend",0,"screen_name ASC");
             }
+            BlueButton {
+                id: cleanButton
+                text:  "\uf021"
+                anchors.top: parent.top
+                anchors.topMargin: mm
+                anchors.right: parent.right
+                onClicked: {
+                    Service.cleanContacts(root.login,root.db,function(){
+                        try {contactsModel.clear()} catch(e){print(e)};
+                        Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
+                        for (var j=0;j<contactsobject.length;j++){
+                             contactsModel.append({"contact":contactsobject[j]});
+                            }
+                        },"isFriend",0,"screen_name ASC");
 
+                    })
+                }
+            }
              GridView {
                  id: contactsView
                  x:mm
-                 y:2*mm
+                 y:cleanButton.height+2*mm
                  width:contactsGridTab.width-2*mm
-                 height:contactsGridTab.height-2*mm
+                 height:contactsGridTab.height-cleanButton.height-2*mm
                  clip: true
                  cellHeight: 16*mm
                  cellWidth: 17*mm
@@ -173,16 +194,65 @@ Rectangle {
                   for (var j=0;j<groupsobject.length;j++){
                       groupsModel.append({"group":groupsobject[j]});
             }})}
+
+            function updateGroup(login,database,group){
+               // update groups
+                //var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+                //var groupdata={"gid":group.id,"name":group.name,"user":group.user};
+                //print("Groupdata  "+JSON.stringify(group));
+                var api="";
+                if (group.new){api="/api/friendica/group_create.json?name="+group.name}else{api="/api/friendica/group_update.json?gid="+group.id}
+                xhr.url= login.server + api;
+                xhr.setLogin(login.username+":"+Qt.atob(login.password));
+                xhr.clearParams();
+                xhr.setParam("gid",group.id);
+                xhr.setParam("name",group.name);
+                xhr.setParam("user", group.user);
+                xhr.setParam("json",group);
+                xhr.post();
+        //        Helperjs.friendicaPostRequest(login,api,groupdata,"POST",rootwindow, function (obj){print("groupcreate "+obj);
+        //           var groups=JSON.parse(obj);
+        //            db.transaction( function(tx) {
+        //                 var result = tx.executeSql('DELETE from groups where username="'+login.username+'"'); // clean old groups
+        //           for (var i=0;i<groups.length;i++){
+        //               var memberarray=[]; for (var user in groups[i].user){memberarray.push(parseInt(groups[i].user[user].cid))}
+        //              //print("Members: "+groups[i].user)
+        //                   var result2 = tx.executeSql('INSERT INTO groups VALUES (?,?,?,?)', [login.username,groups[i].name,groups[i].gid,JSON.stringify(memberarray)])}
+        //            callback()
+        //            });
+        //    })
+            }
+
+            Connections{
+                target:xhr
+                onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
+                onSuccess:{print("gruppe "+data);
+                    Newsjs.requestGroups(root.login,root.db,root,function(){
+                        showGroups(root.login.username)});
+                }
+            }
             BlueButton {
                 id: updateGroupsButton
                 text: "\uf021"
                 anchors.top: parent.top
                 anchors.topMargin: mm
                 anchors.right: parent.right
+                anchors.rightMargin: mm
                 onClicked: {
                     Newsjs.requestGroups(root.login,root.db,root,function(){
                         showGroups(root.login.username)})}
             }
+//            BlueButton {
+//                id: newGroupButton
+//                text: "\uf234"
+//                anchors.top: parent.top
+//                anchors.topMargin: mm
+//                anchors.right: updateGroupsButton.left
+//                anchors.rightMargin: mm
+//                onClicked: {
+//                    groupsModel.append({"group": {"new":true}});
+//                }
+//            }
             GridView {
                 id: groupsView
                 x:mm
@@ -196,11 +266,29 @@ Rectangle {
                      NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
                     }
                 model: groupsModel
-                delegate: GroupComponent { }
+                delegate: GroupComponent {}
+                //footer:groupFooter
                 }
             ListModel{
                 id: groupsModel
             }
+//            Component{
+//                id: groupFooter
+//                Image{
+//                    id: footerImage
+//                    width: 15*mm
+//                    height: 15*mm
+//                    fillMode: Image.PreserveAspectFit
+//                    source:"qrc:/images/addImage.png"
+//                    MouseArea{
+//                        anchors.fill: parent
+//                        onClicked:{
+//                            print("new group")
+//                            var component = Qt.createComponent("qrc:/qml/contactqml/GroupComponent.qml");
+//                            var imagedialog = component.createObject(groupsView,{"group": []});}
+//                    }
+//                }
+//            }
             Component.onCompleted: {
                 friendsTabView.groupsSignal.connect(showGroups);
             }

source-android/qml/contactqml/GroupComponent.qml

@@ -1,128 +1,215 @@
 import QtQuick 2.0
 import "qrc:/js/helper.js" as Helperjs
+import "qrc:/js/news.js" as Newsjs
 import "qrc:/qml/genericqml"
 
-    Item {
+Item {
-        id: groupComponent
+    id: groupComponent
-        Rectangle {
+    property var groupmembers:[]
-                  id: wrapper
+    //property bool newGroup: false
-                  width: 16*mm
+    function groupModelAppend(groupcontacts,callback){
-                  height: 15*mm
+       for (var n in groupcontacts){
-                  border.color:  "grey"
+        groupModel.append({"groupmember":groupcontacts[n]});}
-                  color:"white"
+        callback()
+    }
 
-                  Image {
+    Rectangle {
-                      id: photoImage
+        id: wrapper
-                      x:1
+        width: 16*mm
-                      y:1
+        height: 15*mm
-                      width: 10*mm
+        border.color:  "grey"
-                      height:10*mm
+        color:"white"
-                      source:"qrc:/images/defaultcontact.jpg"
-                      }
-                  Text {
-                    id: namelabel
-                    x: 1
-                    width: wrapper.width-2
-                    height: 3*mm
-                    text: group.groupname
-                    
-                    color: "#303030"
-                    font.pixelSize: 3*mm
-                    anchors.top: photoImage.bottom
-                   }
-                    BlueButton{
-                        id:infobutton
-                        width: 5*mm
-                        height: 5*mm
-                        color:"transparent"
-                        text:"?"
-                        anchors.left: photoImage.right
-                        anchors.leftMargin: 3
-                        anchors.topMargin: 3
-                        anchors.top: parent.top
-                        onClicked:{
-                            Helperjs.readField("members",root.db,"groups",root.login.username,function(groups){
-                            try {groupModel.clear()}catch (e){print(e)}
-                            var groupmembers=JSON.parse(groups);
-                            for (var user in groupmembers){
-                                Helperjs.readData(root.db,"contacts",root.login.username,function(userdata){
-                                    if (userdata[0]){groupModel.append({"groupmember":userdata[0]})}
-                                },"id",groupmembers[user])}
-                            },"groupname",group.groupname);
-                            groupComponent.state="large"}
-                    }
 
+        Image {
+            id: photoImage
+            x:1
+            y:1
+            width: 10*mm
+            height:10*mm
+            source:"qrc:/images/defaultcontact.jpg"
+        }
+        Rectangle{
+            id:namelabelRect
+            x: 1
+            width: wrapper.width-2
+            height: 3.5*mm
+            anchors.top: photoImage.bottom
+            border.color: "light grey"
+            TextInput {
+                id: namelabel
+                anchors.fill: parent
+                readOnly: true
+                text: group.new?"":group.groupname
+                color: "#303030"
+                font.pixelSize: 3*mm
 
-            Rectangle{
+            }
+        }
+        BlueButton{
+            id:infobutton
+            width: 5*mm
+            height: 5*mm
+            color:"transparent"
+            text:"?"
+            anchors.left: photoImage.right
+            anchors.leftMargin: 3
+            anchors.topMargin: 3
+            anchors.top: parent.top
+            onClicked:{
+                //if(group.new){
+                    Helperjs.readField("members",root.db,"groups",root.login.username,function(groups){
+                    try {groupModel.clear()}catch (e){print(e)}
+                    groupmembers=JSON.parse(groups);
+                    for (var user in groupmembers){
+                        Helperjs.readData(root.db,"contacts",root.login.username,function(userdata){
+                            if (userdata[0]){groupModel.append({"groupmember":userdata[0]})}
+                        },"id",groupmembers[user])
+                    } //catch(e){}
+                },"groupname",group.groupname);
+                //}
+                groupComponent.state="large"
+            }
+        }
+
+        Rectangle{
             id: detailsrectangle
-            anchors.top: namelabel.bottom
+            anchors.top: namelabelRect.bottom
             anchors.topMargin: 2*mm
             opacity: 0
 
-            Component {  id:groupMember
+            Component {
-                    Rectangle{
+                id:groupMember
-                       border.color: "#EEEEEE"
+                Rectangle{
-                       border.width: 1
+                    width:parent.width
-                       width:parent.width
+                    height:6*mm
-                       height:6*mm
+                    Rectangle{id:memberrectangle
-                       Image {
+                        border.color: "#EEEEEE"
-                           id: memberImage
+                        border.width: 1
-                           x:1
+                        width:parent.width-12*mm
-                           y:1
+                        height:6*mm
-                           width: 5*mm
+                        Image {
-                           height:5*mm
+                            id: memberImage
-                           source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
+                            x:1
-                           onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+                            y:1
-                           }
+                            width: 5*mm
-                       Text{
+                            height:5*mm
-                         font.pixelSize: 3*mm
+                            source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
-                         anchors.left: memberImage.right
+                            onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                         anchors.margins: 1*mm
+                            }
-                         text:Qt.atob(groupmember.name)
+                        Text{
-                       }
+                            font.pixelSize: 3*mm
-                       MouseArea{
+                            anchors.left: memberImage.right
-                          anchors.fill: parent
+                            anchors.margins: 1*mm
-                          onClicked:{
+                            width:parent.width-1
-                         root.currentIndex=1;
+                            text:Qt.atob(groupmember.name)
-                    friendstab.active=true;
+                        }
-                    root.contactdetailsSignal(groupmember)
+                        MouseArea{
+                            anchors.fill: parent
+                            onClicked:{
+                                root.currentIndex=1;
+                                friendstab.active=true;
+                                root.contactdetailsSignal(groupmember)
+                            }
+                        }
+                       // BlueButton{
+                       //     anchors.left: memberrectangle.right
+                       //     anchors.margins: 1*mm
+                       //     text: "\uf056"
+                       //     onClicked:{
+                       //         groupModel.remove(index)
+                       //     }
+                       // }
+                    }
                 }
             }
-                }}
 
-              ListView{
+            ListView{
-              id: groupListView
+                id: groupListView
-              x:1
+                x:1
-              //anchors.top: parent.top
+                //anchors.top: parent.top
-              width: root.width-10*mm
+                width: root.width-10*mm
-              height:groupsView.height -29*mm
+                height:groupsView.height -31*mm
-              clip: true
+                clip: true
-              spacing: 2
+                spacing: 2
-              model: groupModel
+                model: groupModel
-              delegate: groupMember
+                delegate: groupMember
-              }
+            }
 
-          ListModel{id: groupModel}
+            ListModel{id: groupModel}
 
-          BlueButton{
+            Row{
-              id: closeButton
+                anchors.top: groupListView.bottom
-              anchors.top: groupListView.bottom
+                anchors.topMargin: mm
-              anchors.topMargin: mm
+                spacing: mm
-              text: "\uf057"
+                BlueButton{
-              onClicked:{groupComponent.state=""}
+                    id: closeButton
+                    text: "\uf057"
+                    onClicked:{groupComponent.state="";
+                        if (group.new){groupsModel.remove(index)}
+                    }
+                }
+
+//                BlueButton{
+//                    id:  addMembers
+//                    text:"\uf234"
+//                    onClicked: {
+//                        Newsjs.listFriends(root.login,root.db,function(userdata){
+//                            var newlistcontacts=[];
+//                            for (var n in userdata){
+//                                if (groupmembers.indexOf(userdata[n].id)==-1){
+//                                    newlistcontacts.push(userdata[n])
+//                                }
+//                            }
+//                            var component = Qt.createComponent("qrc:/qml/contactqml/Contactlist.qml");
+//                            var contactlistobject = component.createObject(groupListView,{"possibleUsers":newlistcontacts});
+
+//                        })
+//                    }
+//                }
+
+//                BlueButton{
+//                    id: updateButton
+//                    text: "\uf0ee"
+//                    onClicked:{
+//                        var groupobject={};
+//                        var groupmembers=[];
+//                        for (var i=0;i<groupModel.count;i++){groupmembers.push(groupModel.get(i).groupmember)}
+//                        try{ groupobject.id=group.gid} catch(e){};
+//                        try{ groupobject.new=group.new} catch(e){};
+//                        if (namelabel.text==""){
+//                            Helperjs.showMessage(qsTr("Error"),qsTr("No name given"),root)}
+//                        else {
+//                            groupobject.name=namelabel.text;
+//                            groupobject.user=groupmembers;
+//                            updateGroup(login,db,groupobject)
+//                            groupComponent.state="";
+//                        }
+//                    }
+//                }
+//                BlueButton{
+//                    id: deleteButton
+//                    text: "\uf056"
+//                    onClicked:{
+//                        Newsjs.deleteGroup(root.login,root.db,root,group,function(){
+//                            groupComponent.state="";
+//                            groupsModel.remove(index)})
+//                    }
+//                }
+            }
         }
+    Component.onCompleted:{if(group.new){groupComponent.state="large"}}
     }
-}
 
-        states: [
+    states: [
-         State {
+        State {
             name: "large"
-            PropertyChanges { target: namelabel; font.pixelSize: 4*mm; width:groupsView.width}
+            PropertyChanges { target: namelabel; font.pixelSize: 4*mm; width:groupsView.width; readOnly:false}
+            PropertyChanges { target: namelabelRect; height: 4.5*mm}
             PropertyChanges { target: groupComponent; z: 2  }
             PropertyChanges { target: wrapper; width:groupsView.width;height:groupsView.height -2*mm-1}
             PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
             PropertyChanges { target:groupComponent.GridView.view ;contentY:groupComponent.y;contentX:groupComponent.x;interactive:false}
             PropertyChanges { target: detailsrectangle; opacity:1  }
             }
-         ]
+    ]
 }

source-android/qml/friendiqa.qml

@@ -25,7 +25,6 @@ TabView{
     signal friendsSignal(var username)
     signal contactdetailsSignal(var contact)
     signal eventSignal(var contact)
-    //currentIndex: (login=="")? 3:0
 
     property var news:[]
     property var newContacts:[]
@@ -49,7 +48,7 @@ TabView{
             })}
     }
 
-    onCurrentContactChanged:{// download next contact image after photoplaceholder is finished saving and update db
+    onCurrentContactChanged:{// download next contact image after successful download and update db
 
         if(currentContact<newContacts.length){
                     Service.updateContactInDB(login,db,newContacts[currentContact].isFriend,newContacts[currentContact])}
@@ -117,7 +116,7 @@ TabView{
         tab: Rectangle {
             color: styleData.selected?"sky blue":"light blue"
             border.color: "light grey"
-            implicitWidth: root.width/5-2*mm
+            implicitWidth: root.width/5
             implicitHeight: 5*mm
             Text { id: text
                 anchors.centerIn: parent

source-android/qml/genericqml/ImageDialog.qml

@@ -0,0 +1,148 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.2
+import Qt.labs.folderlistmodel 2.1
+import "qrc:/js/service.js" as Service
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle{
+    id:imageDialog
+    z:2
+    border.color: "grey"
+    width: parent.width-4*mm
+    height:parent.height-12*mm
+    x:2*mm
+    y:10*mm
+    property string directory: ""
+    property bool multiSelection: false
+
+    Text{
+        id:directoryText
+         x:0.5*mm
+         y:0.5*mm
+         width: imageDialog.width-15*mm
+         height:contentHeight
+         wrapMode: Text.Wrap
+         text: directory
+    }
+    BlueButton{
+        id:closeButton
+        anchors.top: parent.top
+        anchors.topMargin: 0.5*mm
+        anchors.right: parent.right
+        anchors.rightMargin: 1*mm
+        text:   "\uf057"
+        onClicked:{imageDialog.destroy()}
+    }
+
+    ListView {
+        id: imageView
+        x:0.5*mm
+        y: Math.max(directoryText.height, closeButton.height)+mm
+        width: imageDialog.width-2*mm
+        height: imageDialog.height-imageView.y-4*mm
+        clip: true
+        model: imageModel
+        delegate: imageItem
+    }
+
+    FolderListModel{
+        id: imageModel
+        nameFilters: ["*.png", "*.jpg",".jpeg","*.JPG","*.gif"]
+        sortField: FolderListModel.Time
+        sortReversed:false
+        showDotAndDotDot: true
+        showDirs: true
+        showDirsFirst: true
+        folder:directory
+    }
+
+    BusyIndicator{
+        id: imageBusy
+        anchors.horizontalCenter: imageView.horizontalCenter
+        anchors.top:imageView.top
+        anchors.topMargin: 2*mm
+        width:10*mm
+        height: 10*mm
+        running:false
+    }
+
+    Component{
+        id:imageItem
+        Item{
+            width:imageView.width
+            height:folderImage.height+2*mm
+            Rectangle{
+                id:imagetextRectangle
+                color:"black"
+                x:mm
+                z:3
+                opacity: fileIsDir?0:0.5
+                width:imagetext.contentWidth
+                height: imagetext.contentHeight
+                anchors.bottom: folderImage.bottom
+            }
+            Text {
+                id:imagetext
+                x:fileIsDir?11*mm:mm
+                z:4
+                text: fileName
+                width: fileIsDir?parent.width - 12*mm :imageView.width-mm
+                anchors.bottom: folderImage.bottom
+                color: fileIsDir?"black":"white"
+                font.pixelSize: 3*mm
+                wrapMode:Text.Wrap
+            }
+            Text {
+                id:selected
+                anchors.right:parent.right
+                visible: attachImageURLs.indexOf(fileURL)>-1
+                z:4
+                text: "\u2713"
+                width: 10*mm
+                anchors.top: folderImage.top
+                color: "green"
+                font.pixelSize: 10*mm
+            }
+
+            Image{id:folderImage
+                 width: fileIsDir?10*mm: imageView.width-mm
+                 fillMode:Image.PreserveAspectFit
+                 source:fileIsDir?"qrc:/images/folder-blue.png":fileURL
+                }
+
+            MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                   if (fileName==".."){
+                        imageModel.folder=imageModel.parentFolder;
+                        directory=imageModel.parentFolder
+                    }
+                    else if (fileIsDir){
+                        imageModel.folder=fileURL;
+                        directory=fileURL
+                    }
+                    else{
+                        if (multiSelection!=true){
+                            attachImageURLs.push(fileURL);
+                            attachImage(fileURL);
+                            imageDialog.destroy()
+                        }
+                        else {
+                            if(selected.visible==true){
+                                attachImageURLs.splice(attachImageURLs.indexOf(fileURL,1))
+                                selected.visible=false
+                            }
+                            else{
+                                attachImageURLs.push(fileURL);
+                                selected.visible=true;
+    
+                            }
+                            attachImage(fileURL)
+                        }
+                    }
+                }
+            }
+          }
+     }
+}

source-android/qml/genericqml/ImagePicker.qml

@@ -0,0 +1,59 @@
+import QtQuick 2.0
+import AndroidNative 1.0
+
+Item {
+
+    /// Set it to true if multiple images should be picked.
+    property bool multiple: false
+
+    /// If it is true, it will broadcast the taked photo to other application (e.g Let it show in Google Photos)
+    property bool broadcast: true
+
+    /// The URL of the image chosen. If multiple images are picked, it will be equal to the first image.
+    property string imageUrl: ""
+
+    /// A list of images chosen
+    property var imageUrls: []
+
+    /// It is emitted whatever photo(s) are picked/taken.
+    signal ready();
+
+    function pickImage() {
+        SystemDispatcher.dispatch(m_PICK_IMAGE_MESSAGE,{ multiple: multiple});
+    }
+
+    function takePhoto() {
+        SystemDispatcher.dispatch(m_TAKE_PHOTO_MESSAGE,{
+                                      broadcast: broadcast
+                                  })
+    }
+
+    property string m_PICK_IMAGE_MESSAGE: "androidnative.ImagePicker.pickImage";
+
+    property string m_TAKE_PHOTO_MESSAGE: "androidnative.ImagePicker.takePhoto";
+
+    property string m_CHOSEN_MESSAGE: "androidnative.ImagePicker.chosen";
+
+
+    Connections {
+        target: SystemDispatcher
+        onDispatched: {
+            if (type === m_CHOSEN_MESSAGE) {
+                //imageUrls = message.imageUrls;
+                //imageUrl = imageUrls[0];
+                var h=[];
+                for (var n in message.imageUrls){
+                    h.push("file://"+ decodeURIComponent(message.imageUrls[n]).substring(5))
+                }
+                imageUrls=h;
+                imageUrl=h[0];
+                ready();
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        SystemDispatcher.loadClass("androidnative.ImagePicker");
+    }
+}
+

source-android/qml/genericqml/OSSettingsAndroid.qml

@@ -1,8 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Window 2.0
-QtObject{
-    property int appWidth: Screen.desktopAvailableWidth
-    property int appHeight: Screen.desktopAvailableHeight
-    property int backKey: Qt.Key_Back
-    property string attachImageDir:filesystem.cameraPath+"/"
-}

source-android/qml/genericqml/OSSettingsLinux.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.0
-QtObject{
-    property real appWidth: 500 
-    property real appHeight: 500
-    property int backKey: Qt.Key_Escape
-    property string attachImageDir:filesystem.homePath+"/Pictures/"
-}

source-android/qml/genericqml/PermissionDialog.qml

@@ -0,0 +1,189 @@
+import QtQuick 2.0
+import "qrc:/js/service.js" as Service
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle{
+    id:permissionDialog
+//    x: mm
+    width: parent.width-5*mm
+    height:root.height/3
+    function updatePerms(){
+        for (var i=0;i<groupModel.count;i++)
+        {if (groupModel.get(i).groupstatus=="positive"){
+             group_allow.push(groupModel.get(i).group.gid)
+             }
+         if (groupModel.get(i).groupstatus=="negative"){
+             group_deny.push(groupModel.get(i).group.gid)
+             }
+         }
+        for (var j=0;j<contactModel.count;j++){
+         if (contactModel.get(j).contactstatus=="positive"){
+             contact_allow.push(contactModel.get(j).contact.cid)
+             }
+         if (contactModel.get(j).contactstatus=="negative"){
+             contact_deny.push(contactModel.get(j).contact.cid)
+             }
+             if ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))
+             {permButton.text="\uf09c"}
+             else{permButton.text="\uf023"}
+         }}
+
+    Text{
+         x:0.5*mm
+         y:0.5*mm
+         text: qsTr("Friends")
+    }
+    ListView {
+          id: contactView
+          x:0.5*mm
+          y:5.5*mm
+          width: permissionDialog.width/2-2*mm
+          height: permissionDialog.height-14*mm
+          clip: true
+          spacing: 1
+          model: contactModel
+          delegate: contactItem
+     }
+
+     ListModel{id: contactModel}
+     Component{
+         id:contactItem
+         Rectangle{
+             id:contactitemRect
+             width:contactView.width
+             height: 5*mm
+             radius: 0.5*mm
+             property string contactstatus
+             onContactstatusChanged:{
+                 if(contactstatus=="positive"){contactitemRect.color="light green"}
+                   else if (contactstatus=="negative"){contactitemRect.color= "ffe6e6"}
+                   else{contactitemRect.color= "white"}}
+             color: "white"
+             border.color:"grey"
+             Text{
+               color:"grey"
+               text:contact.screen_name
+               }
+            MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                    if(contactModel.get(index).contactstatus=="neutral"){
+                        contactModel.set(index,{"contactstatus":"positive"});
+                        contactstatus="positive"
+                    }
+                    else if (contactModel.get(index).contactstatus=="positive"){
+                        contactModel.set(index,{"contactstatus":"negative"})
+                        contactstatus="negative"
+                    }
+                    else{contactModel.set(index,{"contactstatus":"neutral"});
+                        contactstatus="neutral";
+                    }
+             }}
+          Component.onCompleted:{
+                    if (contactModel.get(index).contactstatus=="positive"){
+                  contactstatus="positive"
+              }
+              else if (contactModel.get(index).contactstatus=="negative"){
+                  contactstatus="negative"
+              }
+               else {contactstatus="neutral"}  }
+          }
+      }
+     Text{
+         x:contactView.width+2*mm
+         y:0.5*mm
+         text: qsTr("Groups")
+    }
+    ListView {
+          id: groupView
+          x:contactView.width+2*mm
+          y:5.5*mm
+          width: permissionDialog.width/2-2*mm
+          height: permissionDialog.height-14*mm
+          clip: true
+          spacing: 1
+          model: groupModel
+          delegate: groupItem
+     }
+
+     ListModel{id: groupModel}
+     Component{
+          id:groupItem
+          Rectangle{
+             id:groupitemRect
+             width:groupView.width
+             radius: 0.5*mm
+             height: 5*mm
+             property string groupstatus:"neutral"
+             onGroupstatusChanged:
+                {if(groupstatus=="positive"){groupitemRect.color="light green"}
+                 else if (groupstatus=="negative"){groupitemRect.color= "#ffe6e6"}
+                 else{groupitemRect.color= "white"}}
+             color: "white"
+             border.color:"grey"
+              Text{
+                  color:"grey"
+                  text:group.groupname
+                   }
+               MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                    if(groupModel.get(index).groupstatus=="neutral"){
+                        groupModel.set(index,{"groupstatus":"positive"});
+                        groupstatus="positive"}
+                    else if (groupModel.get(index).groupstatus=="positive"){
+                        groupModel.set(index,{"groupstatus":"negative"});
+                        groupstatus="negative"}
+                   else{groupModel.set(index,{"groupstatus":"neutral"})
+                    groupstatus="neutral"}
+                }}
+             Component.onCompleted:{ if (groupModel.get(index).groupstatus=="positive"){
+                  groupstatus="positive"
+              }
+              else if (groupModel.get(index).groupstatus=="negative"){
+                  groupstatus="negative"
+              }
+               else {groupstatus="neutral"}  }
+              }
+      }
+      BlueButton{
+         x:0.5*mm
+         anchors.bottom: parent.bottom
+         anchors.bottomMargin:1
+         text:"\uf0c7"
+         onClicked:{
+            updatePerms();
+            var perms=[];
+            perms.push(contact_allow,contact_deny,group_allow,group_deny);
+            Service.savePermissions(db,perms)
+                   }
+      }
+      BlueButton{
+         x:contactView.width+2*mm
+         anchors.bottom: parent.bottom
+         anchors.bottomMargin:1
+         text:"\u2713"
+         onClicked:{updatePerms();
+                    permissionDialog.destroy();
+                    }
+        }
+
+     Component.onCompleted:{
+         Helperjs.readData(db,"contacts",login.username,function(contacts){
+            for (var name in contacts){
+               var contactstatus="neutral";
+               if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
+               else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
+               contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
+         }},"isFriend",1);
+
+         Helperjs.readData(db,"groups",login.username,function(owngroups){
+            for (var number in owngroups){
+                  var groupstatus= "neutral";
+                  if (group_allow.indexOf(owngroups[number].gid)>-1){groupstatus="positive"}
+                  else if (group_deny.indexOf(owngroups[number].gid)>-1){groupstatus="negative"}
+                   groupModel.append({"group":owngroups[number],"groupstatus":groupstatus})
+         }});
+      }
+}

source-android/qml/newsqml/Conversation.qml

@@ -1,26 +1,18 @@
 // ConversationView with button
 import QtQuick 2.0
+import QtQuick.Controls 1.2
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
 
 Rectangle {
     id:conversationList
-    property var news
+    //property var news
     y:1
     z:2
     color: "white"
     border.color: "grey"
     width:root.width-5*mm
     height: conversationView.height+10*mm
-    Connections{
-        target:newstab
-        onConversationChanged:{
-                if(newstab.conversation.length==0){
-                    newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
-                    conversationList.destroy(); conversationsymbol.color="grey"
-                }
-        }
-    }
 
    ListView {
           id: conversationView
@@ -34,6 +26,32 @@ Rectangle {
           model: conversationModel
           delegate: Newsitem{}
           }
+    BusyIndicator{
+         id: conversationBusy
+         anchors.horizontalCenter: conversationView.horizontalCenter
+         anchors.top:conversationList.top
+         anchors.topMargin: 2*mm
+         width:10*mm
+         height: 10*mm
+         running: true
+       }
+
+    Connections{
+        target:newstab
+        onConversationChanged:{
+            if(newsitem.itemindex==newsStack.conversationIndex){
+                if(newstab.conversation.length==0){
+                    newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
+                    conversationList.destroy(); conversationsymbol.color="grey"
+                } else { conversationBusy.running=false;
+                  conversationModel.clear();
+                  var currentTime= new Date();
+                  var msg = {'currentTime': currentTime, 'model': conversationModel,'news':newstab.conversation};
+                  conversationWorker.sendMessage(msg)
+                  conversationsymbol.color="grey"}
+            }
+        }
+    }
 
    Component {  id:footerReply
        Rectangle{
@@ -117,9 +135,9 @@ Rectangle {
             }
     }
 
-    Component.onCompleted: {
+//    Component.onCompleted: {
-        var currentTime= new Date();
+//        if (news){var currentTime= new Date();
-        var msg = {'currentTime': currentTime, 'model': conversationModel,'news':news};
+//        var msg = {'currentTime': currentTime, 'model': conversationModel,'news':news};
-        conversationWorker.sendMessage(msg)
+//        conversationWorker.sendMessage(msg)}
-    }
+//    }
 }

source-android/qml/newsqml/FriendicaActivities.qml

@@ -1,4 +1,4 @@
-// List if people from Friendica Activities
+// List of people from Friendica Activities
 import QtQuick 2.0
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -51,11 +51,7 @@ Rectangle {
 
            MouseArea{
                 anchors.fill: parent
-                onClicked:{
+                onClicked:{showContact(contact)}
-                    try {root.currentIndex=1;
-                    friendstab.active=true;
-                    root.contactdetailsSignal(contact)
-                } catch(e) {Helperjs.showMessage("Error",e,root)}} 
             }
            }}
 

source-android/qml/newsqml/ImageDialog.qml

@@ -1,121 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.2
-import Qt.labs.folderlistmodel 2.1
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:imageDialog
-    z:2
-    border.color: "grey"
-    width: parent.width-4*mm
-    height:parent.height-12*mm
-    x:2*mm
-    y:10*mm
-    property string directory: ""
-
-    Text{
-        id:directoryText
-         x:0.5*mm
-         y:0.5*mm
-         width: imageDialog.width-15*mm
-         height:contentHeight
-         wrapMode: Text.Wrap
-         text: directory
-    }
-    BlueButton{
-           id:closeButton
-           anchors.top: parent.top
-           anchors.topMargin: 1*mm
-           anchors.right: parent.right
-           anchors.rightMargin: 1*mm
-       text:   "\uf057"
-       onClicked:{imageDialog.destroy()}
-    }
-      ListView {
-          id: imageView
-          x:0.5*mm
-          y:directoryText.height+mm
-          width: imageDialog.width-2*mm
-          height: imageDialog.height-directoryText.height-4*mm
-          clip: true
-          model: imageModel
-          delegate: imageItem
-     }
-
-     FolderListModel{
-         id: imageModel
-         nameFilters: ["*.png", "*.jpg",".jpeg","*.JPG","*.gif"]
-         sortField: FolderListModel.Time
-         sortReversed:false
-         showDotAndDotDot: true
-         showDirs: true
-         showDirsFirst: true
-         folder:directory
-     }
-
-     BusyIndicator{
-         id: imageBusy
-         anchors.horizontalCenter: imageView.horizontalCenter
-         anchors.top:imageView.top
-         anchors.topMargin: 2*mm
-         width:10*mm
-         height: 10*mm
-         running:false
-       }
-
-
-     Component{
-         id:imageItem
-         Item{
-             width:imageView.width
-             height:folderImage.height+2*mm
-             Rectangle{
-                 id:imagetextRectangle
-                 color:"black"
-                 x:mm
-                 z:3
-                 opacity: fileIsDir?0:0.5
-                 width:imagetext.contentWidth
-                 height: imagetext.contentHeight
-                 anchors.bottom: folderImage.bottom
-            }
-            Text {
-                id:imagetext
-                x:fileIsDir?11*mm:mm
-                z:4
-                text: fileName
-                width: fileIsDir?parent.width - 12*mm :imageView.width-mm
-                anchors.bottom: folderImage.bottom
-                color: fileIsDir?"black":"white"
-                font.pixelSize: 3*mm
-                wrapMode:Text.Wrap
-            }
-            Image{id:folderImage
-                 width: fileIsDir?10*mm: imageView.width-mm
-                 fillMode:Image.PreserveAspectFit
-                 source:fileIsDir?"qrc:/images/folder-blue.png":fileURL
-                }
-
-                MouseArea{
-                    anchors.fill: parent
-                    onClicked:{
-                        if (fileName==".."){
-                            imageModel.folder=imageModel.parentFolder;
-                            directory=imageModel.parentFolder
-                        }
-                        else if (fileIsDir){
-                            imageModel.folder=fileURL;
-                            directory=fileURL
-                        }
-                        else{
-                            attachImageURLs.push(fileURL);
-                           attachImage(fileURL);
-                      imageDialog.destroy()
-                        }
-                    }
-                }
-          }
-     }
-}

source-android/qml/newsqml/MessageSend.qml

@@ -26,10 +26,8 @@ Flickable{
     property var group_deny:login.permissions[3]
 
     function attachImage(url){
-    //onAttachImageURLsChanged: {if(attachImageURL!=""){
+        var imageAttachmentObject=Qt.createQmlObject('import QtQuick 2.0; Image {id:imageAttachment'+attachImageURLs.length+'; source:"'+
-            var imageAttachmentObject=Qt.createQmlObject('import QtQuick 2.0; Image {id:imageAttachment'+attachImageURLs.length+'; source:"'+
+        url.toString()+'"; width: 15*mm; height: 15*mm;fillMode: Image.PreserveAspectFit;MouseArea{anchors.fill:parent;onClicked:{attachImageURLs.splice(attachImageURLs.indexOf("'+url+'"),1); imageAttachment'+attachImageURLs.length+'.destroy()}}}',messageColumn,"attachedImage");
-                url.toString()+'"; width: 15*mm; height: 15*mm;fillMode: Image.PreserveAspectFit;MouseArea{anchors.fill:parent;onClicked:{attachImageURLs.splice(attachImageURLs.indexOf("'+url+'",1)); imageAttachment'+attachImageURLs.length+'.destroy()}}}',messageColumn,"attachedImage");
-            console.log("You chose: " + url)
         }
 
     function statusUpdate(title,status,in_reply_to_status_id,attachImageURL) {
@@ -125,12 +123,21 @@ Flickable{
                     }
 
           Row{
+
+              ImagePicker {
+                  id: imagePicker;
+                  multiple : false
+                  onReady: {
+                      attachImageURLs.push(imagePicker.imageUrl);
+                      attachImage(imagePicker.imageUrl)
+                  }
+              }
               spacing:2
               BlueButton{id:permButton
                   visible: (directmessage==1)?false:true
                   text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
                   onClicked: {
-                     var component = Qt.createComponent("qrc:/qml/newsqml/PermissionDialog.qml");
+                     var component = Qt.createComponent("qrc:/qml/genericqml/PermissionDialog.qml");
                      var permissions = component.createObject(messageColumn);
                   }}
               BlueButton {
@@ -142,9 +149,10 @@ Flickable{
                           Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment supported at the moment.\n Remove other attachment first!"), messageColumn)
                       }
                       else{
-                          var defaultDirectory="file://"+osSettings.attachImageDir;
+                          //var defaultDirectory="file://"+osSettings.attachImageDir;
-                          var component = Qt.createComponent("qrc:/qml/newsqml/ImageDialog.qml");
+                          //var component = Qt.createComponent("qrc:/qml/genericqml/ImageDialog.qml");
-                          var imagedialog = component.createObject(messageSend,{"directory": defaultDirectory});
+                          //var imagedialog = component.createObject(messageSend,{"directory": defaultDirectory});
+                           imagePicker.pickImage()
                       }
                   }
                }
@@ -159,7 +167,7 @@ Flickable{
                               if(Helperjs.getCount(db,login,"contacts","screen_name",contacts[i].screen_name)>1){
                                   contacts[i].screen_name=contacts[i].screen_name+"+"+contacts[i].cid
                               }
-                              contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+"';iconSource:'"+contacts[i].profile_image+"'; onTriggered: bodyField.insert(0,' @"+contacts[i].screen_name+"+"+contacts[i].cid+" ')}"
+                              contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+"';iconSource:'"+contacts[i].profile_image+"'; onTriggered: bodyField.insert(0,' @"+contacts[i].screen_name+" ')}"
                         }}
                         var menuString="import QtQuick.Controls 1.4; Menu {"+contactitems+"}";
                         var contactlistObject=Qt.createQmlObject(menuString,messageSend,"contactmenuOutput")
@@ -171,7 +179,6 @@ Flickable{
                    text: "\uf118"
                    onClicked: {
                                var smileyarray=Smileyjs.smileys
-                       //print(JSON.stringify(smileyarray[0]))
                        var component = Qt.createComponent("qrc:/qml/newsqml/SmileyDialog.qml");
                        var smileydialog = component.createObject(messageColumn)
                    }}

source-android/qml/newsqml/NewsTab.qml

@@ -33,13 +33,16 @@ Item {
     }
 
     Timer {id:replytimer; interval: 1000; running: false; repeat: false
-        onTriggered: {if(newstab.newstabstatus=="Conversation"){
+        onTriggered: {
-                showConversation(newsStack.timelineIndex-1,newsModel.get(0).newsitemobject)} else{
+            if(newstab.newstabstatus=="Conversation"){
+                showConversation(newsStack.timelineIndex-1,newsModel.get(0).newsitemobject)}
+            else{
                 var onlynew=true;
                 Newsjs.getFriendsTimeline(login,db,contactlist,onlynew,newstab,function(rns,rnc){
                     root.contactLoadType="news";
                     root.news=rns;root.newContacts=rnc;root.currentContact=0})
-            }}
+            }
+        }
     }
 
 
@@ -53,7 +56,7 @@ Item {
     }
 
     function showConversation(conversationIndex,newsitemobject){
-        newsBusy.running=true;
+        //newsBusy.running=true;
         root.contactLoadType="conversation";
         newsStack.conversationIndex= conversationIndex;
         if(newsitemobject.messagetype==0){
@@ -65,6 +68,13 @@ Item {
         })}
     }
 
+    function showContact(contact){
+        var component = Qt.createComponent("qrc:/qml/contactqml/ContactDetailsComponent.qml");
+        if (component.status== Component.Ready){
+            var contactDetails = component.createObject(newstab,{"contact": contact})
+        }
+    }
+
     function onFriendsMessages(friend){
         newstab.newstabstatus="Contact"
        Newsjs.newsfromdb(db,root.login.username, function(dbnews){showNews(dbnews)},friend)
@@ -75,6 +85,8 @@ Item {
         newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"reply_to_user": friend,"directmessage":1,"login":root.login}});
     }
 
+
+
    StackView{
        id: newsStack
        anchors.fill:parent
@@ -100,7 +112,6 @@ Item {
 
            BlueButton {
                id: newMessageButton
-               width:10*mm
                text: "\uf040"
                onClicked: {
                    var groups=[];
@@ -115,7 +126,6 @@ Item {
            }
            BlueButton {
              id: quitButton
-             width:10*mm
              text: "\uf08b"
              onClicked: {Service.cleanNews(root.db,function(){Qt.quit() })}
            }
@@ -127,6 +137,7 @@ Item {
                 newstab.newstabstatus=login.newsViewType;
                 root.contactLoadType="news";
                 var onlynew=true;
+                //print("newstab "+ JSON.stringify(contactlist));
                 Newsjs.getFriendsTimeline(login,db,contactlist,onlynew,newstab,function(ns,nc){
                     root.news=ns;root.newContacts=nc;root.currentContact=0;
                     if (ns.length==0){// update last 20 existing news for changes and likes
@@ -153,29 +164,29 @@ Item {
                  }
                  MouseArea{anchors.fill:parent
                      onClicked:{
-                      var currentTime= new Date();
+                        var currentTime= new Date();
-                      if(newstab.newstabstatus=="Timeline"){
+                        var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
-                            var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
+                         print("Lastnews ID "+lastnews_id+Qt.atob(newsModel.get(newsModel.count-1).newsitemobject.statusnet_html))
+                        if(newstab.newstabstatus=="Timeline"){
                             Newsjs.newsfromdb(root.db,root.login.username, function(news){
-                          var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                          newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                          },false,lastnews_id)}
+                            },false,lastnews_id)}
-                      if(newstab.newstabstatus=="Conversations"){
+                        if(newstab.newstabstatus=="Conversations"){
-                            var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
                             Newsjs.chatsfromdb(root.db,root.login.username, function(news){
-                          var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                          newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                          },lastnews_id)}
+                            },lastnews_id)}
-                      else if(newstab.newstabstatus=="Contact"){
+                        else if(newstab.newstabstatus=="Contact"){
-                          Newsjs.newsfromdb(root.db,root.login.username, function(news){
+                            Newsjs.newsfromdb(root.db,root.login.username, function(news){
-                            var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                            newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                            },newsModel.get(newsModel.count-1).newsitemobject.uid,newsModel.get(newsModel.count-1).newsitemobject.created_at)}
+                            },newsModel.get(newsModel.count-1).newsitemobject.uid,lastnews_id)}
-                      }}
+                     }
-                  }
+                 }
+             }
         }
 
-
         ListView {
           id: newsView
           anchors.fill: parent
@@ -187,8 +198,8 @@ Item {
           footer: footerComponent
           model: newsModel
           delegate: Newsitem{}
-          //onContentYChanged:{if(contentY<-15*mm&&contentY>(-15*mm-1)){print("refreshing");
+          //onContentYChanged:{if(contentY<-8*mm&&contentY>(-8*mm-1)){print("refreshing");
-          onDragEnded:{if(contentY<-8*mm){//print("refreshing");
+          onDragEnded:{if(contentY<-5*mm){//print("refreshing");
                   newsBusy.running=true;
                   newstab.newstabstatus=login.newsViewType;
                   root.contactLoadType="news";

source-android/qml/newsqml/Newsitem.qml

@@ -10,21 +10,8 @@ Item {
     width: parent.width
     height:toprow.height+friendicaActivities.height+controlrow.height+1//Math.max((itemMessage.height+topFlow.height+friendicaActivities.height+4*mm),profileImage.height+user_name.height+mm)
 
-    Connections{
-        target:newstab
-        onConversationChanged:{
-            newsBusy.running=false;
-            if(index==newsStack.conversationIndex){
-               if(newstab.conversation.length>0){
-                   var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
-                   var conversation = component.createObject(friendicaActivities,{"news":newstab.conversation});
-               }
-               else{conversationsymbol.color="grey"}
-            }
-        }
-    }
-
     property string attending: ""
+    property int itemindex: index
     onAttendingChanged: {attendLabel.visible=true;
             attendLabel.text= qsTr("attending: ")+ qsTr(attending)}
 
@@ -54,11 +41,7 @@ Item {
             height: 7*mm
             MouseArea{
                 anchors.fill: parent
-                onClicked:{
+                onClicked:{showContact(newsitemobject.user)}
-                    try{root.currentIndex=1;
-                    friendstab.active=true;
-                    root.contactdetailsSignal(newsitemobject.user)} catch (e){Helperjs.showMessage("Error",e,root)}
-                }
             }
             onStatusChanged: if (profileImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
         }
@@ -68,13 +51,12 @@ Item {
             width:parent.width
             font.pixelSize: 1.5*mm
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: Qt.atob(newsitemobject.user.name)//+forumname
+            text: Qt.atob(newsitemobject.user.name)+forumname
         }
     }
     Column {
         id:newscolumn
         width: newsitem.width-8*mm
-        //anchors.left: authorcolumn.right
 
         Flow{
             id:topFlow
@@ -114,7 +96,13 @@ Item {
                 text:   try {(newsitemobject.newscount-1)+qsTr(" comments") }catch(e){" "}
                 MouseArea{
                     anchors.fill:parent
-                    onClicked: {conversationsymbol.color="black";showConversation(index,newsitemobject)}
+                    onClicked: {
+                        conversationsymbol.color="black";
+                        newsView.contentY+=newsitem.height;
+                        var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
+                        var conversationItem = component.createObject(friendicaActivities,{"news":newsitemobject.chatArray});
+                        showConversation(index,newsitemobject);
+                    }
                 }
             }
         }
@@ -150,6 +138,7 @@ Item {
        spacing:mm
 
        Label{color: "grey"
+             height:3.5*mm
              font.pixelSize: 1.5*mm
              text: friendica_activities.likeText
              MouseArea{
@@ -158,6 +147,7 @@ Item {
              }
        }
        Label{color: "grey"
+             height:3.5*mm
              font.pixelSize: 1.5*mm
              text: friendica_activities.dislikeText
              MouseArea{
@@ -166,6 +156,7 @@ Item {
              }
        }
        Label{color: "grey"
+             height:3.5*mm
              font.pixelSize: 1.5*mm
              text: friendica_activities.attendyesText
              MouseArea{
@@ -173,6 +164,7 @@ Item {
                  onClicked: { showActivityContacts(newsitemobject.attendyes)}
              }}
        Label{color: "grey"
+             height:3.5*mm
              font.pixelSize: 1.5*mm
              text: friendica_activities.attendnoText
              MouseArea{
@@ -181,6 +173,7 @@ Item {
              }
        }
        Label{color: "grey"
+             height:3.5*mm
              font.pixelSize: 1.5*mm
              text: friendica_activities.attendmaybeText
              MouseArea{
@@ -190,7 +183,6 @@ Item {
        }
        Label{
            id:attendLabel
-           //visible: false
            color: "grey"
            height:3.5*mm
            font.pixelSize: 1.5*mm
@@ -203,28 +195,21 @@ Item {
 
        CheckBox{
            id:likeCheckbox
-           //height:3*mm
+           width:10*mm
-           width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
            checked:(friendica_activities.self.liked==1)?true:false
            style: CheckBoxStyle {
-               background: Rectangle {
+                indicator: Rectangle{
-                implicitWidth: 6*mm
+                    implicitWidth: 10*mm
-                implicitHeight: 3*mm
+                    implicitHeight:3*mm
-                color:"white"
+                    Text{
-               }
+                        anchors.centerIn: parent
-               indicator: Rectangle{
+                        font.pixelSize: 2.5*mm
-                implicitWidth: 3*mm
+                        font.family:fontAwesome.name
-                implicitHeight:3*mm
+                        color:control.checked?"black": "grey"
-                color:control.checked?"yellow":"white"
+                        text:"\uf118"
-                x: 4*mm
+                    }
-                Text{
+                }
-                    anchors.centerIn: parent
-                    font.pixelSize: 2.5*mm
-                     font.family:fontAwesome.name
-                    color:control.checked?"black": "grey"
-                    text:"\uf118"
-                    }}
            }
            onClicked: {
             if(likeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"like",newsitemobject.status_id,root);dislikeCheckbox.checked=false; model.friendica_activities.self.liked=0 }
@@ -232,73 +217,43 @@ Item {
            }
        CheckBox{
            id: dislikeCheckbox
-           //height:3*mm
+           width:10*mm
-           width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
            checked: (friendica_activities.self.disliked==1)?true:false
            style: CheckBoxStyle {
-            background: Rectangle {
-                implicitWidth: 6*mm
-                implicitHeight:3*mm
-                color:"white"
-                }
             indicator: Rectangle{
-                implicitWidth: 3*mm
+                implicitWidth: 10*mm
                 implicitHeight:3*mm
-                color:control.checked?"yellow":"white"
-                x:4*mm
                 Text{
                     anchors.centerIn: parent
                     font.pixelSize: 2.5*mm
                     font.family:fontAwesome.name
                     color:control.checked?"black": "grey"
                     text:  "\uf119"
-                    }}
+                    }
                 }
+           }
            onClicked: {
             if (dislikeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"dislike",newsitemobject.status_id,root);likeCheckbox.checked=false; model.friendica_activities.self.disliked=0}
             else {Newsjs.like(root.login,root.db,0,"dislike",newsitemobject.status_id,root); model.friendica_activities.self.disliked=1}}
            }
 
-//       Rectangle{
-//           width: 8*mm
-//           height: 3*mm
-//           color:"transparent"
-//           Text{
-//               id:trashsymbol
-//               color: "grey"
-//               anchors.centerIn: parent
-//               font.pixelSize: 2*mm
-//               font.bold: true
-//               text: "\uf1f8"
-//           }
-//           MouseArea{
-//               anchors.fill:parent
-//               onClicked: {
-//                   Newsjs.deleteNews(root.login,root.db,newsitemobject.status_id,newsitemobject.messagetype,root,function(reply){
-//                   newsModel.remove(index)})
-//               }}
-//       }
        CheckBox {
            id:favoritedCheckbox
            visible:(newsitemobject.messagetype==0)
-           width: 8*mm
+           width: 10*mm
            style: CheckBoxStyle {
-           background: Rectangle {
+               indicator:Rectangle{
-               implicitWidth: 6*mm
+                   x:4*mm
-               implicitHeight:3*mm
+                   width: 3*mm
-               color:"transparent"
+                   implicitHeight:4*mm
+                    Text{
+                        color: control.checked?"black":"grey"
+                        font.pixelSize: 2.5*mm
+                        text:"\uf005"
+                        }
                }
-           indicator:Rectangle{
+           }
-               x:3*mm
-               width: 3*mm
-               implicitHeight:3*mm
-               Text{
-                    color: control.checked?"black":"grey"
-                    font.pixelSize: 2.5*mm
-                    text:"\uf005"
-                    }}
-                  }
            checked:(newsitemobject.favorited>0)
            onClicked:{
                if(favoritedCheckbox.checkedState==Qt.Checked){
@@ -308,8 +263,8 @@ Item {
            }
        }
        Rectangle{
-            width: 8*mm
+            width: 10*mm
-            height: 3*mm
+            height: 4*mm
             color:"transparent"
             Text{
                 id:newsmenusymbol
@@ -324,8 +279,8 @@ Item {
                 onClicked: {newsmenu.popup()}}
             }
        Rectangle{
-            width: 8*mm
+            width: 10*mm
-            height: 3*mm
+            height: 4*mm
             visible:newstab.newstabstatus!="Conversation"
             color:"transparent"
             Text{
@@ -340,7 +295,11 @@ Item {
                 anchors.fill:parent
                 onClicked:{
                     conversationsymbol.color="black";
-                    showConversation(index,newsitemobject)
+                    
+                    //Newsjs.conversationfromdb(db,login.username,newsitemobject.conversation_id,function(conversation){
+                    var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
+                   // var conversationItem = component.createObject(friendicaActivities,{"news":newsitemobject.chatArray});
+                 var conversationItem = component.createObject(friendicaActivities);   showConversation(index,newsitemobject)
                 }
             }
         }
@@ -367,12 +326,19 @@ Item {
             text: qsTr("Repost")
             onTriggered: {
                 Newsjs.retweetNews(root.login,db,newsitemobject.status_id,root,function(reply){
-                    print(reply)})
+                    Helperjs.showMessage("Repost",qsTr("Success!"),root)
+                })
             }
         }
         MenuItem {
             text: qsTr("Conversation")
-            onTriggered: showConversation(index,newsitemobject)
+            onTriggered: {
+                conversationsymbol.color="black";
+                //Newsjs.conversationfromdb(db,login.username,newsitemobject.conversation_id,function(conversation){
+                var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
+                var conversationItem = component.createObject(friendicaActivities,{"news":newsitemobject.chatArray});
+                showConversation(index,newsitemobject)
+            }
         }
 
         Menu{
@@ -398,8 +364,15 @@ Item {
             text: qsTr("Delete")
             onTriggered: {
                 Newsjs.deleteNews(root.login,root.db,newsitemobject.status_id,newsitemobject.messagetype,root,function(reply){
-                    newsModel.remove(index)})
+                   // newsModel.remove(index)
+                   var msg = {'deleteId': index, 'model': newsModel};
+                newsWorker.sendMessage(msg);
+                })
             }
         }
+        //MenuItem{
+        //    text:qsTr("Show on website")
+        //    onTriggered:Qt.openUrlExternally(login.server+"/display/"+newsitemobject
+        //}
     }
 }}

source-android/qml/newsqml/PermissionDialog.qml

@@ -173,7 +173,7 @@ Rectangle{
          Helperjs.readData(db,"contacts",login.username,function(contacts){
             for (var name in contacts){
                var contactstatus="neutral";
-               if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive";print(contacts[name].cid+" pos")}
+               if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
                else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
                contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
          }},"isFriend",1);

source-android/qml/photoqml/ImageUploadDialog.qml

@@ -0,0 +1,244 @@
+import QtQuick 2.7
+import QtQuick.Controls 1.4
+import "qrc:/js/service.js" as Service
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle{
+    id:imageDialog
+    //property var attachImageURLs: []
+    property var contacts: []
+    property var groups: []
+    property var contact_allow:login.permissions[0]
+    property var contact_deny:login.permissions[1]
+    property var group_allow:login.permissions[2]
+    property var group_deny:login.permissions[3]
+    property int imageNo: 0
+
+    function uploadSelectedImage(inumber){
+        xhr.url= login.server + "/api/friendica/photo/create.json";
+        xhr.setLogin(login.username+":"+Qt.atob(login.password));
+        xhr.clearParams();
+        xhr.setParam("desc",imageUploadModel.get(inumber).description);
+        xhr.setParam("album", album.currentText);
+        xhr.setParam("contact_allow","27");
+        if (group_allow.length>0) {xhr.setParam("group_allow", Helperjs.cleanArray(group_allow))};
+        if (group_deny.length>0) {xhr.setParam("group_deny",  Helperjs.cleanArray(group_deny))};
+        //if (contact_allow.length>0) {xhr.setParam("contact_allow", Helperjs.cleanArray(contact_allow))};
+        if (contact_deny.length>0) {xhr.setParam("contact_deny",  Helperjs.cleanArray(contact_deny))};
+        xhr.setImageFileParam("media", imageUploadModel.get(inumber).imageUrl );
+        xhr.post();
+     }
+
+    z:2
+    border.color: "grey"
+    width: parent.width-4*mm
+    height:parent.height-12*mm
+    x:2*mm
+    y:10*mm
+    property string directory: ""
+
+
+    ImagePicker {
+        id: imagePicker;
+        multiple : true
+        onReady: {//var urlstring=decodeURIComponent(imagePicker.imageUrl);
+            //var fileurl="file://"+urlstring.substring(5);
+           for (var n in imagePicker.imageUrls){
+               imageUploadModel.append({"imageUrl":imagePicker.imageUrls[n].toString(),"description":""})
+           }
+        }
+    }
+
+
+    Connections{
+        target:xhr
+        onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
+        onSuccess:{
+            imageNo=imageNo+1;
+            if(imageNo<imageUploadModel.count){
+                uploadSelectedImage(imageNo);
+            }else{
+                Service.requestList(root.login,root.db, fotostab,function(obj){
+                    fotorectangle.newimages=obj;
+                    imageDialog.destroy()
+                })
+
+            }
+        }
+    }
+
+    Row{
+        id:buttonRow
+        anchors.top: parent.top
+        anchors.topMargin: 1*mm
+        anchors.right: parent.right
+        anchors.rightMargin: 1*mm
+        spacing:mm
+
+//        BlueButton{
+//            id:permButton
+//            text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
+//            onClicked: {
+//                var component = Qt.createComponent("qrc:/qml/genericqml/PermissionDialog.qml");
+//                var permissions = component.createObject(imageDialog,{"x":mm,"y":40*mm});
+//            }
+//        }
+        
+        BlueButton{
+            id:closeButton
+            text:   "\uf057"
+            onClicked:{imageDialog.destroy()}
+        }
+    }
+
+    Text {
+      text: qsTr("Album")
+     x: 4*mm; y: 10*mm
+    }
+
+    Text {
+      text: qsTr("Image")
+     x: 4*mm; y: 17*mm
+    }
+
+    Text {
+      text: qsTr("Description")
+     x: 4*mm; y: 33*mm
+    }
+
+    ListView{
+        id: imageUploadView
+        x:23*mm
+        y:17*mm
+        width: imageDialog.width-25*mm
+        height: 25*mm
+        model: imageUploadModel
+        delegate: imageDelegate
+        footer: imageFooter
+        clip:true
+        orientation: ListView.Horizontal
+        spacing: mm
+    }
+
+    ListModel{
+        id: imageUploadModel
+    }
+
+    Component{
+        id: imageDelegate
+        Rectangle{
+            width:Math.max(20*mm,descriptionInput.contentWidth)
+            height:20*mm
+            Image{
+                id: uploadImage
+                width: 20*mm
+                height: 14*mm
+                fillMode: Image.PreserveAspectFit
+                source:imageUrl
+                MouseArea{
+                    anchors.fill: parent
+                    onClicked:{
+                        imageUploadModel.remove(index)
+//                        attachImageURLs.splice(attachImageURLs.indexOf(imageUrl,1))
+//                        attachImage(imageUrl)
+                    }
+                }
+            }
+
+            Rectangle{
+                color: "light grey"
+                border.color: "grey"
+                 x: mm; y: 15*mm; width:Math.max(20*mm, descriptionInput.contentWidth);
+                 height: 5*mm;
+                 TextInput {
+                     id: descriptionInput
+                     anchors.fill: parent
+                     selectByMouse: true
+                     text:description
+                     onTextChanged: imageUploadModel.set(index,{"description":descriptionInput.text});
+                }
+            }
+        }
+    }
+    Component{
+        id: imageFooter
+        Image{
+            id: footerImage
+            width: 15*mm
+            height: 15*mm
+            fillMode: Image.PreserveAspectFit
+            source:"qrc:/images/addImage.png"
+            MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                    //var defaultDirectory="file://"+osSettings.attachImageDir;
+                    //var component = Qt.createComponent("qrc:/qml/genericqml/ImageDialog.qml");
+                    //var imagedialog = component.createObject(imageDialog,{"directory": defaultDirectory, "multiSelection": true})
+                 //   filesystem.search
+                imagePicker.pickImage()
+                }
+            }
+        }
+    }
+    ComboBox{
+        id: album
+        x: 23*mm
+        y: 10*mm
+        width: root.width/2;
+        height: 5*mm;
+        editable:true
+        model: albumModel
+        onAccepted: {
+            if (find(currentText) === -1) {
+                albumModel.append({text: editText})
+                currentIndex = find(editText)
+            }
+        }
+    }
+
+    ListModel{id:albumModel}
+
+    BlueButton{
+        id:uploadButton
+        x:4*mm; y:40*mm
+        text:   qsTr("Upload")
+        onClicked:{
+            //imageBusy.running=true;
+            if(album.currentText==""){Helperjs.showMessage(qsTr("Error"),qsTr(" No album name given"), imageDialog)}
+            else{newimageProgress.visible=true;
+            if (imageUploadModel.count>0){
+                uploadSelectedImage(0)
+            }}
+        }
+    }
+    ProgressBar{
+        id: newimageProgress
+        width: 15*mm
+        height: buttonRow.height
+        anchors.top: parent.top
+        anchors.right:buttonRow.left
+        anchors.rightMargin:mm
+        visible: false
+        value: imageNo/imageUploadModel.count
+    }
+
+    Component.onCompleted:{
+        albumModel.append({"text":""});
+        try{Helperjs.readField("album",db,"imageData",login.username,function(storedAlbums){
+            //print(JSON.stringify(storedAlbums))
+          for (var n in storedAlbums){
+              albumModel.append({"text":storedAlbums[n]})}
+        })}
+        catch (e){print(e)}
+    }
+//    BusyIndicator{
+//        id: imageBusy
+//        anchors.horizontalCenter: imageUploadView.horizontalCenter
+//        anchors.top:imageUploadView.top
+//        anchors.topMargin: 2*mm
+//        width:10*mm
+//        height: 10*mm
+//        running:false
+//     }
+}

source-android/qml/photoqml/PhotoComponent.qml

@@ -48,10 +48,16 @@ Package {
         }
         MouseArea {
             width: realImage.paintedWidth; height: realImage.paintedHeight; anchors.centerIn: realImage
-            onClicked: {
+             onPressAndHold:{
+                 var menuString="import QtQuick.Controls 1.4; Menu {MenuItem{text:qsTr('Delete on client and server'); onTriggered: {deletepics('image','"+imageLocation+"');photoModel.remove(index)}}}";
+                 var imagemenuObject=Qt.createQmlObject(menuString,photoWrapper,"imagemenuOutput")
+                        imagemenuObject.popup()  
+             }
+             onClicked: {
                 if (albumWrapper.state == 'inGrid') {
                     gridItem.GridView.view.currentIndex = index;
-                    albumWrapper.state = 'fullscreen'
+                    albumWrapper.state = 'fullscreen';
+                    listItem.ListView.view.currentIndex=index
                 } else {
                     gridItem.GridView.view.currentIndex = index;
                     albumWrapper.state = 'inGrid'

source-android/qml/photoqml/PhotoPlaceholder.qml

@@ -1,21 +0,0 @@
-import QtQuick 2.0
-import "qrc:/js/helper.js" as Helperjs
-
-Image {
-id:photoPlaceholder
-property string imageName:"x.jpg"
-property string downloadtype:""
-fillMode: Image.PreserveAspectFit
-onStatusChanged: {
-    if (photoPlaceholder.status == Image.Ready) {
-        //print("Source: "+source+"Photo width"+width+" height"+height+" Ratio "+ fillMode);
-        var saveprocess=photoPlaceholder.grabToImage(function(result){
-            var saveresult=result.saveToFile(imageName.toString());
-            if (saveresult){
-                  if ((downloadtype=="picture")&&(newImages.length>0)){
-                    photoPlaceholder.destroy();
-                    currentImageNo=currentImageNo+1
-                }
-S        }});
-}}}
-

source-android/qml/photoqml/PhotoTab.qml

@@ -47,6 +47,12 @@ Rectangle {
         onError:{if(data=="picture"){print("Error"+data);
             currentimageno=currentimageno+1}}
     }
+//    Connections{
+//        target:filesystem
+//        onError:{print("Error deleting");
+//            }
+//        onSuccess:print("Success deleting");
+//    }
 
     function showFotos(friend){
         if(friend=="backButton"){
@@ -76,28 +82,46 @@ Rectangle {
             }}
     }
 
+    function deletepics(type,url ,imageId){
+            Service.deleteImage(db,login,type, url,root,function(){//showFotos("")
+                })
+    }
+
     ProgressBar{
         id: newImagesProgress
         width: 15*mm
         height: updatePhotolist.height
         anchors.top: parent.top
-        anchors.right:updatePhotolist.left
+        anchors.right:uploadPhoto.left
         anchors.rightMargin:mm
         visible: false
         value: currentimageno/newimages.length
     }
 
+    //ImageUploadDialog{}
+    BlueButton{
+        id:  uploadPhoto
+        anchors.top: parent.top
+        anchors.topMargin: 0.5*mm
+        anchors.right:updatePhotolist.left
+        anchors.rightMargin:mm
+        text:"\uf0ee"
+        onClicked: {
+            var component = Qt.createComponent("qrc:/qml/photoqml/ImageUploadDialog.qml");
+                     var imageUpload = component.createObject(fotorectangle);
+            }}
+
     BlueButton{
         id:  updatePhotolist
         anchors.top: parent.top
         anchors.topMargin: 0.5*mm
         anchors.right:phototabstatusButton.left
         anchors.rightMargin:mm
-        text:"\uf021"
+        text:"\uf0ed"
         onClicked: {
-            Service.requestList(root.login,root.db, fotostab,function(obj){
+            Service.requestList(root.login,root.db, fotostab,function(obj){newimages=obj})
-                newimages=obj;print("newimages"+JSON.stringify(obj))
+        }
-    })}}
+    }
 
     BlueButton{
         id:  phototabstatusButton

source-android/qml/photoqml/PhotogroupComponent.qml

@@ -83,7 +83,8 @@ Package {
                 Helperjs.readData(db,"imageData",root.login.username,function(obj){
                     if (obj) {
                         for (var k=0;k<obj.length;k++){
-                            photoModel.append({"imageLocation": obj[k].location+obj[k].filename,"photoDescription":obj[k].filename,"photoLink":obj[k].location+obj[k].filename})
+                            if(obj[k].desc!=""&&obj[k].desc!="null"){var name=obj[k].desc}else{var name=obj[k].filename}
+                            photoModel.append({"imageLocation": obj[k].location+obj[k].filename,"photoDescription":name,"photoLink":obj[k].location+obj[k].filename})
                         }
                     }
                 },"album",albumname)}
@@ -91,6 +92,11 @@ Package {
 
     MouseArea {
         anchors.fill: parent
+        onPressAndHold:{
+            var menuString="import QtQuick.Controls 1.4; Menu {MenuItem{text:qsTr('Delete on client and server'); onTriggered: {deletepics('album',albumname);photogroupModel.remove(index)}}}";
+            var albummenuObject=Qt.createQmlObject(menuString,albumWrapper,"albummenuOutput")
+            albummenuObject.popup()
+        }
         onClicked: albumWrapper.state = 'inGrid'
      }
 

source-android/translations/friendiqa-de.ts

@@ -17,80 +17,80 @@
 <context>
     <name>ConfigTab</name>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="32"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="33"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="62"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="63"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="288"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="283"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="309"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="304"/>
         <source>User</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="58"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="59"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="67"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="68"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="71"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="72"/>
         <source>Image dir.</source>
         <translation>Bildverz.</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="76"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="77"/>
         <source>Max. News</source>
         <translation>Max. Nachr.</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="80"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="81"/>
         <source>News as</source>
         <translation>Anzeige</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="84"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="85"/>
         <source>Interval (0=None)</source>
         <translation>Intervall (0=keins)</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="235"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="230"/>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="239"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="234"/>
         <source>No server given! </source>
         <translation>Kein Server angegeben!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="240"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="235"/>
         <source>No username given! </source>
         <translation>Kein Nutzername angegeben!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="241"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="236"/>
         <source>No password given! </source>
         <translation>Kein Passwort angegeben!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="242"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="237"/>
         <source>No image directory given!</source>
         <translation>Kein Verzeichnis für Bilder angegeben!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="243"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="238"/>
         <source>No maximum news number given!</source>
         <translation>Maximale News-Anzahl nicht angegeben!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="324"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="319"/>
         <source>Timeline</source>
         <translation>Chronologisch</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="328"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="323"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
@@ -139,35 +139,79 @@
 <context>
     <name>FriendsTab</name>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="61"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="65"/>
         <source>Friends</source>
         <translation>Freunde</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="131"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="135"/>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="167"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="188"/>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
 </context>
 <context>
-    <name>MessageSend</name>
+    <name>GroupComponent</name>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="69"/>
+        <source>Error</source>
-        <source>Title (optional)</source>
+        <translation type="vanished">Fehler</translation>
-        <translation>Überschrift (optional)</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="142"/>
+        <source>No name given</source>
+        <translation type="vanished">Kein Name angegeben</translation>
+    </message>
+</context>
+<context>
+    <name>ImageUploadDialog</name>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="96"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="101"/>
+        <source>Image</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="106"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="205"/>
+        <source>Upload</source>
+        <translation>Hochladen</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="208"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="142"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="208"/>
+        <source> No album name given</source>
+        <translation>Kein Albumname angegeben</translation>
+    </message>
+</context>
+<context>
+    <name>MessageSend</name>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="67"/>
+        <source>Title (optional)</source>
+        <translation>Überschrift (optional)</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="149"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="149"/>
         <source>Only one attachment supported at the moment.
  Remove other attachment first!</source>
         <translation>Nur ein Anhang derzeit unterstützt.
@@ -182,27 +226,27 @@
         <translation>Lade Profilbild für </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="152"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="163"/>
         <source>More</source>
         <translation>Mehr</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="249"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="260"/>
         <source>Timeline</source>
         <translation>Chronologisch</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="258"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="269"/>
         <source>Favorites</source>
         <translation>Markierte News</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="270"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="281"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="278"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="289"/>
         <source>Notifications</source>
         <translation>Meldungen</translation>
     </message>
@@ -210,77 +254,82 @@
 <context>
     <name>Newsitem</name>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="29"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="16"/>
         <source>attending: </source>
         <translation>Teilnahme</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="86"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="68"/>
         <source>Source: </source>
         <translation>Quelle: </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="87"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="69"/>
         <source>Direct Message</source>
         <translation>Direktnachricht</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="102"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="84"/>
         <source>In reply to </source>
         <translation>Antwort an </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="114"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="96"/>
         <source> comments</source>
         <translation> Kommentare</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="198"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="190"/>
         <source>Attending: </source>
         <translation>Teilnahme: </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="353"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="312"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="361"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="320"/>
         <source>DM</source>
         <translation>Direktnachricht</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="367"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="326"/>
         <source>Repost</source>
         <translation>Teilen</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="374"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="329"/>
+        <source>Success!</source>
+        <translation>Erledigt!</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/Newsitem.qml" line="334"/>
         <source>Conversation</source>
         <translation>Unterhaltung</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="379"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="345"/>
         <source>Attending</source>
         <translation>Teilnahme</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="381"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="347"/>
         <source>yes</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="386"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="352"/>
         <source>maybe</source>
         <translation>vielleicht</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="391"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="357"/>
         <source>no</source>
         <translation>nein</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="398"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="364"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -288,12 +337,12 @@
 <context>
     <name>PermissionDialog</name>
     <message>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="35"/>
+        <location filename="../qml/genericqml/PermissionDialog.qml" line="35"/>
         <source>Friends</source>
         <translation>Freunde</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="96"/>
+        <location filename="../qml/genericqml/PermissionDialog.qml" line="96"/>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
@@ -301,18 +350,18 @@
 <context>
     <name>PhotoTab</name>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="66"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="72"/>
         <source>&apos;s images</source>
         <translation>s Bilder</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="108"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="132"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="114"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="138"/>
         <source>Own Images</source>
         <translation>Eigene Bilder</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="148"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="172"/>
         <source>More</source>
         <translation>Mehr</translation>
     </message>
@@ -338,131 +387,131 @@
 <context>
     <name>newsworker</name>
     <message>
-        <location filename="../js/newsworker.js" line="18"/>
+        <location filename="../js/newsworker.js" line="26"/>
         <source>likes this.</source>
         <translation>mag das.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="19"/>
+        <location filename="../js/newsworker.js" line="27"/>
         <source>like this.</source>
         <translation>mögen das.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="22"/>
+        <location filename="../js/newsworker.js" line="30"/>
         <source>doesn&apos;t like this.</source>
         <translation>mag das nicht.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="23"/>
+        <location filename="../js/newsworker.js" line="31"/>
         <source>don&apos;t like this.</source>
         <translation>mögen das nicht.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="26"/>
+        <location filename="../js/newsworker.js" line="34"/>
         <source>will attend.</source>
         <translation>nehmen teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="27"/>
+        <location filename="../js/newsworker.js" line="35"/>
         <source>persons will attend.</source>
         <translation>Personen nehmen teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="30"/>
+        <location filename="../js/newsworker.js" line="38"/>
         <source>will not attend.</source>
         <translation>nimmt nicht teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="31"/>
+        <location filename="../js/newsworker.js" line="39"/>
         <source>persons will not attend.</source>
         <translation>Personen nehmen nicht teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="34"/>
+        <location filename="../js/newsworker.js" line="42"/>
         <source>may attend.</source>
         <translation>nimmt vielleicht teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="35"/>
+        <location filename="../js/newsworker.js" line="43"/>
         <source>persons may attend.</source>
         <translation>Personen nehmen vielleicht teil.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="38"/>
+        <location filename="../js/newsworker.js" line="46"/>
         <source>yes</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="39"/>
+        <location filename="../js/newsworker.js" line="47"/>
         <source>no</source>
         <translation>nein</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="40"/>
+        <location filename="../js/newsworker.js" line="48"/>
         <source>maybe</source>
         <translation>vielleicht</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="56"/>
+        <location filename="../js/newsworker.js" line="64"/>
         <source>seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="56"/>
-        <location filename="../js/newsworker.js" line="57"/>
-        <location filename="../js/newsworker.js" line="58"/>
-        <location filename="../js/newsworker.js" line="59"/>
-        <location filename="../js/newsworker.js" line="60"/>
-        <location filename="../js/newsworker.js" line="61"/>
-        <location filename="../js/newsworker.js" line="62"/>
-        <location filename="../js/newsworker.js" line="63"/>
         <location filename="../js/newsworker.js" line="64"/>
         <location filename="../js/newsworker.js" line="65"/>
+        <location filename="../js/newsworker.js" line="66"/>
+        <location filename="../js/newsworker.js" line="67"/>
+        <location filename="../js/newsworker.js" line="68"/>
+        <location filename="../js/newsworker.js" line="69"/>
+        <location filename="../js/newsworker.js" line="70"/>
+        <location filename="../js/newsworker.js" line="71"/>
+        <location filename="../js/newsworker.js" line="72"/>
+        <location filename="../js/newsworker.js" line="73"/>
         <source>ago</source>
         <translation>her</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="57"/>
+        <location filename="../js/newsworker.js" line="65"/>
         <source>minute</source>
         <translation>Minute</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="58"/>
+        <location filename="../js/newsworker.js" line="66"/>
         <source>minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="59"/>
+        <location filename="../js/newsworker.js" line="67"/>
         <source>hour</source>
         <translation>Stunde</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="60"/>
+        <location filename="../js/newsworker.js" line="68"/>
         <source>hours</source>
         <translation>Stunden</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="61"/>
+        <location filename="../js/newsworker.js" line="69"/>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="62"/>
+        <location filename="../js/newsworker.js" line="70"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="63"/>
+        <location filename="../js/newsworker.js" line="71"/>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="64"/>
+        <location filename="../js/newsworker.js" line="72"/>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="65"/>
+        <location filename="../js/newsworker.js" line="73"/>
         <source>years</source>
         <translation></translation>
     </message>

source-android/translations/friendiqa-es.ts

@@ -17,80 +17,80 @@
 <context>
     <name>ConfigTab</name>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="32"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="33"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="62"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="63"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="288"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="283"/>
-        <location filename="../qml/configqml/ConfigTab.qml" line="309"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="304"/>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="58"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="59"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="67"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="68"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="71"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="72"/>
         <source>Image dir.</source>
         <translation>Dir. de imágenes</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="76"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="77"/>
         <source>Max. News</source>
         <translation>Nº Max. de noticias.</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="80"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="81"/>
         <source>News as</source>
         <translation>Noticias como</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="84"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="85"/>
         <source>Interval (0=None)</source>
         <translation>Intervalo (0=ningún)</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="235"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="230"/>
         <source>Confirm</source>
         <translation>Confirmar</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="239"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="234"/>
         <source>No server given! </source>
         <translation>¡Servidor no encontrado!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="240"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="235"/>
         <source>No username given! </source>
         <translation>¡Usuario incorrecto!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="241"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="236"/>
         <source>No password given! </source>
         <translation>¡Contraseña incorrecta!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="242"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="237"/>
         <source>No image directory given!</source>
         <translation>¡No se ha encontrado el directorio de imágenes!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="243"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="238"/>
         <source>No maximum news number given!</source>
         <translation>¡Nº máximo de noticias incorrecto!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="324"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="319"/>
         <source>Timeline</source>
         <translation>Cronología</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/ConfigTab.qml" line="328"/>
+        <location filename="../qml/configqml/ConfigTab.qml" line="323"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
@@ -139,35 +139,68 @@
 <context>
     <name>FriendsTab</name>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="61"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="65"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="131"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="135"/>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="167"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="188"/>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
 </context>
 <context>
-    <name>MessageSend</name>
+    <name>ImageUploadDialog</name>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="69"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="96"/>
-        <source>Title (optional)</source>
+        <source>Album</source>
-        <translation>Título (opcional)</translation>
+        <translation>álbum</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="142"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="101"/>
+        <source>Image</source>
+        <translation>imagen</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="106"/>
+        <source>Description</source>
+        <translation>Descripción</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="205"/>
+        <source>Upload</source>
+        <translation>Subir</translation>
+    </message>
+    <message>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="208"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="142"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="208"/>
+        <source> No album name given</source>
+        <translation>¡Nombre del álbum no encontrado!</translation>
+    </message>
+</context>
+<context>
+    <name>MessageSend</name>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="67"/>
+        <source>Title (optional)</source>
+        <translation>Título (opcional)</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="149"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/MessageSend.qml" line="149"/>
         <source>Only one attachment supported at the moment.
  Remove other attachment first!</source>
         <translation>Solo se admite adjuntar un solo archivo en este momento.
@@ -182,27 +215,27 @@
         <translation>Descargar la imagen del perfil para </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="152"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="163"/>
         <source>More</source>
         <translation>Mas</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="249"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="260"/>
         <source>Timeline</source>
         <translation>Cronología</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="258"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="269"/>
         <source>Favorites</source>
         <translation>Favoritos</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="270"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="281"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/NewsTab.qml" line="278"/>
+        <location filename="../qml/newsqml/NewsTab.qml" line="289"/>
         <source>Notifications</source>
         <translation>Notificaciones</translation>
     </message>
@@ -210,77 +243,82 @@
 <context>
     <name>Newsitem</name>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="29"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="16"/>
         <source>attending: </source>
         <translation>Asistiendo: </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="86"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="68"/>
         <source>Source: </source>
         <translation>Fuente: </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="87"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="69"/>
         <source>Direct Message</source>
         <translation>Mensaje directo</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="102"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="84"/>
         <source>In reply to </source>
         <translation>En respuesta a </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="114"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="96"/>
         <source> comments</source>
         <translation> comentarios</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="198"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="190"/>
         <source>Attending: </source>
         <translation>Asistiendo: </translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="353"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="312"/>
         <source>Reply</source>
         <translation>Respuesta</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="361"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="320"/>
         <source>DM</source>
         <translation>Mensaje directo</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="367"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="326"/>
         <source>Repost</source>
         <translation>Volver a publicar</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="374"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="329"/>
+        <source>Success!</source>
+        <translation>éxito!</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/Newsitem.qml" line="334"/>
         <source>Conversation</source>
         <translation>Conversación</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="379"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="345"/>
         <source>Attending</source>
         <translation>Asistiendo</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="381"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="347"/>
         <source>yes</source>
         <translation>si</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="386"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="352"/>
         <source>maybe</source>
         <translation>quizás</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="391"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="357"/>
         <source>no</source>
         <translation>no</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="398"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="364"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
@@ -288,12 +326,12 @@
 <context>
     <name>PermissionDialog</name>
     <message>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="35"/>
+        <location filename="../qml/genericqml/PermissionDialog.qml" line="35"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="96"/>
+        <location filename="../qml/genericqml/PermissionDialog.qml" line="96"/>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
@@ -301,18 +339,18 @@
 <context>
     <name>PhotoTab</name>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="66"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="72"/>
         <source>&apos;s images</source>
         <translation>s Imágenes</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="108"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="132"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="114"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="138"/>
         <source>Own Images</source>
         <translation>Mis imágenes</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="148"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="172"/>
         <source>More</source>
         <translation>Mas</translation>
     </message>
@@ -338,131 +376,131 @@
 <context>
     <name>newsworker</name>
     <message>
-        <location filename="../js/newsworker.js" line="18"/>
+        <location filename="../js/newsworker.js" line="26"/>
         <source>likes this.</source>
         <translation>le gusta esto.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="19"/>
+        <location filename="../js/newsworker.js" line="27"/>
         <source>like this.</source>
         <translation>me gusta esto.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="22"/>
+        <location filename="../js/newsworker.js" line="30"/>
         <source>doesn&apos;t like this.</source>
         <translation>no de ése.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="23"/>
+        <location filename="../js/newsworker.js" line="31"/>
         <source>don&apos;t like this.</source>
         <translation>no me gusta.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="26"/>
+        <location filename="../js/newsworker.js" line="34"/>
         <source>will attend.</source>
         <translation>asistirá.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="27"/>
+        <location filename="../js/newsworker.js" line="35"/>
         <source>persons will attend.</source>
         <translation>Personas que asistirán.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="30"/>
+        <location filename="../js/newsworker.js" line="38"/>
         <source>will not attend.</source>
         <translation>no asistirá.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="31"/>
+        <location filename="../js/newsworker.js" line="39"/>
         <source>persons will not attend.</source>
         <translation>Personas que no asistirán..</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="34"/>
+        <location filename="../js/newsworker.js" line="42"/>
         <source>may attend.</source>
         <translation>Puede asistir.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="35"/>
+        <location filename="../js/newsworker.js" line="43"/>
         <source>persons may attend.</source>
         <translation>Personas que pueden asistir.</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="38"/>
+        <location filename="../js/newsworker.js" line="46"/>
         <source>yes</source>
         <translation>si</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="39"/>
+        <location filename="../js/newsworker.js" line="47"/>
         <source>no</source>
         <translation>no</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="40"/>
+        <location filename="../js/newsworker.js" line="48"/>
         <source>maybe</source>
         <translation>quizás</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="56"/>
+        <location filename="../js/newsworker.js" line="64"/>
         <source>seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="56"/>
-        <location filename="../js/newsworker.js" line="57"/>
-        <location filename="../js/newsworker.js" line="58"/>
-        <location filename="../js/newsworker.js" line="59"/>
-        <location filename="../js/newsworker.js" line="60"/>
-        <location filename="../js/newsworker.js" line="61"/>
-        <location filename="../js/newsworker.js" line="62"/>
-        <location filename="../js/newsworker.js" line="63"/>
         <location filename="../js/newsworker.js" line="64"/>
         <location filename="../js/newsworker.js" line="65"/>
+        <location filename="../js/newsworker.js" line="66"/>
+        <location filename="../js/newsworker.js" line="67"/>
+        <location filename="../js/newsworker.js" line="68"/>
+        <location filename="../js/newsworker.js" line="69"/>
+        <location filename="../js/newsworker.js" line="70"/>
+        <location filename="../js/newsworker.js" line="71"/>
+        <location filename="../js/newsworker.js" line="72"/>
+        <location filename="../js/newsworker.js" line="73"/>
         <source>ago</source>
         <translation>hace</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="57"/>
+        <location filename="../js/newsworker.js" line="65"/>
         <source>minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="58"/>
+        <location filename="../js/newsworker.js" line="66"/>
         <source>minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="59"/>
+        <location filename="../js/newsworker.js" line="67"/>
         <source>hour</source>
         <translation>Hora</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="60"/>
+        <location filename="../js/newsworker.js" line="68"/>
         <source>hours</source>
         <translation>Horas</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="61"/>
+        <location filename="../js/newsworker.js" line="69"/>
         <source>day</source>
         <translation>Dia</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="62"/>
+        <location filename="../js/newsworker.js" line="70"/>
         <source>days</source>
         <translation>Dias</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="63"/>
+        <location filename="../js/newsworker.js" line="71"/>
         <source>month</source>
         <translation>Mes</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="64"/>
+        <location filename="../js/newsworker.js" line="72"/>
         <source>months</source>
         <translation>Meses</translation>
     </message>
     <message>
-        <location filename="../js/newsworker.js" line="65"/>
+        <location filename="../js/newsworker.js" line="73"/>
         <source>years</source>
         <translation>Años</translation>
     </message>

source-linux/application.qrc

@@ -4,14 +4,13 @@
         <file>qml/newsqml/NewsTab.qml</file>
         <file>qml/newsqml/Newsitem.qml</file>
         <file>qml/newsqml/MessageSend.qml</file>
-        <file>qml/newsqml/PermissionDialog.qml</file>
         <file>qml/newsqml/Conversation.qml</file>
-        <file>qml/newsqml/ImageDialog.qml</file>
         <file>qml/newsqml/FriendicaActivities.qml</file>
         <file>qml/contactqml/FriendsTab.qml</file>
         <file>qml/contactqml/GroupComponent.qml</file>
         <file>qml/contactqml/ContactComponent.qml</file>
         <file>qml/contactqml/ContactDetailsComponent.qml</file>
+        <file>qml/contactqml/Contactlist.qml</file>
         <file>qml/genericqml/BlueButton.qml</file>
         <file>qml/photoqml/PhotoComponent.qml</file>
         <file>qml/photoqml/PhotogroupComponent.qml</file>
@@ -208,5 +207,10 @@
         <file>qml/calendarqml/EventList.qml</file>
         <file>translations/friendiqa-de.qm</file>
         <file>translations/friendiqa-de.ts</file>
+        <file>qml/photoqml/ImageUploadDialog.qml</file>
+        <file>qml/genericqml/AttachmentDialog.qml</file>
+        <file>qml/genericqml/ImageDialog.qml</file>
+        <file>qml/genericqml/PermissionDialog.qml</file>
+        <file>images/addImage.png</file>
     </qresource>
 </RCC>

source-linux/common/filesystem.cpp

@@ -54,6 +54,7 @@ void FILESYSTEM::makeDir(QString name)
 void FILESYSTEM::rmDir()
 {
     QDir dir(m_Directory);
+    //qDebug()<<m_Directory;
    if (dir.removeRecursively()){
     emit success(m_Directory);
     }
@@ -63,6 +64,8 @@ void FILESYSTEM::rmDir()
 void FILESYSTEM::rmFile(QString name)
 {
     QDir dir(m_Directory);
+    //qDebug()<<m_Directory;
+    //qDebug(name);
     if(dir.remove(name)){
     emit success(name);
     }

source-linux/common/imagepickerandroid.cpp

@@ -0,0 +1,50 @@
+#include "imagepickerandroid.h"
+
+imagePickerAndroid::imagePickerAndroid()
+{
+
+}
+
+void imagePickerAndroid::buscaImagem()
+{
+    QAndroidJniObject ACTION_PICK = QAndroidJniObject::getStaticObjectField("android/content/Intent", "ACTION_PICK", "Ljava/lang/String;");
+    QAndroidJniObject EXTERNAL_CONTENT_URI = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$Images$Media", "EXTERNAL_CONTENT_URI", "Landroid/net/Uri;");
+
+    QAndroidJniObject intent=QAndroidJniObject("android/content/Intent", "(Ljava/lang/String;Landroid/net/Uri;)V", ACTION_PICK.object<jstring>(), EXTERNAL_CONTENT_URI.object<jobject>());
+
+    if (ACTION_PICK.isValid() && intent.isValid())
+    {
+        intent.callObjectMethod("setType", "(Ljava/lang/String;)Landroid/content/Intent;", QAndroidJniObject::fromString("image/*").object<jstring>());
+        QtAndroid::startActivity(intent.object<jobject>(), 101, this);
+        qDebug() << "OK";
+    }
+    else
+    {
+        qDebug() << "ERRO";
+    }
+}
+
+void imagePickerAndroid::handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data)
+{
+    jint RESULT_OK = QAndroidJniObject::getStaticField<jint>("android/app/Activity", "RESULT_OK");
+    if (receiverRequestCode == 101 && resultCode == RESULT_OK)
+    {
+        QAndroidJniObject uri = data.callObjectMethod("getData", "()Landroid/net/Uri;");
+        QAndroidJniObject dadosAndroid = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$MediaColumns", "DATA", "Ljava/lang/String;");
+        QAndroidJniEnvironment env;
+        jobjectArray projecao = (jobjectArray)env->NewObjectArray(1, env->FindClass("java/lang/String"), NULL);
+        jobject projacaoDadosAndroid = env->NewStringUTF(dadosAndroid.toString().toStdString().c_str());
+        env->SetObjectArrayElement(projecao, 0, projacaoDadosAndroid);
+        QAndroidJniObject contentResolver = QtAndroid::androidActivity().callObjectMethod("getContentResolver", "()Landroid/content/ContentResolver;");
+        QAndroidJniObject cursor = contentResolver.callObjectMethod("query", "(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;", uri.object<jobject>(), projecao, NULL, NULL, NULL);
+        jint columnIndex = cursor.callMethod<jint>("getColumnIndex", "(Ljava/lang/String;)I", dadosAndroid.object<jstring>());
+        cursor.callMethod<jboolean>("moveToFirst", "()Z");
+        QAndroidJniObject resultado = cursor.callObjectMethod("getString", "(I)Ljava/lang/String;", columnIndex);
+        QString imagemCaminho = "file://" + resultado.toString();
+        emit imagemCaminhoSignal(imagemCaminho);
+    }
+    else
+    {
+        qDebug() << "Caminho errado";
+    }
+}

source-linux/common/imagepickerandroid.h

@@ -0,0 +1,23 @@
+#ifndef IMAGEPICKANDROID_H
+#define IMAGEPICKANDROID_H
+#include <QObject>
+#include <QtAndroidExtras>
+
+#include <QDebug>
+
+class imagePickerAndroid : public QObject, public QAndroidActivityResultReceiver
+{
+    Q_OBJECT
+
+public:
+    imagePickerAndroid();
+
+    void buscaImagem();
+
+    virtual void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject & data);
+
+signals:
+    void imagemCaminhoSignal(QString);
+};
+
+#endif // IMAGEPICKANDROID_H

source-linux/common/xhr.cpp

@@ -117,8 +117,8 @@ void XHR::get()
     QByteArray loginData = m_login.toLocal8Bit().toBase64();
     QString headerData = "Basic " + loginData;
     request.setRawHeader("Authorization", headerData.toLocal8Bit());
-    QNetworkCookieJar* cJar = new QNetworkCookieJar;
+//    QNetworkCookieJar* cJar = new QNetworkCookieJar;
-    manager.setCookieJar(cJar);
+//    manager.setCookieJar(cJar);
 
     request.setUrl(requrl);
     reply = manager.get(request);
@@ -188,7 +188,7 @@ void XHR::onReplySuccess()
     qDebug() << "!";
     emit this->success( bufferToString() );
     buffer.clear();
-    reply->deleteLater();
+//    reply->deleteLater();
 }
 
 void XHR::onRequestFinished()
@@ -210,14 +210,14 @@ void XHR::onReadyRead()
 {
     qDebug() << ".";
     buffer += reply->readAll();
-    QList<QNetworkCookie> list =  manager.cookieJar()->cookiesForUrl(m_url);
+//    QList<QNetworkCookie> list =  manager.cookieJar()->cookiesForUrl(m_url);
-        QFile f("/home/pankraz/cookie.txt");
+//        QFile f("/home/pankraz/cookie.txt");
-        f.open(QIODevice::ReadWrite);
+//        f.open(QIODevice::ReadWrite);
-        for(int i = 0; i < list.size(); ++i){
+//        for(int i = 0; i < list.size(); ++i){
-            QDataStream s(&f);
+//            QDataStream s(&f);
-            s << list.at(i).toRawForm();
+//            s << list.at(i).toRawForm();
-        }
+//        }
-        f.close();
+//        f.close();
 
 }
 

source-linux/friendiqa.pro

@@ -17,7 +17,8 @@ QT += qml quick gui widgets
 SOURCES += common/friendiqa.cpp \
 	common/uploadableimage.cpp \
 	common/xhr.cpp \
-        common/filesystem.cpp
+        common/filesystem.cpp \
+        common/imagepickerandroid.cpp
 
 RESOURCES     = application.qrc
 
@@ -40,9 +41,17 @@ TRANSLATIONS += translations/friendiqa-de.ts
 HEADERS += \
     common/uploadableimage.h \
     common/xhr.h \
-    common/filesystem.h
+    common/filesystem.h \
+    common/imagepickerandroid.h
 
 DISTFILES += \
-    qml/calendarqml/CalendarTab.qml
+    qml/calendarqml/*.qml
+    translations/*.ts
+    qml/*.qml
+    qml/newsqml/*.qml
+    qml/contactqml/*.qml
+    qml/photoqml/*.qml
+    qml/configqml/*.qml
+    js/*.js
 
 

source-linux/friendiqa.pro.user

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.3.1, 2017-09-27T21:58:52. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{4e26e1df-26fd-4b76-8028-2f213523c328}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Linux</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Linux</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{52f4b2cf-b3aa-447e-af87-fc8e27ab3925}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">friendiqa2</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-linux/friendiqa.pro</value>
+    <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Debug</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>

source-linux/friendiqa.pro.user.4e26e1d

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.1.0, 2016-10-13T19:22:51. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{4e26e1df-26fd-4b76-8028-2f213523c328}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Linux</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Linux</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{52f4b2cf-b3aa-447e-af87-fc8e27ab3925}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/source-linux/friendiqa.pro</value>
+    <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/pankraz/ownCloud/clientsync/Friendiqa/v0.002/Develop/build-friendiqa-Linux-Debug</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>

source-linux/friendiqa.pro.user.edcf3fd

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.1.0, 2016-10-14T15:39:38. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{edcf3fd2-f5d6-4f74-8175-958e4f7b717e}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{697d53b5-2856-4c15-8e25-1da8c6633594}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build-friendiqa-Desktop-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build-friendiqa-Desktop-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/pankraz/build-friendiqa-Desktop-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">friendiqa</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/pankraz/sdcard/Files/owncloud/clientsync/Friendiqa/v0.002/Develop/source-linux/friendiqa.pro</value>
+    <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">friendiqa.pro</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/pankraz/build-friendiqa-Desktop-Debug</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>

source-linux/js/helper.js

@@ -22,7 +22,7 @@ function friendicaRequest(login,api,rootwindow,callback) {
         xhrequest.send();
     }
 
-function friendicaPostRequest(login,api,rootwindow,callback) {
+function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
         var xhrequest= new XMLHttpRequest();
         xhrequest.onreadystatechange = function() {
             //print(api+JSON.stringify(login)+Qt.atob(login.password));
@@ -40,9 +40,10 @@ function friendicaPostRequest(login,api,rootwindow,callback) {
 }
             }
         }
-        xhrequest.open("POST", login.server+api,true,login.username,Qt.atob(login.password));
+        xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));
-        xhrequest.send();
+        xhrequest.send(data);
     }
+
 function getCount(database,login,table,field,countvalue){
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     var count=0;

source-linux/js/news.js

@@ -17,7 +17,7 @@ function requestFriends(login,database,rootwindow,callback){
 function requestGroups(login,database,rootwindow,callback){
    // retrieve, save and return groups. Other features currently not implemented
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    Helperjs.friendicaRequest(login,"/api/friendica/group_show",rootwindow, function (obj){
+    Helperjs.friendicaRequest(login,"/api/friendica/group_show",rootwindow, function (obj){print(obj);
        var groups=JSON.parse(obj);
         db.transaction( function(tx) {
              var result = tx.executeSql('DELETE from groups where username="'+login.username+'"'); // clean old groups
@@ -29,6 +29,30 @@ function requestGroups(login,database,rootwindow,callback){
         });
 })}
 
+function listFriends(login,database,callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+        db.transaction( function(tx) {
+             var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=1'); // check for friends
+             var contactlist=[];
+             for (var i=0;i<result.rows.length;i++){
+                 contactlist.push(result.rows.item(i))
+             }
+             callback(contactlist)
+        });
+}
+
+function deleteGroup(login,database,rootwindow,group, callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    Helperjs.friendicaPostRequest(login,"/api/friendica/group_delete?gid="+group.gid+"&name="+group.groupname,"","POST",rootwindow, function (obj){
+        var deletereturn=JSON.parse(obj);
+        if(deletereturn.success){
+        db.transaction( function(tx) {
+             var result = tx.executeSql('DELETE from groups where username="'+login.username+'" AND groupname="'+group.name+'"'); // delete group
+        callback()
+        });
+}})}
+
+
 function getFriendsTimeline(login,database,contacts,onlynew,rootwindow,callback){
     // retrieve and return timeline since last news, return contacts which are not friends and older than 2 days for update (friends can be updated in Contactstab)
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@@ -233,7 +257,7 @@ function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
     if (messagetype==0){ api="/api/statuses/destroy?id="}
     else if (messagetype==1){ api="/api/direct_messages/destroy?id="}
     else if (messagetype==2){ api="/api/friendica/notifications/seen?id="}
-    Helperjs.friendicaPostRequest(login,api+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,api+newsid,"","POST", rootwindow,function (obj){
         var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
          db.transaction( function(tx) {var result = tx.executeSql('DELETE from news where username="'+login.username+'" AND messagetype='+messagetype+' AND status_id ='+newsid); // delete news id
              callback(obj)
@@ -241,7 +265,7 @@ function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
 })}
 
 function retweetNews(login,database,newsid,rootwindow,callback){
-   Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid, rootwindow,function (obj){
+   Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid,"","POST", rootwindow,function (obj){
         var answer=JSON.parse(obj);
        if(answer.status.error){Helperjs.showMessage("Repost",answer.status.code,rootwindow);}
         else{Helperjs.showMessage("Repost",obj,rootwindow)}
@@ -249,16 +273,16 @@ function retweetNews(login,database,newsid,rootwindow,callback){
 
 function favorite(login,favorite,newsid,rootwindow){
 // toggle favorites 
- if(favorite){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid, rootwindow,function (obj){
+ if(favorite){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid,"","POST", rootwindow,function (obj){
         print("Favorite "+obj);
    })}
-    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid, rootwindow,function (obj){
+    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid, "POST",rootwindow,function (obj){
         print("Favorite destroyed "+obj);
    })}
 }
 
 function  likerequest(login,database,verb,newsid,rootwindow){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/"+verb+"?id="+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/"+verb+"?id="+newsid, "","POST",rootwindow,function (obj){
          if (obj=='"ok"'){
             var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
             db.transaction( function(tx) {
@@ -289,7 +313,7 @@ function like(login,database,toggle,verb,newsid,rootwindow){
 }
 
 function attend(login,database,attend,newsid,rootwindow,callback){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, "","POST",rootwindow,function (obj){
             //print("attend: "+attend+obj);
     if (obj=='"ok"')
         var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@@ -364,7 +388,7 @@ function chatsfromdb(database,user,callback,stop_time){
         try{var rs = tx.executeSql('select created_at from news WHERE username="'+username+'" ORDER BY created_at DESC LIMIT 1');
         stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
     else{var stop="<"+stop_time}
-     var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+user+'" AND created_at'+stop+' ORDER BY created_at DESC LIMIT 20');
+     var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+user+'" AND created_at'+stop+' ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
     var conversations=[];
     for(var i = 0; i < conversationsrs.rows.length; i++) {
         conversations.push(conversationsrs.rows.item(i).statusnet_conversation_id);
@@ -372,15 +396,20 @@ function chatsfromdb(database,user,callback,stop_time){
     var newsArray=[];
     for(var j = 0; j< conversations.length; j++) {
         var newsrs=tx.executeSql('select * from news WHERE username="'+user+'"  AND statusnet_conversation_id="'+conversations[j] +'" ORDER BY created_at ASC');
-       // if(newsrs.rows.length>1){
+        var helpernews=newsrs.rows.item(0);
-           var helpernews=newsrs.rows.item(0);
+        helpernews.newscount=newsrs.rows.length;
-            helpernews.newscount=newsrs.rows.length;
+        helpernews=fetchUsersForNews(database,user,helpernews);
-            helpernews=fetchUsersForNews(database,user,helpernews)
+        //var chatArray=[];
-            newsArray.push(helpernews);
+       // for (var k=0;k<newsrs.rows.length;k++){
-            //}
+       //     var helperchat=newsrs.rows.item(k);
-}
+       //     helperchat=fetchUsersForNews(database,user,helperchat);
-     callback(newsArray);
+       //     chatArray.push(helperchat)
- })}
+       //}
+       //helpernews.chatArray=chatArray;
+        newsArray.push(helpernews);
+    }
+    callback(newsArray);
+})}
 
 function inArray(list, prop, val) {
     if (list.length > 0 ) {

source-linux/js/newsworker.js

@@ -1,6 +1,11 @@
 WorkerScript.onMessage = function(msg) {
- if(msg.appendnews!==true){   msg.model.clear()};
+if(msg.deleteId)
-
+    {msg.model.remove(msg.deleteId);
+     msg.model.sync()
+}
+else{
+ if(msg.appendnews!==true){msg.model.clear()};
+        msg.model.sync()
  for (var j=0;j<msg.news.length;j++){
     if (msg.news[j]) {
         var newsitemobject=msg.news[j];
@@ -11,7 +16,7 @@ WorkerScript.onMessage = function(msg) {
             newsitemobject.user.profile_image_url="";
             newsitemobject.user.name="";
         }
-        //var forumname="";if (newsitemobject.messagetype==0&&(parseInt(newsitemobject.friendica_owner)!=parseInt(newsitemobject.user.id))){forumname=" via "+newsitemobject.friendica_owner_object.name}
+        var forumname="";if (newsitemobject.messagetype==0&&((newsitemobject.friendica_owner)!=(newsitemobject.user.url))){forumname=" via "+Qt.atob(newsitemobject.friendica_owner_object.name)}
         var likeText="";var dislikeText="";var attendyesText="";var attendnoText="";var attendmaybeText="";  var self={};
         if (newsitemobject.messagetype==0){
            if (newsitemobject.like.length>0){
@@ -41,7 +46,7 @@ WorkerScript.onMessage = function(msg) {
            if (newsitemobject.friendica_activities_self.indexOf(1)!=-1){self.liked=1}
            if (newsitemobject.friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
           }
-           var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
+        var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
 
         var attachmentList=[];if(newsitemobject.attachments){
             var attachArray=JSON.parse(Qt.atob(newsitemobject.attachments));
@@ -52,21 +57,26 @@ WorkerScript.onMessage = function(msg) {
         }
         newsitemobject.attachmentList=attachmentList;
         var seconds=(msg.currentTime-newsitemobject.created_at)/1000;
-           var timestring="";
+        var timestring="";
-           if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
+        if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
-                else if (seconds<90){timestring=Math.round(seconds/60)+" "+qsTr("minute") +" "+qsTr("ago");}
+        else if (seconds<90){timestring=Math.round(seconds/60)+" "+qsTr("minute") +" "+qsTr("ago");}
-                else if (seconds<3600){timestring=Math.round(seconds/60)+" "+qsTr("minutes") +" "+qsTr("ago");}
+        else if (seconds<3600){timestring=Math.round(seconds/60)+" "+qsTr("minutes") +" "+qsTr("ago");}
-                else if (seconds<5400){timestring=Math.round(seconds/3600)+" "+qsTr("hour") +" "+qsTr("ago");}
+        else if (seconds<5400){timestring=Math.round(seconds/3600)+" "+qsTr("hour") +" "+qsTr("ago");}
-                else if (seconds<86400){timestring=Math.round(seconds/3600)+" "+qsTr("hours") +" "+qsTr("ago");}
+        else if (seconds<86400){timestring=Math.round(seconds/3600)+" "+qsTr("hours") +" "+qsTr("ago");}
-                else if (seconds<129600){timestring=Math.round(seconds/86400)+" "+qsTr("day") +" "+qsTr("ago");}
+        else if (seconds<129600){timestring=Math.round(seconds/86400)+" "+qsTr("day") +" "+qsTr("ago");}
-                else if (seconds<3888000){timestring=Math.round(seconds/86400)+" "+qsTr("days") +" "+qsTr("ago");}
+        else if (seconds<3888000){timestring=Math.round(seconds/86400)+" "+qsTr("days") +" "+qsTr("ago");}
-                else if (seconds<5832000){timestring=Math.round(seconds/3888000)+" "+qsTr("month") +" "+qsTr("ago");}
+        else if (seconds<5832000){timestring=Math.round(seconds/3888000)+" "+qsTr("month") +" "+qsTr("ago");}
-                else if (seconds<69984000){timestring=Math.round(seconds/3888000)+" "+qsTr("months") +" "+qsTr("ago");}
+        else if (seconds<69984000){timestring=Math.round(seconds/3888000)+" "+qsTr("months") +" "+qsTr("ago");}
-                else {timestring=Math.round(seconds/46656000)+" "+qsTr("years") +" "+qsTr("ago");}
+        else {timestring=Math.round(seconds/46656000)+" "+qsTr("years") +" "+qsTr("ago");}
-            var data=({"newsitemobject": newsitemobject,"dateDiff":timestring,"friendica_activities":friendica_activities})}
+
-          //print("News:"+j+msg.news.length+JSON.stringify(data));
+        var data=({"newsitemobject": newsitemobject,"dateDiff":timestring,"friendica_activities":friendica_activities,"forumname":forumname})}
-            msg.model.append(data);}
+        //print("News:"+j+msg.news.length+JSON.stringify(data));
-             if (j==msg.news.length){
+        msg.model.append(data)
-                 msg.model.sync()
+    }
-            };
+    
+    if (j==msg.news.length){
+        //print("j: "+j+" msg.model.count: "+msg.model.count);
+        msg.model.sync()
+}
+}
 }

source-linux/js/service.js

@@ -24,46 +24,86 @@ function requestList(login,database,rootwindow,callback) {
 function dataRequest(login,photoID,database,rootwindow) {
     // check if image exist and call download function
     Helperjs.friendicaRequest(login,"/api/friendica/photo?photo_id="+photoID, rootwindow, function (image){
-            try{ if(image==""){currentimageno=currentimageno+1}else{
+        try{ if(image==""){currentimageno=currentimageno+1}else{
-                var obj = JSON.parse(image);
+            var obj = JSON.parse(image);
-                var helpfilename=obj.filename.substring(0,obj.filename.lastIndexOf("."));
+            var helpfilename=obj.filename.substring(0,obj.filename.lastIndexOf("."));
-                var filesuffix="";
+            var filesuffix="";
-                if (obj.type=="image/jpeg"){filesuffix=".jpg"}
+            if (obj.type=="image/jpeg"){filesuffix=".jpg"}
-                else if (obj.type=="image/png"){filesuffix=".png"}
+            else if (obj.type=="image/png"){filesuffix=".png"}
-                else {filesuffix=""}
+            else {filesuffix=""}
-
+            if (helpfilename==""){// check if file has any filename
-                if (helpfilename==""){// check if file has any filename
+                obj.filename=obj["id"]+filesuffix;
-                    obj.filename=obj["id"]+filesuffix;
+            }
-                }
+            else{obj.filename=helpfilename+filesuffix}
-                else{obj.filename=helpfilename+filesuffix}
+            var link="";
-                
+            if(obj["link"][0]){link=obj["link"][0]} else{link=obj["link"]["4"]}
-                 var link="";
+            xhr.setUrl(Qt.resolvedUrl(link));
-                 if(obj["link"][0]){link=obj["link"][0]} else{link=obj["link"]["4"]}
+            xhr.setFilename(login.imagestore+'albums/'+obj.album+"/"+obj["filename"]);
-                 xhr.setUrl(Qt.resolvedUrl(link));
+            xhr.setDownloadtype("picture");
-                 xhr.setFilename(login.imagestore+'albums/'+obj.album+"/"+obj["filename"]);
+            xhr.download();
-                 xhr.setDownloadtype("picture");
+            var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-                 xhr.download();
+            db.transaction( function(tx) {
-                 var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+               var result = tx.executeSql('SELECT * from imageData where id = "'+obj["id"]+'"');
-                 db.transaction( function(tx) {
+               if(result.rows.length === 1) {// use update
-                    var result = tx.executeSql('SELECT * from imageData where id = "'+obj["id"]+'"');
+               result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+obj.id+'", created="'+obj.created+'", edited="'+obj.edited+'", profile="'+obj.profile+'", link="'+obj["link"]["4"]+'", filename="'+obj.filename+'",title="'+obj.title+'", desc="'+obj.desc+'",   type="'+obj.type+'", width="'+obj.width+'", height="'+obj.height+'", album="'+obj.album+'", location="file://'+login.imagestore+'albums/'+obj.album+'/" where id="'+obj["id"]+'"');
-                    if(result.rows.length === 1) {// use update
+               } else {// use insert print('... does not exists, create it')
-                    result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+obj.id+'", created="'+obj.created+'", edited="'+obj.edited+'", profile="'+obj.profile+'", link="'+obj["link"]["4"]+'", filename="'+obj.filename+'",title="'+obj.title+'", desc="'+obj.desc+'",   type="'+obj.type+'", width="'+obj.width+'", height="'+obj.height+'", album="'+obj.album+'", location="file://'+login.imagestore+'albums/'+obj.album+'/" where id="'+obj["id"]+'"');
+               result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,obj.id,obj.created,obj.edited, obj.title, obj.desc, obj.album, obj.filename, obj.type, obj.height, obj.width,obj. profile,obj["link"]["4"],'file://'+login.imagestore+'albums/'+obj.album+"/"]);
-                    } else {// use insert print('... does not exists, create it')
+               }
-                    result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,obj.id,obj.created,obj.edited, obj.title, obj.desc, obj.album, obj.filename, obj.type, obj.height, obj.width,obj. profile,obj["link"]["4"],'file://'+login.imagestore+'albums/'+obj.album+"/"]);
+           })}}
-                    }
-                })}}
            catch (e){print("Data retrieval failure! "+ e+obj);}
 })}
 
 
-function deleteImageData(database,user,field,selection,callback) { // does nothing useful at the moment
+function deleteImage(database,login,type,location,rootwindow,callback) { // delete image locally and on server
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    //print(' delete Image Data() for ' + location)
+    var rsfilename=location.substring(location.lastIndexOf("/")+1,location.length);
+    var rslocation=location.substring(0,location.lastIndexOf("/")+1);
+    print(type+" Name "+ rsfilename+" Location: "+rslocation)
+    db.transaction( function(tx) {
+        if (type=='image'){
+            var rs= tx.executeSql('SELECT * FROM imageData WHERE filename="'+rsfilename+'" AND location="'+rslocation+'"')
+            print(rs.rows.item(0).id)  //);
+            var imageId=rs.rows.item(0).id;
+            Helperjs.friendicaPostRequest(login,"/api/friendica/photo/delete?photo_id="+imageId,"","DELETE",rootwindow, function (obj){
+                var deletereturn = JSON.parse(obj); print(obj);
+                if (deletereturn.result=="deleted"){
+                        db.transaction( function(tx) {
+                            var deleters=tx.executeSql('DELETE  FROM imageData WHERE location="'+rslocation+'" AND filename="'+rsfilename+'"'); });
+                            filesystem.Directory=rslocation.substring(7,rslocation.length-1);
+                            filesystem.rmFile(rsfilename)
+           }})
+        }
+        else{
+            Helperjs.friendicaPostRequest(login,"/api/friendica/photoalbum/delete?album="+rsfilename,"","DELETE",rootwindow, function (obj){
+                    print(" Return "+ obj);
+                var deletereturn = JSON.parse(obj);
+                if (deletereturn.result=="deleted"){ 
+                    db.transaction( function(tx) {
+                        var rs= tx.executeSql('SELECT DISTINCT location FROM imageData WHERE album="'+rsfilename+'" AND username="'+login.username+'"');
+                        var locationstring=rs.rows.item(0).location;
+                        filesystem.Directory=locationstring.substring(7,locationstring.length-1);
+                        filesystem.rmDir();
+                        var deleters=tx.executeSql('DELETE  FROM imageData WHERE album="'+location+'"');
+                    })
+               }
+           })
+        }
+        callback(location)
+    })
+}
+
+function deleteContacts(database,user,callback) { // does nothing useful at the moment
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     //print(' delete Image Data() for ' + field +"="+selection)
     db.transaction( function(tx) {
-        result = tx.executeSql('UPDATE imageData SET data="" where '+ field +'="'+selection+'"');
+        result1= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
+result2= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
+
+
+
     callback(result)})
 }
-
 function requestFriendsAlbumPictures(login,friend,rootwindow,callback){
 // screenscraping of albums page of contact without user and password
     Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){
@@ -98,7 +138,6 @@ function requestFriendsPictures(link,rootwindow,callback){
     for (var i=0;i<arr.length-1;i++){
         var photoname=arr[i].substring(arr[i].lastIndexOf('alt')+5,arr[i].lastIndexOf('title')-2);
         var thumblink=arr[i].substring(arr[i].lastIndexOf('<img')+10,arr[i].lastIndexOf('alt')-2);
-
         var imagetype=thumblink.substring(thumblink.lastIndexOf("."));
         var photolink=thumblink.substring(0,thumblink.length-imagetype.length-2)+"-0"+imagetype
         if(thumblink.substring(0,4)!=="http"){thumblink=basehtml+thumblink}
@@ -106,8 +145,8 @@ function requestFriendsPictures(link,rootwindow,callback){
         var photo={'link':photolink,'name':photoname,'thumb':thumblink}
       photoarray.push(photo);
     }
-callback(photoarray)
+    callback(photoarray)
- })
+    })
 }
 
 // CONFIG FUNCTIONS
@@ -119,7 +158,7 @@ function initDatabase(database) { // initialize the database object
         tx.executeSql('CREATE TABLE IF NOT EXISTS imageData(username TEXT,id INT, created TEXT,edited TEXT, title TEXT, desc TEXT, album TEXT,filename TEXT, type TEXT, height INT, width INT, profile INT, link TEXT,location TEXT)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS config(server TEXT, username TEXT, password TEXT, imagestore TEXT, maxnews INT, timerInterval INT, newsViewType TEXT,isActive INT, permissions TEXT,maxContactAge INT,APIVersion TEXT,layout TEXT, addons TEXT)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS news(username TEXT, messagetype INT, text TEXT, created_at INT, in_reply_to_status_id INT, source TEXT, status_id INT, in_reply_to_user_id INT, geo TEXT,favorited TEXT, uid INT, statusnet_html TEXT, statusnet_conversation_id TEXT,friendica_activities TEXT, friendica_activities_self TEXT, attachments TEXT, friendica_owner INT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS contacts(username TEXT, id INT, name TEXT, screen_name TEXT, location TEXT,imageAge INT, profile_image_url TEXT, description TEXT, profile_image BLOB, url TEXT, protected TEXT, followers_count INT, friends_count INT, created_at INT, favourites_count TEXT, utc_offset TEXT, time_zone TEXT, statuses_count INT, following TEXT, verified TEXT, statusnet_blocking TEXT, notifications TEXT, statusnet_profile_url TEXT, cid INT, network TEXT, isFriend INT)');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS contacts(username TEXT, id INT, name TEXT, screen_name TEXT, location TEXT,imageAge INT, profile_image_url TEXT, description TEXT, profile_image BLOB, url TEXT, protected TEXT, followers_count INT, friends_count INT, created_at INT, favourites_count TEXT, utc_offset TEXT, time_zone TEXT, statuses_count INT, following TEXT, verified TEXT, statusnet_blocking TEXT, notifications TEXT, statusnet_profile_url TEXT, cid INT, network TEXT, isFriend INT, timestamp INT)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS groups(username TEXT, groupname TEXT, gid INT, members TEXT)');
 tx.executeSql('CREATE TABLE IF NOT EXISTS events(username TEXT, id INT, start INT, end INT, allday INT, title TEXT, j INT, d TEXT, isFirst INT, uid INT, cid INT, uri TEXT, created INT, edited INT, desc TEXT, location TEXT, type TEXT, nofinish TEXT, adjust INT, ignore INT, permissions TEXT, guid INT, itemid INT, plink TEXT, authorName TEXT, authorAvatar TEXT, authorLink TEXT, html TEXT)');
 })}
@@ -208,6 +247,7 @@ function requestFriendsEvents(login,friend,rootwindow,callback){
  })
 }
 
+
 function savePermissions(database,obj) { // stores config to DB
  var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
  var permissions=JSON.stringify(obj)
@@ -240,7 +280,7 @@ Helperjs.friendicaWebRequest(url+"/api/statusnet/config",rootwindow, function (o
                         "\nText limit: "+serverconfig.site.textlimit+"\nShort Url length: "+serverconfig.site.shorturllength+
                         "\nFriendica version: "+serverconfig.site.friendica.FRIENDICA_VERSION+"\nDFRN version: "+serverconfig.site.friendica.DFRN_PROTOCOL_VERSION +
                         "\nDB Update version: "+serverconfig.site.friendica.DB_UPDATE_VERSION+"'}";
-callback(serverConfigString)
+    callback(serverConfigString)
 })}
 
 
@@ -317,6 +357,21 @@ function  cleanNews(database,callback){
      })
  }
 
+function cleanContacts(login,database,callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    db.transaction( function(tx) {
+        var oldestnewsrs= tx.executeSql('SELECT created_at FROM news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY created_at ASC LIMIT 1');
+        var oldestnewsTime=oldestnewsrs.rows.item(0).created_at-  604800000;  //contacts can be 7 days old
+        print(login.username+" älteste news: "+ oldestnewsTime);
+        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge<'+oldestnewsTime); // check for friends
+        for (var i=0;i<result.rows.length;i++){
+            filesystem.rmFile(result.rows.item(i).profile_image);
+            var deleters = tx.executeSql('DELETE from contacts WHERE username="'+login.username+'" AND url="'+result.rows.item(i).url+'"');
+        }
+        callback()
+    })
+}
+
 function processNews(callback){
 //    Newsjs.getCurrentContacts(login,db,function(contacts){
 //        contactlist=contacts});
@@ -359,23 +414,34 @@ function updateContactInDB(login,database,isFriend,contact){// for newstab and f
 //    var suffix=contact.profile_image_url.substring(contact.profile_image_url.lastIndexOf("."), contact.profile_image_url.length);
 //    var imagename=login.imagestore+"contacts/"+contact.screen_name.trim()+suffix;
     
-var imagename="";
+    var imagename="";
-contacttimer.restart();
+    contacttimer.restart();
     var currentTime=Date.now();
-    if(contact.profile_image_url==""){root.currentContact=root.currentContact+1 } else{//print(JSON.stringify(contact))
+    var image_timestamp=0;
-        imagename=login.imagestore+"contacts/"+contact.screen_name+"-"+contact.profile_image_url.substring(contact.profile_image_url.lastIndexOf("/")+1, contact.profile_image_url.length);
+    if(contact.profile_image_url==""){root.currentContact=root.currentContact+1 }
-    
+    else{//print(JSON.stringify(contact))
-    xhr.setUrl(Qt.resolvedUrl(contact.profile_image_url));
+        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    xhr.setFilename(imagename);
+        db.transaction( function(tx) {
-    xhr.setDownloadtype("contact");
+            var currentts=0;
-    xhr.download();}
+            var currenttsrs= tx.executeSql('SELECT timestamp FROM contacts WHERE username="'+login.username+'" AND url="'+contact.url+'"');
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+            try{currentts=currenttsrs.rows.item(0).timestamp}catch(e){}
-    var result;
+
-    db.transaction( function(tx) {
+            var imagename_helper=[];
+            imagename_helper=contact.profile_image_url.split('?');//print("substring: "+JSON.stringify(imagename_helper)+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length))
+            imagename=login.imagestore+"contacts/"+contact.screen_name+"-"+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length);
+            try {parseInt(image_timestamp=imagename_helper[1].substring(imagename_helper[1].indexOf("ts=")+3,imagename_helper[1].length))} catch(e){};
+            print(contact.screen_name+" Timestamp"+image_timestamp+" "+ new Date(parseInt(image_timestamp)*1000));
+            if ((image_timestamp>currentts) || (image_timestamp==0)){
+                xhr.setUrl(Qt.resolvedUrl(contact.profile_image_url));
+                xhr.setFilename(imagename);
+                xhr.setDownloadtype("contact");
+                xhr.download();
+            }
+        var result;
         result = tx.executeSql('SELECT * from contacts where username="'+login.username+'" AND url = "'+contact.url+'"'); // check for news url
         if(result.rows.length === 1) {// use update
-            result = tx.executeSql('UPDATE contacts SET  id='+contact.id+', name="'+Qt.btoa(contact.name)+'", screen_name="'+contact.screen_name+'", location="'+contact.location+'",imageAge='+currentTime+', profile_image_url="'+contact.profile_image_url+'", description="'+Qt.btoa(contact.description)+'", profile_image="'+imagename+'", protected="'+contact.protected+'", followers_count='+contact.followers_count+', friends_count='+contact.friends_count+', created_at="'+ Date.parse(Newsjs.cleanDate(contact.created_at))+'", favourites_count="'+contact.favorites_count+'", utc_offset="'+contact.utc_offset+'", time_zone="'+contact.time_zone+'", statuses_count='+contact.statuses_count+', following="'+contact.following+'", verified ="'+contact.verified+'", statusnet_blocking="'+contact.statusnet_blocking+'", notifications="'+contact.notifictions+'", statusnet_profile_url="'+contact.statusnet_profile_url+'", cid='+contact.cid+', network="'+contact.network+'", isFriend='+isFriend+' where username="'+login.username+'" AND  url="'+contact.url+'"');
+            result = tx.executeSql('UPDATE contacts SET  id='+contact.id+', name="'+Qt.btoa(contact.name)+'", screen_name="'+contact.screen_name+'", location="'+contact.location+'",imageAge='+currentTime+', profile_image_url="'+contact.profile_image_url+'", description="'+Qt.btoa(contact.description)+'", profile_image="'+imagename+'", protected="'+contact.protected+'", followers_count='+contact.followers_count+', friends_count='+contact.friends_count+', created_at="'+ Date.parse(Newsjs.cleanDate(contact.created_at))+'", favourites_count="'+contact.favorites_count+'", utc_offset="'+contact.utc_offset+'", time_zone="'+contact.time_zone+'", statuses_count='+contact.statuses_count+', following="'+contact.following+'", verified ="'+contact.verified+'", statusnet_blocking="'+contact.statusnet_blocking+'", notifications="'+contact.notifictions+'", statusnet_profile_url="'+contact.statusnet_profile_url+'", cid='+contact.cid+', network="'+contact.network+'", isFriend='+isFriend+', timestamp='+ image_timestamp+' where username="'+login.username+'" AND  url="'+contact.url+'"');
         } else {// use insert
-        result = tx.executeSql('INSERT INTO contacts VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,contact.id,Qt.btoa(contact.name),contact.screen_name,contact.location,currentTime,contact.profile_image_url, Qt.btoa(contact.description),imagename,contact.url,contact.protected,contact.followers_count, contact.friends_count,Date.parse(Newsjs.cleanDate(contact.created_at)),contact.favorites_count,contact.utc_offset,contact.time_zone,contact.statuses_count,contact.following,contact.verfied,contact.statusnet_blocking,contact.notifications,contact.statusnet_profile_url,contact.cid,contact.network,isFriend]);}
+        result = tx.executeSql('INSERT INTO contacts VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,contact.id,Qt.btoa(contact.name),contact.screen_name,contact.location,currentTime,contact.profile_image_url, Qt.btoa(contact.description),imagename,contact.url,contact.protected,contact.followers_count, contact.friends_count,Date.parse(Newsjs.cleanDate(contact.created_at)),contact.favorites_count,contact.utc_offset,contact.time_zone,contact.statuses_count,contact.following,contact.verfied,contact.statusnet_blocking,contact.notifications,contact.statusnet_profile_url,contact.cid,contact.network,isFriend,image_timestamp]);}
     });
-}
+}}

source-linux/qml/configqml/InfoBox.qml

@@ -11,7 +11,7 @@ Rectangle{
         anchors.topMargin: mm
         textFormat: Text.RichText
         wrapMode: Text.Wrap
-        text: "<b>Friendiqa v0.003 </b><br>Licensed under GPL 3<br> "+
+        text: "<b>Friendiqa v0.1 </b><br>Licensed under GPL 3<br> "+
               "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+
               "Sourcecode: <a href='https://github.com/LubuWest/Friendiqa'>https://github.com/LubuWest/Friendica</a><br>"+
                "C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+
@@ -28,7 +28,7 @@ Rectangle{
             anchors.topMargin: 1*mm
             anchors.right: parent.right
             anchors.rightMargin: 1*mm
-        text:   "\uf057" //qsTr("Close")
+        text:   "\uf057"
         onClicked:{configStack.pop()}
      }
 }

source-linux/qml/contactqml/ContactDetailsComponent.qml

@@ -13,8 +13,8 @@ property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?""
 Rectangle {
     id: wrapper
 
-    width:friendsTabView.width;
+    width:root.width-2*mm //friendsTabView.width;
-    height:friendsTabView.height-15*mm
+    height:root.height-20*mm// friendsTabView.height-15*mm
     border.color:  "grey"
     color:"white"
     Image {
@@ -30,7 +30,7 @@ Rectangle {
     Label {
         id: namelabel
         x: mm
-        width:friendsTabView.width-4*mm
+        width: root.width-6*mm //friendsTabView.width-4*mm
         height: 3*mm
         text:Qt.atob(contact.name)+" (@"+contact.screen_name+")"
         elide:Text.ElideRight
@@ -50,7 +50,7 @@ Rectangle{
        frameVisible: true
        id:namelabelflickable
        width: root.width-10*mm
-       height:friendsTabView.height-45*mm
+       height:root.height-50*mm//friendsTabView.height-45*mm
        x: mm
        clip:true
        Text{
@@ -83,6 +83,7 @@ Rectangle{
                     root.currentIndex=2;
                     fotostab.active=true;
                     root.fotoSignal(contact) ;
+                    contactLargeComponent.destroy();
                     }
              }
 
@@ -93,6 +94,7 @@ Rectangle{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.messageSignal(contact.id) ;
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -104,6 +106,7 @@ Rectangle{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.directmessageSignal(contact.screen_name);
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -117,6 +120,7 @@ Rectangle{
                     calendartab.active=true;
                     calendartab.calendartabstatus="Friend"
                     root.eventSignal(contact.url);
+                    contactLargeComponent.destroy();
                 }
             }
 
@@ -124,8 +128,7 @@ Rectangle{
                 id: closeButton
                 text: "\uf057" //"close"
                 onClicked:{contactLargeComponent.destroy();
-                    //contactComponent.state="";
+                }
-                    friendsTabView.contactSignal}
             }
         }
     }

source-linux/qml/contactqml/Contactlist.qml

@@ -0,0 +1,101 @@
+// List of people
+import QtQuick 2.0
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle {
+    id:contactlistRectangle
+    property var contacts:[]
+    property var possibleUsers: []
+    //y:8*mm
+    color: "white"
+    border.color: "light grey"
+    radius:0.5*mm
+    width:groupListView.width
+    height:groupListView.height
+
+    ListView {
+          id: contactView
+          x:mm
+          y:6*mm
+          width: contactlistRectangle.width-2*mm
+          height: contactlistRectangle.height-10*mm
+          clip: true
+          spacing: 0
+          model: contactModel
+          delegate: listContact
+          }
+
+       ListModel{id: contactModel}
+
+       Component {  id:listContact
+               Rectangle{
+                  border.color: "#EEEEEE"
+                  border.width: 1
+                  radius:0.5*mm
+                  width:contactView.width
+                  height:6*mm
+                  Image {
+                      id: contactImage
+                      x:1
+                      y:1
+                      width: 5*mm
+                      height:5*mm
+                      source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
+                      onStatusChanged: if (contactImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+                      }
+                  Text{
+                    font.pixelSize: 3*mm
+                    anchors.left: contactImage.right
+                    anchors.margins: 1*mm
+                    text:Qt.atob(contact.name)
+                  }
+            Text {
+                id:selected
+                anchors.right:parent.right
+                visible: contactlist.indexOf(contact)>-1
+                z:4
+                text: "\u2713"
+                width: 5*mm
+                anchors.top: parent.top
+                color: "green"
+                font.pixelSize: 3*mm
+            }
+
+           MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                    if(selected.visible==true){
+                                contacts.splice(Helperjs.inArray(contacts,"id",contact.id),1);
+                                selected.visible=false
+                            }
+                            else{
+                                contacts.push(contact);
+                                selected.visible=true;
+                            }
+                        }
+                 }
+            }
+           }
+
+    BlueButton {
+            id: closeButton
+            anchors.top: parent.top
+            anchors.topMargin: 1*mm
+            anchors.right: parent.right
+            anchors.rightMargin: 1*mm
+            color:"white"
+            text: "\uf057"
+            onClicked: {
+               groupModelAppend(contacts,function(){
+                   contactlistRectangle.destroy()
+                 });
+            }
+    }
+
+    Component.onCompleted: {
+        for (var user in possibleUsers){
+            contactModel.append({"contact":possibleUsers[user]})
+        }
+    }
+}

source-linux/qml/contactqml/FriendsTab.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/js/news.js" as Newsjs
+import "qrc:/js/service.js" as Service
 import "qrc:/qml/contactqml"
 import "qrc:/qml/genericqml"
 
@@ -20,6 +21,9 @@ Rectangle {
            var contactDetails = component.createObject(friendstab,{"contact": contact})
         }
     }
+
+
+
     TabView{
         id:friendsTabView
         tabPosition: Qt.TopEdge
@@ -63,7 +67,7 @@ Rectangle {
             id: friendsGridTab
             function showFriends(contact){
                 try {friendsModel.clear()} catch(e){print(e)};
-                Helperjs.readData(db,"contacts",root.login.username,function(friendsobject){
+                Helperjs.readData(db,"contacts",login.username,function(friendsobject){
                     for (var i=0;i<friendsobject.length;i++){
                          if(Helperjs.getCount(db,login,"contacts","screen_name",friendsobject[i].screen_name)>1){
                             friendsobject[i].screen_name=friendsobject[i].screen_name+"+"+friendsobject[i].cid
@@ -140,13 +144,30 @@ Rectangle {
                     }
                 },"isFriend",0,"screen_name ASC");
             }
+            BlueButton {
+                id: cleanButton
+                text:  "\uf021"
+                anchors.top: parent.top
+                anchors.topMargin: mm
+                anchors.right: parent.right
+                onClicked: {
+                    Service.cleanContacts(root.login,root.db,function(){
+                        try {contactsModel.clear()} catch(e){print(e)};
+                        Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
+                        for (var j=0;j<contactsobject.length;j++){
+                             contactsModel.append({"contact":contactsobject[j]});
+                            }
+                        },"isFriend",0,"screen_name ASC");
 
+                    })
+                }
+            }
              GridView {
                  id: contactsView
                  x:mm
-                 y:2*mm
+                 y:cleanButton.height+2*mm
                  width:contactsGridTab.width-2*mm
-                 height:contactsGridTab.height-2*mm
+                 height:contactsGridTab.height-cleanButton.height-2*mm
                  clip: true
                  cellHeight: 16*mm
                  cellWidth: 17*mm
@@ -173,16 +194,65 @@ Rectangle {
                   for (var j=0;j<groupsobject.length;j++){
                       groupsModel.append({"group":groupsobject[j]});
             }})}
+
+            function updateGroup(login,database,group){
+               // update groups
+                //var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+                //var groupdata={"gid":group.id,"name":group.name,"user":group.user};
+                //print("Groupdata  "+JSON.stringify(group));
+                var api="";
+                if (group.new){api="/api/friendica/group_create.json?name="+group.name}else{api="/api/friendica/group_update.json?gid="+group.id}
+                xhr.url= login.server + api;
+                xhr.setLogin(login.username+":"+Qt.atob(login.password));
+                xhr.clearParams();
+                xhr.setParam("gid",group.id);
+                xhr.setParam("name",group.name);
+                xhr.setParam("user", group.user);
+                xhr.setParam("json",group);
+                xhr.post();
+        //        Helperjs.friendicaPostRequest(login,api,groupdata,"POST",rootwindow, function (obj){print("groupcreate "+obj);
+        //           var groups=JSON.parse(obj);
+        //            db.transaction( function(tx) {
+        //                 var result = tx.executeSql('DELETE from groups where username="'+login.username+'"'); // clean old groups
+        //           for (var i=0;i<groups.length;i++){
+        //               var memberarray=[]; for (var user in groups[i].user){memberarray.push(parseInt(groups[i].user[user].cid))}
+        //              //print("Members: "+groups[i].user)
+        //                   var result2 = tx.executeSql('INSERT INTO groups VALUES (?,?,?,?)', [login.username,groups[i].name,groups[i].gid,JSON.stringify(memberarray)])}
+        //            callback()
+        //            });
+        //    })
+            }
+
+            Connections{
+                target:xhr
+                onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
+                onSuccess:{print("gruppe "+data);
+                    Newsjs.requestGroups(root.login,root.db,root,function(){
+                        showGroups(root.login.username)});
+                }
+            }
             BlueButton {
                 id: updateGroupsButton
                 text: "\uf021"
                 anchors.top: parent.top
                 anchors.topMargin: mm
                 anchors.right: parent.right
+                anchors.rightMargin: mm
                 onClicked: {
                     Newsjs.requestGroups(root.login,root.db,root,function(){
                         showGroups(root.login.username)})}
             }
+            BlueButton {
+                id: newGroupButton
+                text: "\uf234"
+                anchors.top: parent.top
+                anchors.topMargin: mm
+                anchors.right: updateGroupsButton.left
+                anchors.rightMargin: mm
+                onClicked: {
+                    groupsModel.append({"group": {"new":true}});
+                }
+            }
             GridView {
                 id: groupsView
                 x:mm
@@ -196,11 +266,29 @@ Rectangle {
                      NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
                     }
                 model: groupsModel
-                delegate: GroupComponent { }
+                delegate: GroupComponent {}
+                //footer:groupFooter
                 }
             ListModel{
                 id: groupsModel
             }
+//            Component{
+//                id: groupFooter
+//                Image{
+//                    id: footerImage
+//                    width: 15*mm
+//                    height: 15*mm
+//                    fillMode: Image.PreserveAspectFit
+//                    source:"qrc:/images/addImage.png"
+//                    MouseArea{
+//                        anchors.fill: parent
+//                        onClicked:{
+//                            print("new group")
+//                            var component = Qt.createComponent("qrc:/qml/contactqml/GroupComponent.qml");
+//                            var imagedialog = component.createObject(groupsView,{"group": []});}
+//                    }
+//                }
+//            }
             Component.onCompleted: {
                 friendsTabView.groupsSignal.connect(showGroups);
             }

source-linux/qml/contactqml/GroupComponent.qml

@@ -1,128 +1,214 @@
 import QtQuick 2.0
 import "qrc:/js/helper.js" as Helperjs
+import "qrc:/js/news.js" as Newsjs
 import "qrc:/qml/genericqml"
 
-    Item {
+Item {
-        id: groupComponent
+    id: groupComponent
-        Rectangle {
+    property var groupmembers:[]
-                  id: wrapper
+    //property bool newGroup: false
-                  width: 16*mm
+    function groupModelAppend(groupcontacts,callback){
-                  height: 15*mm
+       for (var n in groupcontacts){
-                  border.color:  "grey"
+        groupModel.append({"groupmember":groupcontacts[n]});}
-                  color:"white"
+        callback()
+    }
 
-                  Image {
+    Rectangle {
-                      id: photoImage
+        id: wrapper
-                      x:1
+        width: 16*mm
-                      y:1
+        height: 15*mm
-                      width: 10*mm
+        border.color:  "grey"
-                      height:10*mm
+        color:"white"
-                      source:"qrc:/images/defaultcontact.jpg"
-                      }
-                  Text {
-                    id: namelabel
-                    x: 1
-                    width: wrapper.width-2
-                    height: 3*mm
-                    text: group.groupname
-                    
-                    color: "#303030"
-                    font.pixelSize: 3*mm
-                    anchors.top: photoImage.bottom
-                   }
-                    BlueButton{
-                        id:infobutton
-                        width: 5*mm
-                        height: 5*mm
-                        color:"transparent"
-                        text:"?"
-                        anchors.left: photoImage.right
-                        anchors.leftMargin: 3
-                        anchors.topMargin: 3
-                        anchors.top: parent.top
-                        onClicked:{
-                            Helperjs.readField("members",root.db,"groups",root.login.username,function(groups){
-                            try {groupModel.clear()}catch (e){print(e)}
-                            var groupmembers=JSON.parse(groups);
-                            for (var user in groupmembers){
-                                Helperjs.readData(root.db,"contacts",root.login.username,function(userdata){
-                                    if (userdata[0]){groupModel.append({"groupmember":userdata[0]})}
-                                },"id",groupmembers[user])}
-                            },"groupname",group.groupname);
-                            groupComponent.state="large"}
-                    }
 
+        Image {
+            id: photoImage
+            x:1
+            y:1
+            width: 10*mm
+            height:10*mm
+            source:"qrc:/images/defaultcontact.jpg"
+        }
+        Rectangle{
+            id:namelabelRect
+            x: 1
+            width: wrapper.width-2
+            height: 3.5*mm
+            anchors.top: photoImage.bottom
+            border.color: "light grey"
+            TextInput {
+                id: namelabel
+                anchors.fill: parent
+                readOnly: true
+                text: group.new?"":group.groupname
+                color: "#303030"
+                font.pixelSize: 3*mm
 
-            Rectangle{
+            }
+        }
+        BlueButton{
+            id:infobutton
+            width: 5*mm
+            height: 5*mm
+            color:"transparent"
+            text:"?"
+            anchors.left: photoImage.right
+            anchors.leftMargin: 3
+            anchors.topMargin: 3
+            anchors.top: parent.top
+            onClicked:{
+                if(group.new){Helperjs.readField("members",root.db,"groups",root.login.username,function(groups){
+                    try {groupModel.clear()}catch (e){print(e)}
+                    groupmembers=JSON.parse(groups);
+                    for (var user in groupmembers){
+                        Helperjs.readData(root.db,"contacts",root.login.username,function(userdata){
+                            if (userdata[0]){groupModel.append({"groupmember":userdata[0]})}
+                        },"id",groupmembers[user])
+                    } //catch(e){}
+                },"groupname",group.groupname);}
+                groupComponent.state="large"
+            }
+        }
+
+        Rectangle{
             id: detailsrectangle
-            anchors.top: namelabel.bottom
+            anchors.top: namelabelRect.bottom
             anchors.topMargin: 2*mm
             opacity: 0
 
-            Component {  id:groupMember
+            Component {
-                    Rectangle{
+                id:groupMember
-                       border.color: "#EEEEEE"
+                Rectangle{
-                       border.width: 1
+                    width:parent.width
-                       width:parent.width
+                    height:6*mm
-                       height:6*mm
+                    Rectangle{id:memberrectangle
-                       Image {
+                        border.color: "#EEEEEE"
-                           id: memberImage
+                        border.width: 1
-                           x:1
+                        width:parent.width-12*mm
-                           y:1
+                        height:6*mm
-                           width: 5*mm
+                        Image {
-                           height:5*mm
+                            id: memberImage
-                           source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
+                            x:1
-                           onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+                            y:1
-                           }
+                            width: 5*mm
-                       Text{
+                            height:5*mm
-                         font.pixelSize: 3*mm
+                            source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
-                         anchors.left: memberImage.right
+                            onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                         anchors.margins: 1*mm
+                            }
-                         text:Qt.atob(groupmember.name)
+                        Text{
-                       }
+                            font.pixelSize: 3*mm
-                       MouseArea{
+                            anchors.left: memberImage.right
-                          anchors.fill: parent
+                            anchors.margins: 1*mm
-                          onClicked:{
+                            width:parent.width-1
-                         root.currentIndex=1;
+                            text:Qt.atob(groupmember.name)
-                    friendstab.active=true;
+                        }
-                    root.contactdetailsSignal(groupmember)
+                        MouseArea{
+                            anchors.fill: parent
+                            onClicked:{
+                                root.currentIndex=1;
+                                friendstab.active=true;
+                                root.contactdetailsSignal(groupmember)
+                            }
+                        }
+                        BlueButton{
+                            anchors.left: memberrectangle.right
+                            anchors.margins: 1*mm
+                            text: "\uf056"
+                            onClicked:{
+                                groupModel.remove(index)
+                            }
+                        }
+                    }
                 }
             }
-                }}
 
-              ListView{
+            ListView{
-              id: groupListView
+                id: groupListView
-              x:1
+                x:1
-              //anchors.top: parent.top
+                //anchors.top: parent.top
-              width: root.width-10*mm
+                width: root.width-10*mm
-              height:groupsView.height -29*mm
+                height:groupsView.height -31*mm
-              clip: true
+                clip: true
-              spacing: 2
+                spacing: 2
-              model: groupModel
+                model: groupModel
-              delegate: groupMember
+                delegate: groupMember
-              }
+            }
 
-          ListModel{id: groupModel}
+            ListModel{id: groupModel}
 
-          BlueButton{
+            Row{
-              id: closeButton
+                anchors.top: groupListView.bottom
-              anchors.top: groupListView.bottom
+                anchors.topMargin: mm
-              anchors.topMargin: mm
+                spacing: mm
-              text: "\uf057"
+                BlueButton{
-              onClicked:{groupComponent.state=""}
+                    id: deleteButton
+                    text: "\uf056"
+                    onClicked:{
+                        Newsjs.deleteGroup(root.login,root.db,root,group,function(){
+                            groupComponent.state="";
+                            groupsModel.remove(index)})
+                    }
+                }
+
+
+                BlueButton{
+                    id:  addMembers
+                    text:"\uf234"
+                    onClicked: {
+                        Newsjs.listFriends(root.login,root.db,function(userdata){
+                            var newlistcontacts=[];
+                            for (var n in userdata){
+                                if (groupmembers.indexOf(userdata[n].id)==-1){
+                                    newlistcontacts.push(userdata[n])
+                                }
+                            }
+                            var component = Qt.createComponent("qrc:/qml/contactqml/Contactlist.qml");
+                            var contactlistobject = component.createObject(groupListView,{"possibleUsers":newlistcontacts});
+
+                        })
+                    }
+                }
+
+                BlueButton{
+                    id: updateButton
+                    text: "\uf0ee"
+                    onClicked:{
+                        var groupobject={};
+                        var groupmembers=[];
+                        for (var i=0;i<groupModel.count;i++){groupmembers.push(groupModel.get(i).groupmember)}
+                        try{ groupobject.id=group.gid} catch(e){};
+                        try{ groupobject.new=group.new} catch(e){};
+                        if (namelabel.text==""){
+                            Helperjs.showMessage(qsTr("Error"),qsTr("No name given"),root)}
+                        else {
+                            groupobject.name=namelabel.text;
+                            groupobject.user=groupmembers;
+                            updateGroup(login,db,groupobject)
+                            groupComponent.state="";
+                        }
+                    }
+                }
+                BlueButton{
+                    id: closeButton
+                    text: "\uf057"
+                    onClicked:{groupComponent.state="";
+                        if (group.new){groupsModel.remove(index)}
+                    }
+                }
+            }
         }
+    Component.onCompleted:{if(group.new){groupComponent.state="large"}}
     }
-}
 
-        states: [
+    states: [
-         State {
+        State {
             name: "large"
-            PropertyChanges { target: namelabel; font.pixelSize: 4*mm; width:groupsView.width}
+            PropertyChanges { target: namelabel; font.pixelSize: 4*mm; width:groupsView.width; readOnly:false}
+            PropertyChanges { target: namelabelRect; height: 4.5*mm}
             PropertyChanges { target: groupComponent; z: 2  }
             PropertyChanges { target: wrapper; width:groupsView.width;height:groupsView.height -2*mm-1}
             PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
             PropertyChanges { target:groupComponent.GridView.view ;contentY:groupComponent.y;contentX:groupComponent.x;interactive:false}
             PropertyChanges { target: detailsrectangle; opacity:1  }
             }
-         ]
+    ]
 }

source-linux/qml/friendiqa.qml

@@ -25,7 +25,6 @@ TabView{
     signal friendsSignal(var username)
     signal contactdetailsSignal(var contact)
     signal eventSignal(var contact)
-    //currentIndex: (login=="")? 3:0
 
     property var news:[]
     property var newContacts:[]
@@ -49,7 +48,7 @@ TabView{
             })}
     }
 
-    onCurrentContactChanged:{// download next contact image after photoplaceholder is finished saving and update db
+    onCurrentContactChanged:{// download next contact image after successful download and update db
 
         if(currentContact<newContacts.length){
                     Service.updateContactInDB(login,db,newContacts[currentContact].isFriend,newContacts[currentContact])}
@@ -117,7 +116,7 @@ TabView{
         tab: Rectangle {
             color: styleData.selected?"sky blue":"light blue"
             border.color: "light grey"
-            implicitWidth: root.width/5-2*mm
+            implicitWidth: root.width/5
             implicitHeight: 5*mm
             Text { id: text
                 anchors.centerIn: parent

source-linux/qml/genericqml/AttachmentDialog.qml

@@ -64,9 +64,7 @@ Rectangle{
                 }
             }
            }}
-
+    Component.onCompleted: {
-     }
-Component.onCompleted: {
         for (var a in parsedAttachments){
             attachmentModel.append({"attachment":parsedAttachments[a]})
         }

source-linux/qml/genericqml/ImageDialog.qml

@@ -0,0 +1,148 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.2
+import Qt.labs.folderlistmodel 2.1
+import "qrc:/js/service.js" as Service
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+
+Rectangle{
+    id:imageDialog
+    z:2
+    border.color: "grey"
+    width: parent.width-4*mm
+    height:parent.height-12*mm
+    x:2*mm
+    y:10*mm
+    property string directory: ""
+    property bool multiSelection: false
+
+    Text{
+        id:directoryText
+         x:0.5*mm
+         y:0.5*mm
+         width: imageDialog.width-15*mm
+         height:contentHeight
+         wrapMode: Text.Wrap
+         text: directory
+    }
+    BlueButton{
+        id:closeButton
+        anchors.top: parent.top
+        anchors.topMargin: 0.5*mm
+        anchors.right: parent.right
+        anchors.rightMargin: 1*mm
+        text:   "\uf057"
+        onClicked:{imageDialog.destroy()}
+    }
+
+    ListView {
+        id: imageView
+        x:0.5*mm
+        y: Math.max(directoryText.height, closeButton.height)+mm
+        width: imageDialog.width-2*mm
+        height: imageDialog.height-imageView.y-4*mm
+        clip: true
+        model: imageModel
+        delegate: imageItem
+    }
+
+    FolderListModel{
+        id: imageModel
+        nameFilters: ["*.png", "*.jpg",".jpeg","*.JPG","*.gif"]
+        sortField: FolderListModel.Time
+        sortReversed:false
+        showDotAndDotDot: true
+        showDirs: true
+        showDirsFirst: true
+        folder:directory
+    }
+
+    BusyIndicator{
+        id: imageBusy
+        anchors.horizontalCenter: imageView.horizontalCenter
+        anchors.top:imageView.top
+        anchors.topMargin: 2*mm
+        width:10*mm
+        height: 10*mm
+        running:false
+    }
+
+    Component{
+        id:imageItem
+        Item{
+            width:imageView.width
+            height:folderImage.height+2*mm
+            Rectangle{
+                id:imagetextRectangle
+                color:"black"
+                x:mm
+                z:3
+                opacity: fileIsDir?0:0.5
+                width:imagetext.contentWidth
+                height: imagetext.contentHeight
+                anchors.bottom: folderImage.bottom
+            }
+            Text {
+                id:imagetext
+                x:fileIsDir?11*mm:mm
+                z:4
+                text: fileName
+                width: fileIsDir?parent.width - 12*mm :imageView.width-mm
+                anchors.bottom: folderImage.bottom
+                color: fileIsDir?"black":"white"
+                font.pixelSize: 3*mm
+                wrapMode:Text.Wrap
+            }
+            Text {
+                id:selected
+                anchors.right:parent.right
+                visible: attachImageURLs.indexOf(fileURL)>-1
+                z:4
+                text: "\u2713"
+                width: 10*mm
+                anchors.top: folderImage.top
+                color: "green"
+                font.pixelSize: 10*mm
+            }
+
+            Image{id:folderImage
+                 width: fileIsDir?10*mm: imageView.width-mm
+                 fillMode:Image.PreserveAspectFit
+                 source:fileIsDir?"qrc:/images/folder-blue.png":fileURL
+                }
+
+            MouseArea{
+                anchors.fill: parent
+                onClicked:{
+                   if (fileName==".."){
+                        imageModel.folder=imageModel.parentFolder;
+                        directory=imageModel.parentFolder
+                    }
+                    else if (fileIsDir){
+                        imageModel.folder=fileURL;
+                        directory=fileURL
+                    }
+                    else{
+                        if (multiSelection!=true){
+                            attachImageURLs.push(fileURL);
+                            attachImage(fileURL);
+                            imageDialog.destroy()
+                        }
+                        else {
+                            if(selected.visible==true){
+                                attachImageURLs.splice(attachImageURLs.indexOf(fileURL,1))
+                                selected.visible=false
+                            }
+                            else{
+                                attachImageURLs.push(fileURL);
+                                selected.visible=true;
+    
+                            }
+                            attachImage(fileURL)
+                        }
+                    }
+                }
+            }
+          }
+     }
+}

source-linux/qml/genericqml/PermissionDialog.qml

@@ -5,8 +5,8 @@ import "qrc:/qml/genericqml"
 
 Rectangle{
     id:permissionDialog
-    x: mm
+//    x: mm
-    width: messageColumn.width-5*mm
+    width: parent.width-5*mm
     height:root.height/3
     function updatePerms(){
         for (var i=0;i<groupModel.count;i++)

source-linux/qml/newsqml/AttachmentDialog.qml

@@ -1,74 +0,0 @@
-import QtQuick 2.0
-import Qt.labs.folderlistmodel 2.1
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:attachmentDialog
-    z:2
-    border.color: "grey"
-    width: parent.width-4*mm
-    height:parent.height-12*mm
-    x:2*mm
-    y:10*mm
-    property var parsedAttachments: JSON.parse(attachedobjects)
-
-    Text{
-         x:0.5*mm
-         y:0.5*mm
-         width: imageDialog-8*mm
-         elide:Text.ElideRight
-         text: "Attachments:"
-    }
-    BlueButton{
-           id:closeButton
-           anchors.top: parent.top
-           anchors.topMargin: 1*mm
-           anchors.right: parent.right
-           anchors.rightMargin: 1*mm
-       text:   "\uf057"
-       onClicked:{attachmentDialog.destroy()}
-    }
-    ListView {
-          id: attachmentView
-          x:0.5*mm
-          y:5.5*mm
-          width: attachmentDialog.width-2*mm
-          height: attachmentDialog.height-14*mm
-          clip: true
-          spacing:0
-          model: attachmentModel
-          delegate: attachmentItem
-     }
-
-     ListModel{id: attachmentModel}
-
-       Component {  id:attachmentItem
-               Rectangle{
-                  border.color: "#EEEEEE"
-                  border.width: 1
-                  width:parent.width
-                  height:6*mm
-                  
-                  Text{
-                    font.pixelSize: 3*mm
-                    x: mm
-                    text:attachment.name
-                  }
-
-           MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    Qt.openUrlExternally(attachment.url)
-                }
-            }
-           }}
-
-     }
-Component.onCompleted: {
-        for (var a in parsedAttachments){
-            attachmentModel.append({"attachment":parsedAttachments[a]})
-        }
-    }
-}

source-linux/qml/newsqml/Conversation.qml

@@ -1,11 +1,12 @@
 // ConversationView with button
 import QtQuick 2.0
+import QtQuick.Controls 1.2
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
 
 Rectangle {
     id:conversationList
-    property var news
+    //property var news
     y:1
     z:2
     color: "white"
@@ -15,10 +16,7 @@ Rectangle {
     Connections{
         target:newstab
         onConversationChanged:{
-                if(newstab.conversation.length==0){
+
-                    newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
-                    conversationList.destroy(); conversationsymbol.color="grey"
-                }
         }
     }
 
@@ -34,6 +32,32 @@ Rectangle {
           model: conversationModel
           delegate: Newsitem{}
           }
+    BusyIndicator{
+         id: conversationBusy
+         anchors.horizontalCenter: conversationView.horizontalCenter
+         anchors.top:conversationView.top
+         anchors.topMargin: 2*mm
+         width:10*mm
+         height: 10*mm
+         running: true
+       }
+
+    Connections{
+        target:newstab
+        onConversationChanged:{
+            if(newsitem.itemindex==newsStack.conversationIndex){
+                if(newstab.conversation.length==0){
+                    newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
+                    conversationList.destroy(); conversationsymbol.color="grey"
+                } else { conversationBusy.running=false;
+                  conversationModel.clear();
+                  var currentTime= new Date();
+                  var msg = {'currentTime': currentTime, 'model': conversationModel,'news':newstab.conversation};
+                  conversationWorker.sendMessage(msg)
+                  conversationsymbol.color="grey"}
+            }
+        }
+    }
 
    Component {  id:footerReply
        Rectangle{
@@ -117,9 +141,9 @@ Rectangle {
             }
     }
 
-    Component.onCompleted: {
+//    Component.onCompleted: {
-        var currentTime= new Date();
+//        if (news){var currentTime= new Date();
-        var msg = {'currentTime': currentTime, 'model': conversationModel,'news':news};
+//        var msg = {'currentTime': currentTime, 'model': conversationModel,'news':news};
-        conversationWorker.sendMessage(msg)
+//        conversationWorker.sendMessage(msg)}
-    }
+//    }
 }

source-linux/qml/newsqml/FriendicaActivities.qml

@@ -1,4 +1,4 @@
-// List if people from Friendica Activities
+// List of people from Friendica Activities
 import QtQuick 2.0
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -51,11 +51,7 @@ Rectangle {
 
            MouseArea{
                 anchors.fill: parent
-                onClicked:{
+                onClicked:{showContact(contact)}
-                    try {root.currentIndex=1;
-                    friendstab.active=true;
-                    root.contactdetailsSignal(contact)
-                } catch(e) {Helperjs.showMessage("Error",e,root)}} 
             }
            }}
 

source-linux/qml/newsqml/ImageDialog.qml

@@ -1,121 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.2
-import Qt.labs.folderlistmodel 2.1
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:imageDialog
-    z:2
-    border.color: "grey"
-    width: parent.width-4*mm
-    height:parent.height-12*mm
-    x:2*mm
-    y:10*mm
-    property string directory: ""
-
-    Text{
-        id:directoryText
-         x:0.5*mm
-         y:0.5*mm
-         width: imageDialog.width-15*mm
-         height:contentHeight
-         wrapMode: Text.Wrap
-         text: directory
-    }
-    BlueButton{
-           id:closeButton
-           anchors.top: parent.top
-           anchors.topMargin: 1*mm
-           anchors.right: parent.right
-           anchors.rightMargin: 1*mm
-       text:   "\uf057"
-       onClicked:{imageDialog.destroy()}
-    }
-      ListView {
-          id: imageView
-          x:0.5*mm
-          y:directoryText.height+mm
-          width: imageDialog.width-2*mm
-          height: imageDialog.height-directoryText.height-4*mm
-          clip: true
-          model: imageModel
-          delegate: imageItem
-     }
-
-     FolderListModel{
-         id: imageModel
-         nameFilters: ["*.png", "*.jpg",".jpeg","*.JPG","*.gif"]
-         sortField: FolderListModel.Time
-         sortReversed:false
-         showDotAndDotDot: true
-         showDirs: true
-         showDirsFirst: true
-         folder:directory
-     }
-
-     BusyIndicator{
-         id: imageBusy
-         anchors.horizontalCenter: imageView.horizontalCenter
-         anchors.top:imageView.top
-         anchors.topMargin: 2*mm
-         width:10*mm
-         height: 10*mm
-         running:false
-       }
-
-
-     Component{
-         id:imageItem
-         Item{
-             width:imageView.width
-             height:folderImage.height+2*mm
-             Rectangle{
-                 id:imagetextRectangle
-                 color:"black"
-                 x:mm
-                 z:3
-                 opacity: fileIsDir?0:0.5
-                 width:imagetext.contentWidth
-                 height: imagetext.contentHeight
-                 anchors.bottom: folderImage.bottom
-            }
-            Text {
-                id:imagetext
-                x:fileIsDir?11*mm:mm
-                z:4
-                text: fileName
-                width: fileIsDir?parent.width - 12*mm :imageView.width-mm
-                anchors.bottom: folderImage.bottom
-                color: fileIsDir?"black":"white"
-                font.pixelSize: 3*mm
-                wrapMode:Text.Wrap
-            }
-            Image{id:folderImage
-                 width: fileIsDir?10*mm: imageView.width-mm
-                 fillMode:Image.PreserveAspectFit
-                 source:fileIsDir?"qrc:/images/folder-blue.png":fileURL
-                }
-
-                MouseArea{
-                    anchors.fill: parent
-                    onClicked:{
-                        if (fileName==".."){
-                            imageModel.folder=imageModel.parentFolder;
-                            directory=imageModel.parentFolder
-                        }
-                        else if (fileIsDir){
-                            imageModel.folder=fileURL;
-                            directory=fileURL
-                        }
-                        else{
-                            attachImageURLs.push(fileURL);
-                           attachImage(fileURL);
-                      imageDialog.destroy()
-                        }
-                    }
-                }
-          }
-     }
-}

source-linux/qml/newsqml/MessageSend.qml

@@ -130,7 +130,7 @@ Flickable{
                   visible: (directmessage==1)?false:true
                   text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
                   onClicked: {
-                     var component = Qt.createComponent("qrc:/qml/newsqml/PermissionDialog.qml");
+                     var component = Qt.createComponent("qrc:/qml/genericqml/PermissionDialog.qml");
                      var permissions = component.createObject(messageColumn);
                   }}
               BlueButton {
@@ -143,7 +143,7 @@ Flickable{
                       }
                       else{
                           var defaultDirectory="file://"+osSettings.attachImageDir;
-                          var component = Qt.createComponent("qrc:/qml/newsqml/ImageDialog.qml");
+                          var component = Qt.createComponent("qrc:/qml/genericqml/ImageDialog.qml");
                           var imagedialog = component.createObject(messageSend,{"directory": defaultDirectory});
                       }
                   }
@@ -159,7 +159,7 @@ Flickable{
                               if(Helperjs.getCount(db,login,"contacts","screen_name",contacts[i].screen_name)>1){
                                   contacts[i].screen_name=contacts[i].screen_name+"+"+contacts[i].cid
                               }
-                              contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+"';iconSource:'"+contacts[i].profile_image+"'; onTriggered: bodyField.insert(0,' @"+contacts[i].screen_name+"+"+contacts[i].cid+" ')}"
+                              contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+"';iconSource:'"+contacts[i].profile_image+"'; onTriggered: bodyField.insert(0,' @"+contacts[i].screen_name+" ')}"
                         }}
                         var menuString="import QtQuick.Controls 1.4; Menu {"+contactitems+"}";
                         var contactlistObject=Qt.createQmlObject(menuString,messageSend,"contactmenuOutput")

source-linux/qml/newsqml/NewsTab.qml

@@ -53,7 +53,7 @@ Item {
     }
 
     function showConversation(conversationIndex,newsitemobject){
-        newsBusy.running=true;
+        //newsBusy.running=true;
         root.contactLoadType="conversation";
         newsStack.conversationIndex= conversationIndex;
         if(newsitemobject.messagetype==0){
@@ -65,6 +65,13 @@ Item {
         })}
     }
 
+    function showContact(contact){
+        var component = Qt.createComponent("qrc:/qml/contactqml/ContactDetailsComponent.qml");
+        if (component.status== Component.Ready){
+            var contactDetails = component.createObject(newstab,{"contact": contact})
+        }
+    }
+
     function onFriendsMessages(friend){
         newstab.newstabstatus="Contact"
        Newsjs.newsfromdb(db,root.login.username, function(dbnews){showNews(dbnews)},friend)
@@ -75,6 +82,8 @@ Item {
         newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"reply_to_user": friend,"directmessage":1,"login":root.login}});
     }
 
+
+
    StackView{
        id: newsStack
        anchors.fill:parent
@@ -100,7 +109,6 @@ Item {
 
            BlueButton {
                id: newMessageButton
-               width:10*mm
                text: "\uf040"
                onClicked: {
                    var groups=[];
@@ -115,7 +123,6 @@ Item {
            }
            BlueButton {
              id: quitButton
-             width:10*mm
              text: "\uf08b"
              onClicked: {Service.cleanNews(root.db,function(){Qt.quit() })}
            }
@@ -153,29 +160,29 @@ Item {
                  }
                  MouseArea{anchors.fill:parent
                      onClicked:{
-                      var currentTime= new Date();
+                        var currentTime= new Date();
-                      if(newstab.newstabstatus=="Timeline"){
+                        var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
-                            var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
+                         print("Lastnews ID "+lastnews_id+Qt.atob(newsModel.get(newsModel.count-1).newsitemobject.statusnet_html))
+                        if(newstab.newstabstatus=="Timeline"){
                             Newsjs.newsfromdb(root.db,root.login.username, function(news){
-                          var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                          newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                          },false,lastnews_id)}
+                            },false,lastnews_id)}
-                      if(newstab.newstabstatus=="Conversations"){
+                        if(newstab.newstabstatus=="Conversations"){
-                            var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
                             Newsjs.chatsfromdb(root.db,root.login.username, function(news){
-                          var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                          newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                          },lastnews_id)}
+                            },lastnews_id)}
-                      else if(newstab.newstabstatus=="Contact"){
+                        else if(newstab.newstabstatus=="Contact"){
-                          Newsjs.newsfromdb(root.db,root.login.username, function(news){
+                            Newsjs.newsfromdb(root.db,root.login.username, function(news){
-                            var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-                            newsWorker.sendMessage(msg);
+                                newsWorker.sendMessage(msg);
-                            },newsModel.get(newsModel.count-1).newsitemobject.uid,newsModel.get(newsModel.count-1).newsitemobject.created_at)}
+                            },newsModel.get(newsModel.count-1).newsitemobject.uid,lastnews_id)}
-                      }}
+                     }
-                  }
+                 }
+             }
         }
 
-
         ListView {
           id: newsView
           anchors.fill: parent
@@ -187,8 +194,8 @@ Item {
           footer: footerComponent
           model: newsModel
           delegate: Newsitem{}
-          //onContentYChanged:{if(contentY<-15*mm&&contentY>(-15*mm-1)){print("refreshing");
+          //onContentYChanged:{if(contentY<-8*mm&&contentY>(-8*mm-1)){print("refreshing");
-          onDragEnded:{if(contentY<-8*mm){//print("refreshing");
+          onDragEnded:{if(contentY<-5*mm){//print("refreshing");
                   newsBusy.running=true;
                   newstab.newstabstatus=login.newsViewType;
                   root.contactLoadType="news";