v.0.3.4

CHANGELOG.md

@@ -91,7 +91,16 @@
 
 
 ## v0.3.3 ##
-* Update for OpenSSL and Qt
-* Experimental support for Peertube (links are expanded for video widget)
-* Some unicode emojis
+* Update for OpenSSL and At
+* Experimental support for Peertube (links are expanded to video widget)
+* Some Unicode emojis
 * Redesign of contact details (click on contact opens in new stack and shows last news)
+
+
+## v0.3.4 ##
+* Direct message creation from profile page works again
+* Profile image upload works again
+* Viewing private album pictures of contacts works again
+* On first start servername from https://dir.friendica.social/servers/surprise selected
+* Register button opens webview of registration page on server
+

PrivacyPolicy.md

@@ -5,5 +5,5 @@ You have probably selected Friendica as your preferred social network because yo
 
 Storing some pieces of user data on the device is necessary for some app features, other apps on your device may not access this data (keeping app’s own database storage protected from other apps is guaranteed by Android). The app has been programmed so that stored information contain any personal data (only login data and id number of last seen post will be transferred to servers). Photos from the albums and contact images are stored in a public directory on the device. Other apps may access these files and the Friendiqa needs access to this directory.
 To send images from the Android gallery the app needs access to picture databases on the device.
-
 This app don’t collect any usage statistics. In addition, no information is sent from your Smartphone to me as a developer or to a website associated with me.
+On first start, the website https://dir.friendica.social/servers/surprise is contacted and the selected server shown in the app.

source-android/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.3.3" android:versionCode="10" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.3.4" android:versionCode="11" android:installLocation="auto">
     <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="androidnative.friendiqa.FriendiqaActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="">
             <intent-filter>

source-android/application.qrc

@@ -223,5 +223,7 @@
         <file>qml/newsqml/NewsImage.qml</file>
         <file>qml/newsqml/NewsVideo.qml</file>
         <file>qml/newsqml/ContactPage.qml</file>
+        <file>qml/newsqml/NewsLink.qml</file>
+        <file>qml/configqml/RegisterPage.qml</file>
     </qresource>
 </RCC>

source-android/friendiqa.pro

@@ -13,7 +13,7 @@
 TEMPLATE = app
 TARGET = friendiqa
 CONFIG += release
-QT += qml quick gui widgets androidextras
+QT += qml quick gui widgets androidextras sql webview
 
 include(androidnative.pri/androidnative.pri)
 

source-android/js/friendworker.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/js/helper.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -151,7 +151,7 @@ var where = " AND "+ filter +" = '" + filtervalue+"'";
  });
 }
 
