Merge pull request #7074 from MrPetovan/task/move-display-to-src

Remove support for defunct Friendica F-Droid app
This commit is contained in:
Philipp 2019-05-02 23:55:54 +02:00 committed by GitHub
commit 97f723e09e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 126 deletions

View file

@ -87,11 +87,6 @@ class App
*/
private $baseURL;
/**
* @var bool true, if the call is from the Friendica APP, otherwise false
*/
private $isFriendicaApp;
/**
* @var bool true, if the call is from an backend node (f.e. worker)
*/
@ -257,8 +252,6 @@ class App
$this->profiler = $profiler;
$this->logger = $logger;
$this->checkFriendicaApp();
$this->profiler->reset();
$this->reload();
@ -601,28 +594,6 @@ class App
$this->getBaseURL();
}
/**
* Checks, if the call is from the Friendica App
*
* Reason:
* The friendica client has problems with the GUID in the notify. this is some workaround
*/
private function checkFriendicaApp()
{
// Friendica-Client
$this->isFriendicaApp = isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)';
}
/**
* Is the call via the Friendica app? (not a "normale" call)
*
* @return bool true if it's from the Friendica app
*/
public function isFriendicaApp()
{
return $this->isFriendicaApp;
}
/**
* @brief Checks if the site is called via a backend process
*