You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/10/02 01:53:58 UTC

[1/2] spec commit: cordova-plugin-whitelist: add ubuntu support

Repository: cordova-mobile-spec
Updated Branches:
  refs/heads/master 3bf698ab1 -> 902e4207b


cordova-plugin-whitelist: add ubuntu support


Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/eccc2210
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/eccc2210
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/eccc2210

Branch: refs/heads/master
Commit: eccc2210139a654ce45fd0414a5e39f92f39b254
Parents: a7af0cf
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Wed Oct 1 22:27:55 2014 +0400
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Wed Oct 1 22:27:55 2014 +0400

----------------------------------------------------------------------
 cordova-plugin-whitelist/plugin.xml             |  6 +++
 .../src/ubuntu/whitelist.cpp                    | 35 +++++++++++++++
 cordova-plugin-whitelist/src/ubuntu/whitelist.h | 46 ++++++++++++++++++++
 3 files changed, 87 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/eccc2210/cordova-plugin-whitelist/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-plugin-whitelist/plugin.xml b/cordova-plugin-whitelist/plugin.xml
index 71f49ae..49ea5fd 100644
--- a/cordova-plugin-whitelist/plugin.xml
+++ b/cordova-plugin-whitelist/plugin.xml
@@ -50,6 +50,12 @@
         <source-file src="src/android/WhitelistAPI.java" target-dir="src/org/apache/cordova/test" />
     </platform>
 
+    <!-- ubuntu -->
+    <platform name="ubuntu">
+        <header-file src="src/ubuntu/whitelist.h" />
+        <source-file src="src/ubuntu/whitelist.cpp" />
+    </platform>
+
     <!-- ios -->
     <platform name="ios">
         <config-file target="config.xml" parent="/*">

http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/eccc2210/cordova-plugin-whitelist/src/ubuntu/whitelist.cpp
----------------------------------------------------------------------
diff --git a/cordova-plugin-whitelist/src/ubuntu/whitelist.cpp b/cordova-plugin-whitelist/src/ubuntu/whitelist.cpp
new file mode 100644
index 0000000..4d37a61
--- /dev/null
+++ b/cordova-plugin-whitelist/src/ubuntu/whitelist.cpp
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2014 Canonical Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "whitelist.h"
+#include <cordova_whitelist.hpp>
+
+Whitelist::Whitelist(Cordova *cordova): CPlugin(cordova) {
+}
+
+void Whitelist::URLMatchesPatterns(int scId, int ecId, const QString &url, const QList<QString> &patterns) {
+    CordovaInternal::WhiteList whitelist;
+    for (const QString &pattern: patterns) {
+        whitelist.addWhiteListEntry(pattern, false);
+    }
+    bool isAllowed = whitelist.isUrlWhiteListed(url);
+    cb(scId, isAllowed);
+}
+
+void Whitelist::URLIsAllowed(int scId, int ecId, const QString &url) {
+    bool isAllowed = m_cordova->config().whitelist().isUrlWhiteListed(url);
+    cb(scId, isAllowed);
+}

http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/eccc2210/cordova-plugin-whitelist/src/ubuntu/whitelist.h
----------------------------------------------------------------------
diff --git a/cordova-plugin-whitelist/src/ubuntu/whitelist.h b/cordova-plugin-whitelist/src/ubuntu/whitelist.h
new file mode 100644
index 0000000..ecf2228
--- /dev/null
+++ b/cordova-plugin-whitelist/src/ubuntu/whitelist.h
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2014 Canonical Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef WHITELIST_HKJBNNB90NM53452
+#define WHITELIST_HKJBNNB90NM53452
+
+#include <QtCore>
+
+#include <cplugin.h>
+#include <cordova.h>
+
+class Whitelist: public CPlugin {
+    Q_OBJECT
+public:
+    explicit Whitelist(Cordova *cordova);
+
+    virtual const QString fullName() override {
+        return Whitelist::fullID();
+    }
+
+    virtual const QString shortName() override {
+        return Whitelist::fullID();
+    }
+
+    static const QString fullID() {
+        return "WhitelistAPI";
+    }
+public slots:
+    void URLMatchesPatterns(int scId, int ecId, const QString &url, const QList<QString> &patterns);
+    void URLIsAllowed(int scId, int ecId, const QString &url);
+};
+
+#endif


[2/2] spec commit: Merge branch 'master' of https://github.com/Zaspire/cordova-mobile-spec

Posted by st...@apache.org.
Merge branch 'master' of https://github.com/Zaspire/cordova-mobile-spec


Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/902e4207
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/902e4207
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/902e4207

Branch: refs/heads/master
Commit: 902e4207b26140a18277fab2e39b0fba08c8e6e5
Parents: 3bf698a eccc221
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 1 16:53:48 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 1 16:53:48 2014 -0700

----------------------------------------------------------------------
 cordova-plugin-whitelist/plugin.xml             |  6 +++
 .../src/ubuntu/whitelist.cpp                    | 35 +++++++++++++++
 cordova-plugin-whitelist/src/ubuntu/whitelist.h | 46 ++++++++++++++++++++
 3 files changed, 87 insertions(+)
----------------------------------------------------------------------