-function showMessage(header,message,rootwindow){
+function showMessage(header,message,rootwindow){print(message);
     var cleanmessage=message.replace(/"/g,"-");
     if(cleanmessage.length>200){cleanmessage=cleanmessage.slice(0,200)+'...'}
     var messageString='import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:"'+header+'";standardButtons: StandardButton.Ok; text:" '+cleanmessage+'"}';

source-android/js/image.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -175,7 +175,6 @@ function deleteContacts(database,user,callback) { // does nothing useful at the
 function newRequestFriendsAlbumPictures(login,friend,rootwindow,callback){
 // screenscraping of albums page of contact with remoteAuth
     Helperjs.friendicaRemoteAuthRequest(login,friend.url.replace("profile","photos"),friend.url,rootwindow,function(photohtml){
-            //print("Photohtml: "+photohtml);
         try {var obj=JSON.parse(photohtml);
             if (obj.hasOwnProperty('status')){
                 Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){

source-android/js/layout.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/js/news.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -465,7 +465,7 @@ function chatsfromdb(database,user,callback,stop_time){
         helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
         helpernews.text=Qt.atob(helpernews.text);
         helpernews.id=helpernews.status_id;
-        if (helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
+        if (helpernews.attachments!==null){print(Qt.atob(helpernews.attachments));helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
         newsArray.push(helpernews);
     }
     callback(newsArray);

source-android/js/newsworker.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 
 function findend (text, startpos) {
     var indexOf = text.substring(startpos || 0).search(/\s/);
-    return (indexOf >= 0) ? (indexOf + (startpos || 0)) : indexOf;
+    return (indexOf >= 0) ? (indexOf + (startpos || 0)) : text.length;
 }
 
 
@@ -135,6 +135,20 @@ else{
                if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)}
            }
       }
+//        if (newsitemobject.text.indexOf(".html")>-1){
+//            //print("message "+msg.options.showWebsiteForLinks);
+//           if (msg.options.showWebsiteForLinks!="false"){
+//               var linkhelper={mimetype:"text/html"}
+//               var linktext=newsitemobject.text;
+//               while (linktext.indexOf(".html")>-1){
+//                   var linkhelperstringposition=linktext.indexOf(".html");
+//                   var linkposend=findend(linktext,linkhelperstringposition);
+//                   linkhelper.url=linktext.substring(linktext.lastIndexOf("http",linkhelperstringposition),linkposend);
+//                   linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
+//                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
+//               }
+//           }
+//      }
 
         newsitemobject.attachmentList=attachmentList;
 

source-android/js/photoworker.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/js/service.js

@@ -1,4 +1,5 @@
-//  This file is part of Friendiqa //  https://github.com/lubuwest/Friendiqa
+//  This file is part of Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -48,6 +49,7 @@ function initDatabase(database) { // initialize the database object
            tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(username TEXT, id INT, profiledata TEXT)');
         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 globaloptions(k TEXT, v TEXT)')
 })}
 
 function cleanPermissions(oldperms){
@@ -293,6 +295,31 @@ function readActiveConfig(database){
   return obj;
 }
 
+function readGlobaloptions(database,callback){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    var go=({});
+    db.transaction( function(tx) {
+        var rs = tx.executeSql('select * from globaloptions');
+        for (var r=0; r<rs.rows.length; r++){
+            go[rs.rows.item(r).k]=rs.rows.item(r).v
+        }
+        callback(go)
+    })
+
+}
+
+function updateglobaloptions(database,key,value){
+    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+    db.transaction( function(tx) {
+        var result = tx.executeSql('SELECT * from globaloptions where k="'+key+'"'); // check for key
+        if(result.rows.length === 1) {// use update
+            result = tx.executeSql('UPDATE globaloptions SET v="'+value+'" WHERE k="'+key+'"')
+        } else {// use insert
+                result = tx.executeSql('INSERT INTO globaloptions (k,v) VALUES (?,?)', [key,value])
+        }
+    })
+ }
+
 function deleteConfig(database,userobj,callback) { // delete user data from DB
     if (userobj){var where = " WHERE username='"+ userobj.username+"' and server='"+userobj.server+"'";} else { return "no user selected!";}
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@@ -486,6 +513,9 @@ function updateView(viewtype){
     //downloadNotice.text="xhr start "+Date.now()
     switch(viewtype){
         case "Conversations":
+//            updatenews.setDatabase();
+//            updatenews.login();
+//            updatenews.timeline();
             var lastnews=Newsjs.getLastNews(login,db);
             xhr.setLogin(login.username+":"+Qt.atob(login.password));
             xhr.setUrl(login.server);
@@ -495,6 +525,9 @@ function updateView(viewtype){
             xhr.setParam("count",50)
             break;
         case "Timeline":
+//             updatenews.setDatabase();
+//            updatenews.login();
+//            updatenews.timeline();
             var lastnews=Newsjs.getLastNews(login,db);
             xhr.setLogin(login.username+":"+Qt.atob(login.password));
             xhr.setUrl(login.server);

source-android/js/smiley.js

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/calendarqml/CalendarDay.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/calendarqml/CalendarTab.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/calendarqml/EventList.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/configqml/ConfigTab.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -123,6 +123,11 @@ StackView{
         visible: false
         x: 4*mm; y: 70*mm; width:20*mm;wrapMode: Text.Wrap
       }
+      
+//      Text {
+//          text: qsTr("Show Website")
+//          x: 4*mm; y: 70*mm; width: 20*mm
+//      }
 
         Image{
             id:servericon
@@ -176,12 +181,15 @@ StackView{
 
      Rectangle{
          color: "light grey"
-         x: 25*mm; y: 20*mm; width: root.width/2; height: 5*mm;
+         x: 25*mm; y: 20*mm; width: root.width/2-9*mm; height: 5*mm;
          TextInput {
              id: username
              anchors.fill: parent
              selectByMouse: true
-             //onEditingFinished:{
+            onEditingFinished:{
+                if (username.text.indexOf('@')>-1){
+                    Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground)
+                }
              //    Helperjs.friendicaWebRequest(servername.text+'/api/users/show?screen_name='+username.text,configBackground,function(obj){
              //        var screennametest=JSON.parse(obj);
             //         if (screennametest.hasOwnProperty('status')){
@@ -190,8 +198,16 @@ StackView{
            //          }else{configBackground.registeredUser=true}
            //      });
            //  }
-        }
+            }
+         }
     }
+     BlueButton {
+         x: root.width/2+18*mm; y: 20*mm; width:7*mm
+         text: "\uf234"
+         onClicked: {
+             configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
+         }
+     }
 
     Rectangle{
         color: "light grey"
@@ -284,6 +300,23 @@ StackView{
      }
 
 
+
+//    CheckBox{
+//        id:showwebsiteCheckbox
+//        x:35*mm;y:70*mm
+//        onClicked:{
+//            if (checked==true){
+//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
+//                root.globaloptions.showWebsiteForLinks="true"
+//            }
+//            else {
+//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","false")
+//                root.globaloptions.showWebsiteForLinks="false"
+//            }
+//        }
+        
+//    }
+
     BlueButton {
     x: 25*mm; y: 78*mm
     text: qsTr("Confirm")
@@ -328,6 +361,8 @@ StackView{
          else {Helperjs.showMessage(qsTr("Error"), errormessage,root)}
     }}
 
+
+
     BlueButton {
     x: root.width/2+2*mm; y: mm; width: 5*mm; height: 5*mm;
     text: "-"
@@ -413,8 +448,18 @@ StackView{
             messageIntervalSlider.value=obj.timerInterval;
             if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0
             )
+          })
+            //Service.readGlobaloptions(db,function(go){
+//                if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
+            //})
+  
+          }
+      catch (e){
+          Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){
+              var bpos=html.indexOf("baseurl");
+              var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos)));
+              servername.text=baseurl
           })}
-      catch (e){print(e)}
     }
 }
 }

source-android/qml/configqml/InfoBox.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@ Rectangle{
         textFormat: Text.RichText
         width: parent.width
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        text: "<b>Friendiqa v0.3.3 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
+        text: "<b>Friendiqa v0.3.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
               "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+
               "Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+
                "Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+

source-android/qml/configqml/OSSettingsAndroid.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/configqml/OSSettingsLinux.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/configqml/RegisterPage.qml

@@ -0,0 +1,61 @@
+//  This file is part of Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
+//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  In addition, as a special exception, the copyright holders give
+//  permission to link the code of portions of this program with the
+//  OpenSSL library under certain conditions as described in each
+//  individual source file, and distribute linked combinations including
+//  the two.
+//
+//  You must obey the GNU General Public License in all respects for all
+//  of the code used other than OpenSSL. If you modify file(s) with this
+//  exception, you may extend this exception to your version of the
+//  file(s), but you are not obligated to do so. If you do not wish to do
+//  so, delete this exception statement from your version. If you delete
+//  this exception statement from all source files in the program, then
+//  also delete it here.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import QtQuick 2.9
+import QtWebView 1.1
+import "qrc:/qml/genericqml"
+
+Rectangle{
+    color:"white"
+    //border.color: "light grey"
+    property alias url:htmlview.url
+    width:root.width-5*mm
+    height:root.height-12*mm
+
+    WebView {id:htmlview;
+        height:parent.height-7*mm
+        width:parent.width
+        y:7*mm
+        MouseArea {anchors.fill:parent;
+            onClicked:{print(url)}
+        }
+        onLoadingChanged: print(loadProgress)
+    }
+    BlueButton{
+        id:closeButton
+        anchors.top: parent.top
+        anchors.topMargin: 1*mm
+        anchors.right: parent.right
+        anchors.rightMargin: 1*mm
+        text:   "\uf057"
+        onClicked:{configStack.pop()}
+     }
+}

source-android/qml/contactqml/ContactComponent.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/contactqml/ContactDetailsComponent.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -113,7 +113,7 @@ Rectangle{
                     fotostab.phototabstatus="Contact";
                     root.currentIndex=2;
                     fotostab.active=true;
-                    root.fotoSignal(root.login,contact) ;
+                    root.fotoSignal(contact) ;
                     contactLargeComponent.destroy();
                     }
              }

source-android/qml/contactqml/Contactlist.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/contactqml/FriendsTab.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/contactqml/GroupComponent.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/contactqml/ProfileComponent.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -141,6 +141,7 @@ Rectangle {
         MouseArea{
                 anchors.fill: parent
                 onClicked:{
+                    imagePicking=true;
                     var imagePicker = Qt.createQmlObject('import QtQuick 2.0; import "qrc:/qml/genericqml";'+
                     osSettings.imagePickQml+'{multiple: false;onReady: {photoImage.source=imageUrl;'+
                     '}}',profileGridTab,"imagePicker");

source-android/qml/friendiqa.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -56,10 +56,11 @@ TabView{
 
     property var db: ["Friendiqa", "1.0", "Stores Friendica data", 100000000]
     property var login: Service.readActiveConfig(db)
+    property var globaloptions: ({}) //Service.readGlobaloptions(db)
     property var contactlist: []
     property real mm: Screen.pixelDensity
     signal messageSignal(var friend)
-    signal fotoSignal(var login, var friend)
+    signal fotoSignal(var username, var friend)
     signal directmessageSignal(var friend)
     signal newsSignal(var news)
     signal friendsSignal(var username)
@@ -191,6 +192,7 @@ TabView{
         source: (root.currentIndex==4)?"qrc:/qml/configqml/ConfigTab.qml":""
     }
     Component.onCompleted: {
+        Service.readGlobaloptions(db,function(go){globaloptions=go})
         //print(xhr.networktype);
         if(osSettings.imagePickQml=="ImagePicker"){var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml");
             var IntentReceiverQml = component.createObject(root)

source-android/qml/newsqml/ContactPage.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -110,7 +110,6 @@ Rectangle {
                           onClicked:{
                               currentIndex=0;
                               directmessageSignal(contact.screen_name)
-                              newsStack.pop()
                           }
                       }
 
@@ -126,7 +125,7 @@ Rectangle {
                           }
                       }
 
-                  }//Row end
+                  }//Column end
                Label {
                    id: namelabel
                    x:mm
@@ -168,7 +167,7 @@ Rectangle {
             contactBusy.running=false;
             contactModel.clear();
             var currentTime= new Date();
-            var msg = {'currentTime': currentTime, 'model': contactModel,'news':newstab.contactposts};
+            var msg = {'currentTime': currentTime, 'model': contactModel,'news':newstab.contactposts, 'options':globaloptions};
             contactWorker.sendMessage(msg)
         }
     }

source-android/qml/newsqml/Conversation.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -81,7 +81,7 @@ Rectangle {
                 } else { conversationBusy.running=false;
                   conversationModel.clear();
                   var currentTime= new Date();
-                  var msg = {'currentTime': currentTime, 'model': conversationModel,'news':newstab.conversation};
+                  var msg = {'currentTime': currentTime, 'model': conversationModel,'news':newstab.conversation, 'options':globaloptions};
                   conversationWorker.sendMessage(msg)
                   //conversationsymbol.color="grey"
                 }
@@ -112,7 +112,7 @@ Rectangle {
                 wrapMode: Text.Wrap
                 anchors.fill: parent
                 selectByMouse: true
-                onHeightChanged: newsView.contentY+=4.5*mm
+                onHeightChanged: conversationView.contentY+=4.5*mm
                 }
            }
 

source-android/qml/newsqml/FriendicaActivities.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/Hashtag.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/MessageSend.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/NewsImage.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/NewsLink.qml

@@ -0,0 +1,52 @@
+//  This file is part of Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
+//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  In addition, as a special exception, the copyright holders give
+//  permission to link the code of portions of this program with the
+//  OpenSSL library under certain conditions as described in each
+//  individual source file, and distribute linked combinations including
+//  the two.
+//
+//  You must obey the GNU General Public License in all respects for all
+//  of the code used other than OpenSSL. If you modify file(s) with this
+//  exception, you may extend this exception to your version of the
+//  file(s), but you are not obligated to do so. If you do not wish to do
+//  so, delete this exception statement from your version. If you delete
+//  this exception statement from all source files in the program, then
+//  also delete it here.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import QtQuick 2.9
+import "qrc:/js/helper.js" as Helperjs
+//import QtWebView 1.1
+
+Rectangle{
+    color:"transparent"
+    width:newscolumn.width;
+    height:newscolumn.width/4*3
+    property string url:""//htmlview.text
+
+    Text{id:htmlview
+        textFormat:Text.RichText
+    }
+//    WebView {id:htmlview;
+//        anchors.fill: parent
+//    }
+    Component.onCompleted: //Helperjs.friendicaWebRequest(url,parent,function(html){
+        //print(html);
+        htmlview.text="Text <iframe src='"+url+"' width = '300px' height = '300px'>"
+    //})
+}

source-android/qml/newsqml/NewsTab.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -87,7 +87,7 @@ Item {
        var currentTime= new Date();
       // downloadNotice.text=downloadNotice.text + "\n shownews start "+ Date.now();
        //print("appendnews "+newsStack.appendNews +JSON.stringify(newsToShow))
-       var msg = {'currentTime': currentTime, 'model': newsModel,'news':newsToShow,'method':newsStack.updateMethodNews};
+       var msg = {'currentTime': currentTime, 'model': newsModel,'news':newsToShow,'method':newsStack.updateMethodNews, 'options':globaloptions};
        newsWorker.sendMessage(msg);
        //newsStack.appendNews=false
     }
@@ -146,8 +146,8 @@ Item {
     }
 
     function onDirectMessage(friend){
-        newstab.newstabstatus="SendMessage"
-        newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"reply_to_user": friend,"directmessage":1,"login":root.login}});
+        //newstab.newstabstatus="SendMessage" ,"login":login ,
+        newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"reply_to_user": friend,"directmessage":1, "login":root.login}});
     }
 
     function sendUrls(urls){print(root.currentIndex==0);
@@ -335,12 +335,12 @@ Item {
                         var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
                         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, 'options':globaloptions};
                                 newsWorker.sendMessage(msg);
                             },false,lastnews_id)}
                         if(newstab.newstabstatus=="Conversations"){
                             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, 'options':globaloptions};
                                 newsWorker.sendMessage(msg);
                             },lastnews_id)}
 //                        else if(newstab.newstabstatus=="Contact"){
