thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Move isConnectionLimited into OSystem

Browse source
This commit is contained in:
Cameron Cawley 2019-06-20 21:14:04 +01:00 • committed by Filippos Karapetis
parent b49c7fa644
commit b9e29cedfc
9 changed files with 18 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backends/module.mk
View file

@ -156,15 +156,6 @@ MODULE_OBJS += \
endif
endif
# Connection::isLimited
ifeq ($(BACKEND),android)
MODULE_OBJS += \
networking/connection/islimited-android.o
else
MODULE_OBJS += \
networking/connection/islimited-default.o
endif
ifdef POSIX
MODULE_OBJS += \
fs/posix/posix-fs.o \

35
backends/networking/connection/islimited-android.cpp
View file

@ -1,35 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 2
* of the License, or (at your option) any later version.
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "backends/networking/connection/islimited.h"
#include "backends/platform/android/jni.h"
namespace Networking {
namespace Connection {
bool isLimited() {
return JNI::isConnectionLimited();
}
} // End of namespace Connection
} // End of namespace Networking

36
backends/networking/connection/islimited-default.cpp
View file

@ -1,36 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 2
* of the License, or (at your option) any later version.
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "backends/networking/connection/islimited.h"
#include "common/textconsole.h"
namespace Networking {
namespace Connection {
bool isLimited() {
warning("Networking::Connection::isLimited(): not limited by default");
return false;
}
} // End of namespace Connection
} // End of namespace Networking

39
backends/networking/connection/islimited.h
View file

@ -1,39 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 2
* of the License, or (at your option) any later version.
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef NETWORKING_CONNECTION_ISLIMITED_H
#define NETWORKING_CONNECTION_ISLIMITED_H
namespace Networking {
namespace Connection {
/**
* Returns whether connection's limited (if available on the target system).
*
* Returns true if connection seems limited.
*/
bool isLimited();
} // End of namespace Connection
} // End of namespace Networking
#endif /*NETWORKING_CONNECTION_ISLIMITED_H*/

4
backends/platform/android/android.cpp
View file

@ -603,6 +603,10 @@ bool OSystem_Android::setTextInClipboard(const Common::String &text) {
return JNI::setTextInClipboard(text);
}
bool OSystem_Android::isConnectionLimited() {
return JNI::isConnectionLimited();
}
Common::String OSystem_Android::getSystemProperty(const char *name) const {
char value[PROP_VALUE_MAX];

1
backends/platform/android/android.h
View file

@ -293,6 +293,7 @@ public:
virtual bool hasTextInClipboard();
virtual Common::String getTextFromClipboard();
virtual bool setTextInClipboard(const Common::String &text);
virtual bool isConnectionLimited();
virtual Common::String getSystemLanguage() const;
};

5
common/system.cpp
View file

@ -192,6 +192,11 @@ Common::String OSystem::getSystemLanguage() const {
return "en_US";
}
bool OSystem::isConnectionLimited() {
warning("OSystem::isConnectionLimited(): not limited by default");
return false;
}
Common::TimerManager *OSystem::getTimerManager() {
return _timerManager;
}

7
common/system.h
View file

@ -1482,6 +1482,13 @@ public:
*/
virtual Common::String getSystemLanguage() const;
/**
* Returns whether connection's limited (if available on the target system).
*
* Returns true if connection seems limited.
*/
virtual bool isConnectionLimited();
//@}
};

3
gui/downloaddialog.cpp
View file

@ -22,7 +22,6 @@
#include "gui/downloaddialog.h"
#include "backends/cloud/cloudmanager.h"
#include "backends/networking/connection/islimited.h"
#include "common/config-manager.h"
#include "common/translation.h"
#include "engines/metaengine.h"
@ -114,7 +113,7 @@ void DownloadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
}
bool DownloadDialog::selectDirectories() {
if (Networking::Connection::isLimited()) {
if (g_system->isConnectionLimited()) {
MessageDialog alert(_("It looks like your connection is limited. "
"Do you really want to download files with it?"), _("Yes"), _("No"));
if (alert.runModal() != GUI::kMessageOK)