ANDROID: Move isConnectionLimited into OSystem

6 files changed, 5 insertions, 119 deletions

diff --git a/backends/module.mk b/backends/module.mk
index e85e9d1901..22b4a63371 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -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 \
diff --git a/backends/networking/connection/islimited-android.cpp b/backends/networking/connection/islimited-android.cpp
deleted file mode 100644
index 8989f218ec..0000000000
--- a/backends/networking/connection/islimited-android.cpp
+++ /dev/null
@@ -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
-
diff --git a/backends/networking/connection/islimited-default.cpp b/backends/networking/connection/islimited-default.cpp
deleted file mode 100644
index a993077fff..0000000000
--- a/backends/networking/connection/islimited-default.cpp
+++ /dev/null
@@ -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
-
diff --git a/backends/networking/connection/islimited.h b/backends/networking/connection/islimited.h
deleted file mode 100644
index b23d31d157..0000000000
--- a/backends/networking/connection/islimited.h
+++ /dev/null
@@ -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*/
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index beb9516fea..4f1b852d26 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -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];
 
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 64c4d9c3f5..d88df6b15f 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -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;
 };