Skip to content

Commit f0bc4f0

Browse files
mwbrookspurplecabbage
mwbrooks
authored and
purplecabbage
committed
clean up conflicts. merging commet-prototype
1 parent 98d1716 commit f0bc4f0

File tree

2 files changed

+80
-70
lines changed

2 files changed

+80
-70
lines changed

‎config.xml

+4
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<icon density="xhdpi" src="resources/icon/android/icon-96.png" />
6363
<resource-file src="google-services.json" target="google-services.json" />
6464
</platform>
65+
6566
<engine name="android" spec="~6.4.0" />
6667
<engine name="ios" spec="^4.5.3" />
6768
<plugin name="cordova-plugin-battery-status" spec="^1.2.5" />
@@ -106,4 +107,7 @@
106107
<variable name="FCM_VERSION" value="11.0.1" />
107108
</plugin>
108109
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
110+
111+
<allow-navigation href="*" />
112+
109113
</widget>

‎www/js/app.js

+76-70
Original file line numberDiff line numberDiff line change
@@ -193,85 +193,91 @@
193193
// don't allow the screen to dim when serving an app
194194
window.plugins.insomnia.keepAwake();
195195

196-
setTimeout(function () {
197-
analyticInfo = window.phonegap.app.analytic.basicGELF();
198-
analyticInfo.short_message = 'connection submit';
199-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
200-
201-
window.phonegap.app.downloadZip({
202-
address: getAddress(),
203-
onProgress: function (data) {
204-
if (data.status === 1) {
205-
if (!analyticDownloadToggle) {
196+
if (getAddress().match('adobe.ly')) {
197+
var addy = getAddress();
198+
window.location.href = addy;
199+
} else {
200+
201+
setTimeout(function () {
202+
analyticInfo = window.phonegap.app.analytic.basicGELF();
203+
analyticInfo.short_message = 'connection submit';
204+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
205+
206+
window.phonegap.app.downloadZip({
207+
address: getAddress(),
208+
onProgress: function (data) {
209+
if (data.status === 1) {
210+
if (!analyticDownloadToggle) {
211+
analyticInfo = window.phonegap.app.analytic.basicGELF();
212+
analyticInfo.short_message = 'connection download';
213+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
214+
analyticDownloadToggle = true;
215+
}
216+
} else if (data.status === 2) {
217+
if (!analyticExtractToggle) {
218+
analyticInfo = window.phonegap.app.analytic.basicGELF();
219+
analyticInfo.short_message = 'connection extract';
220+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
221+
analyticExtractToggle = true;
222+
}
223+
224+
clearAlternatingPulsingMessage(msgTimer);
225+
updateMessage('Extracting...');
226+
} else if (data.status === 3) {
206227
analyticInfo = window.phonegap.app.analytic.basicGELF();
207-
analyticInfo.short_message = 'connection download';
228+
analyticInfo.short_message = 'connection success';
208229
window.phonegap.app.analytic.logEvent(config, analyticInfo);
209-
analyticDownloadToggle = true;
230+
clearAlternatingPulsingMessage(msgTimer);
231+
updateMessage('Success!');
210232
}
211-
} else if (data.status === 2) {
212-
if (!analyticExtractToggle) {
213-
analyticInfo = window.phonegap.app.analytic.basicGELF();
214-
analyticInfo.short_message = 'connection extract';
215-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
216-
analyticExtractToggle = true;
233+
},
234+
onDownloadError: function (e) {
235+
clearAlternatingPulsingMessage(msgTimer);
236+
onBuildSubmitError('Download Error!');
237+
var errorString = 'Unable to download archive from the server.\n\n';
238+
239+
if (e) {
240+
// fix for wp8 since it returns an object as opposed to just an int
241+
if (e.code) e.type = e.code;
242+
243+
if (e.type === 1) {
244+
analyticInfo = window.phonegap.app.analytic.basicGELF();
245+
analyticInfo.short_message = 'connection failure';
246+
analyticInfo._error_msg = 'invalid url';
247+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
248+
errorString += 'Please enter a valid url to connect to.';
249+
} else if (e.type === 2) {
250+
analyticInfo = window.phonegap.app.analytic.basicGELF();
251+
analyticInfo.short_message = 'connection failure';
252+
analyticInfo._error_msg = 'unable to connect';
253+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
254+
errorString += 'Unable to properly connect to the server.';
255+
} else if (e.type === 3) {
256+
analyticInfo = window.phonegap.app.analytic.basicGELF();
257+
analyticInfo.short_message = 'connection failure';
258+
analyticInfo._error_msg = 'unable to unzip';
259+
window.phonegap.app.analytic.logEvent(config, analyticInfo);
260+
errorString += 'Unable to properly unzip the archive.';
261+
}
217262
}
218263

219-
clearAlternatingPulsingMessage(msgTimer);
220-
updateMessage('Extracting...');
221-
} else if (data.status === 3) {
264+
setTimeout(function () {
265+
navigator.notification.alert(
266+
errorString,
267+
function () {}
268+
);
269+
}, 4000);
270+
},
271+
onCancel: function (e) {
222272
analyticInfo = window.phonegap.app.analytic.basicGELF();
223-
analyticInfo.short_message = 'connection success';
273+
analyticInfo.short_message = 'connection canceled';
224274
window.phonegap.app.analytic.logEvent(config, analyticInfo);
225275
clearAlternatingPulsingMessage(msgTimer);
226-
updateMessage('Success!');
276+
onUserCancel();
227277
}
228-
},
229-
onDownloadError: function (e) {
230-
clearAlternatingPulsingMessage(msgTimer);
231-
onBuildSubmitError('Download Error!');
232-
var errorString = 'Unable to download archive from the server.\n\n';
233-
234-
if (e) {
235-
// fix for wp8 since it returns an object as opposed to just an int
236-
if (e.code) e.type = e.code;
237-
238-
if (e.type === 1) {
239-
analyticInfo = window.phonegap.app.analytic.basicGELF();
240-
analyticInfo.short_message = 'connection failure';
241-
analyticInfo._error_msg = 'invalid url';
242-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
243-
errorString += 'Please enter a valid url to connect to.';
244-
} else if (e.type === 2) {
245-
analyticInfo = window.phonegap.app.analytic.basicGELF();
246-
analyticInfo.short_message = 'connection failure';
247-
analyticInfo._error_msg = 'unable to connect';
248-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
249-
errorString += 'Unable to properly connect to the server.';
250-
} else if (e.type === 3) {
251-
analyticInfo = window.phonegap.app.analytic.basicGELF();
252-
analyticInfo.short_message = 'connection failure';
253-
analyticInfo._error_msg = 'unable to unzip';
254-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
255-
errorString += 'Unable to properly unzip the archive.';
256-
}
257-
}
258-
259-
setTimeout(function () {
260-
navigator.notification.alert(
261-
errorString,
262-
function () {}
263-
);
264-
}, 4000);
265-
},
266-
onCancel: function (e) {
267-
analyticInfo = window.phonegap.app.analytic.basicGELF();
268-
analyticInfo.short_message = 'connection canceled';
269-
window.phonegap.app.analytic.logEvent(config, analyticInfo);
270-
clearAlternatingPulsingMessage(msgTimer);
271-
onUserCancel();
272-
}
273-
});
274-
}, 1000);
278+
});
279+
}, 1000);
280+
}
275281
});
276282
}
277283

0 commit comments

Comments
 (0)