Merge pull request #10 from adyNabeelMadain/master

Proxy needs to go to https (except Android make it use HTTP)

Author: DanielHindi

control/content/app.services.js

@@ -64,25 +64,25 @@
       }
     }])
     .factory("Utils", ["$http", '$q', 'PROXY_SERVER', function ($http, $q, PROXY_SERVER) {
-        return {
-          validateUrl: function (url) {
-            var deferred = $q.defer();
-            if (!url) {
-              deferred.reject(new Error('Undefined feed url'));
-            }
-            $http.post(PROXY_SERVER.serverUrl + '/validateJotFormUrl', {
-              url: url
-            }).success(function (response) {
-                  if (response)
-                    deferred.resolve(response);
-                  else
-                    deferred.resolve(null);
-                })
-                .error(function (error) {
-                  deferred.reject(error);
-                });
-            return deferred.promise;
+      return {
+        validateUrl: function (url) {
+          var deferred = $q.defer();
+          if (!url) {
+            deferred.reject(new Error('Undefined feed url'));
           }
+          $http.post(PROXY_SERVER.serverUrl + '/validateJotFormUrl', {
+            url: url
+          }).success(function (response) {
+            if (response)
+              deferred.resolve(response);
+            else
+              deferred.resolve(null);
+          })
+            .error(function (error) {
+              deferred.reject(error);
+            });
+          return deferred.promise;
         }
+      }
     }]);
 })(window.angular, window.buildfire);

control/content/enums.js

@@ -22,7 +22,7 @@
             NOT_ITEM_ARRAY: 'Array of Items not provided',
             ITEM_ARRAY_FOUND: 'Array of Items provided'
         })
-      .constant('PROXY_SERVER', {
-        serverUrl: "http://proxy.buildfire.com"
-      });
+        .constant('PROXY_SERVER', {
+            serverUrl: 'https://proxy.buildfire.com'
+        });
 })(window.angular);