@@ -424,8 +424,8 @@ Item {
            root.uploadSignal.connect(sendUrls);
            root.sendtextSignal.connect(sendtext);
            try{newsModel.clear()} catch(e){}
-           xhr.setLogin(login.username+":"+Qt.atob(login.password));
-           xhr.setUrl(login.server);
+//           xhr.setLogin(login.username+":"+Qt.atob(login.password));
+//           xhr.setUrl(login.server);
             if(root.news.length>0){showNews(root.news)}
             else{ newstab.newstabstatus=login.newsViewType; 
                 if(login.newsViewType=="Timeline"){Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}

source-android/qml/newsqml/NewsVideo.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/Newsitem.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -134,11 +134,8 @@ Item {
                 MouseArea{
                     anchors.fill:parent
                     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);
+                        newsStack.push("qrc:/qml/newsqml/Conversation.qml");
+                        showConversation(index,newsitemobject)
                     }
                 }
             }
@@ -186,7 +183,12 @@ Item {
                         if(newsitemobject.attachmentList[attachments].mimetype.substring(0,5)=="image"){
                             var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml");
                             var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
-                        } else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
+                        }
+//                        else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){
+//                            var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml");
+//                            var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url});
+//                        }
+                        else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
                             var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml");
                             var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
 }
@@ -459,6 +461,15 @@ Item {
                 })
             }
         }
+        MenuItem {
+            text: qsTr("Post")
+            onTriggered: {
+                Helperjs.friendicaPostRequest(root.login,"/item","preview=1&"+encodeURIComponent(newsitemobject.text),"POST",root,function(reply){
+                   print(reply)
+                })
+            }
+        }
+
         //MenuItem{
         //    text:qsTr("Show on website")
         //    onTriggered:Qt.openUrlExternally(login.server+"/display/"+newsitemobject

source-android/qml/newsqml/PermissionDialog.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/newsqml/SmileyDialog.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify

source-android/qml/photoqml/ImageUploadDialog.qml

@@ -1,5 +1,5 @@
 //  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
 //  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
 //
 //  This program is free software: you can redistribute it and/or modify