prevent warning when user is not logged in

[grauphel.git] / controller / apicontroller.php

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index ee16f801f8e77570fe4abd0a596a615e4c990e44..688d0b0a47d36920d78634329233e3590648420b 100644 (file)
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -16,6 +16,7 @@ namespace OCA\Grauphel\Controller;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\JSONResponse;
 
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\JSONResponse;
 

+use \OCA\Grauphel\Lib\Client;

 use \OCA\Grauphel\Lib\NoteStorage;
 use \OCA\Grauphel\Lib\OAuth;
 use \OCA\Grauphel\Lib\OAuthException;
 use \OCA\Grauphel\Lib\NoteStorage;
 use \OCA\Grauphel\Lib\OAuth;
 use \OCA\Grauphel\Lib\OAuthException;


@@ -105,10 +106,10 @@ class ApiController extends Controller
             'api-version' => '1.0',
         );
 
             'api-version' => '1.0',
         );
 

-        $client = $this->getClient();
+        $cl = new Client();
+        $client = $cl->getClient();

         if ($client !== false) {
         if ($client !== false) {

-            $data['oauth_authorize_url'] .= '?client='
-                . urlencode($this->getNiceClientName($client));
+            $data['oauth_authorize_url'] .= '?client=' . urlencode($client);

         }
 
         if ($authenticated) {
         }
 
         if ($authenticated) {


@@ -333,31 +334,6 @@ class ApiController extends Controller
         return new JSONResponse($note);
     }
 
         return new JSONResponse($note);
     }
 

-    protected function getClient()
-    {
-        if (isset($_SERVER['HTTP_X_TOMBOY_CLIENT'])) {
-            $client = $_SERVER['HTTP_X_TOMBOY_CLIENT'];
-            $doublepos = strpos($client, ', org.tomdroid');
-            if ($doublepos !== false) {
-                //https://bugs.launchpad.net/tomdroid/+bug/1375436
-                //X-Tomboy-Client header is sent twice
-                $client = substr($client, 0, $doublepos);
-            }
-            return $client;
-        }
-
-        return false;
-    }
-
-    protected function getNiceClientName($client)
-    {
-        if (substr($client, 0, 12) == 'org.tomdroid') {
-            //org.tomdroid v0.7.5, build 14, Android v4.4.2, innotek GmbH/VirtualBox
-            return 'Tomdroid';
-        }
-        return $client;
-    }
-

     /**
      * Checks if the given user is authorized (by oauth token or normal login)
      *
     /**
      * Checks if the given user is authorized (by oauth token or normal login)
      *