Skip to content

Commit

Permalink
Merge pull request #219 from pec1985/memory_fixes
Browse files Browse the repository at this point in the history 
General performance and stability fixes to the platform
  • Loading branch information
@pec1985
pec1985 committed May 8, 2014
2 parents cd26a61 + ae349cd commit 9c92832
Show file tree
Hide file tree
Showing 83 changed files with 2,202 additions and 2,067 deletions.
109 changes: 57 additions & 52 deletions build_templates/blackberry/templates/app/build/_private_assets_/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
Ti = Ti || {};
Ti.include = Ti.include || function (id) { Ti.globalInclude(id, "app/native/assets/") };
var global = {};
var global = this;

alert = function(msg) {
Ti.UI.createAlertDialog({message: (msg || '').toString()}).show();
Expand Down Expand Up @@ -167,68 +167,73 @@ console = { };
console.log = console.info;
Ti.UI = Ti.UI || {};
Ti.UI.iPhone = Ti.UI.iPhone || {
SystemButton: {
REFRESH: 0,
FLEXIBLE_SPACE: 0,
INFO_DARK: 0,
DISCLOSURE: 0
},
StatusBar: {
OPAQUE_BLACK:0,
},
SystemButtonStyle: {
BORDERED: 0,
PLAIN: 0,
DONE: 0,
BAR: 0
},
AnimationStyle: {
FLIP_FROM_LEFT: 0
},
ActivityIndicatorStyle: {
DARK: 0,
},
RowAnimationStyle: {
LEFT: 0,
UP: 0,
DOWN: 0,
RIGHT: 0
},
TableViewStyle: {
GROUPED: 0,
PLAIN: 0
},
TableViewCellSelectionStyle: {
NONE: 0
},
TableViewSeparatorStyle: {
NONE: 0
},
TableViewScrollPosition: {
TOP: 0
}
SystemButton: {
REFRESH: 0,
FLEXIBLE_SPACE: 0,
INFO_DARK: 0,
DISCLOSURE: 0
},
StatusBar: {
OPAQUE_BLACK:0,
},
SystemButtonStyle: {
BORDERED: 0,
PLAIN: 0,
DONE: 0,
BAR: 0
},
AnimationStyle: {
FLIP_FROM_LEFT: 0
},
ActivityIndicatorStyle: {
DARK: 0,
},
RowAnimationStyle: {
LEFT: 0,
UP: 0,
DOWN: 0,
RIGHT: 0
},
TableViewStyle: {
GROUPED: 0,
PLAIN: 0
},
TableViewCellSelectionStyle: {
NONE: 0
},
TableViewSeparatorStyle: {
NONE: 0
},
TableViewScrollPosition: {
TOP: 0
}
};


Ti.UI.create2DMatrix = function(){
Ti.API.error('Ti.UI.create2DMatrix NOT SUPPORTED IN BB10');
return {
scale: function(){},
transform: 0,
duration: 0,
rotate: function(){}
}
Ti.API.error('Ti.UI.create2DMatrix NOT SUPPORTED IN BB10');
return {
scale: function(){},
transform: 0,
duration: 0,
rotate: function(){}
}
}
Ti.UI.createSearchBar = function(args) {
args = args || {};
Ti.API.error('Ti.UI.createSearchBar() NOT SUPPORTED IN BB10, using textField instead');
return Ti.UI.createTextField(args);
args = args || {};
Ti.API.error('Ti.UI.createSearchBar() NOT SUPPORTED IN BB10, using textField instead');
return Ti.UI.createTextField(args);
}
Ti.UI.createWebView = Ti.UI.BlackBerry.createWebView;
Ti.UI.createButton = Ti.UI.BlackBerry.createButton;
Ti.UI.createWindow = Ti.UI.BlackBerry.createWindow;
Ti.UI.createTabGroup = Ti.UI.BlackBerry.createTabGroup;
Ti.UI.createTab = Ti.UI.BlackBerry.createTab;
Ti.UI.createAlertDialog = Ti.UI.BlackBerry.createAlertDialog;
Ti.UI.createTableView = Ti.UI.BlackBerry.createTableView;
Ti.UI.createTableViewRow = Ti.UI.BlackBerry.createTableViewRow;
Ti.UI.createTableViewSection = Ti.UI.BlackBerry.createTableViewSection;
Ti.UI.createScrollableView = Ti.UI.BlackBerry.createScrollableView;
Ti.UI.createView = Ti.UI.BlackBerry.createView;

Titanium = Ti;
Titanium = Ti;
2 changes: 0 additions & 2 deletions src/tibb/Modules/App/TiAppPropertiesModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Ti::TiValue TiAppPropertiesModule::getModuleName()

QVariant TiAppPropertiesModule::createObjectFromTiValue(Ti::TiValue val)
{
qDebug() << "[VAL]" << val.toString();
QMap<QString, QVariant> map;
if(!val.isMap()) return map;

Expand Down Expand Up @@ -82,7 +81,6 @@ QVariant TiAppPropertiesModule::createObjectFromTiValue(Ti::TiValue val)

QMap<QString, Ti::TiValue> TiAppPropertiesModule::createMapFromQVariant(QVariant val)
{
qDebug() << "createMapFromQVariant" << val;
QMap<QString, Ti::TiValue> map;
if(val.type() == QVariant::Map)
{
Expand Down
4 changes: 2 additions & 2 deletions src/tibb/Modules/Blackberry/PushNotification/TiPushNotificationProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void TiPushNotificationProxy::pushReceived(const bb::system::InvokeRequest &requ
}
else
{
qDebug() << "[PushNotificationProxy] something failed on \"pushReceived\"";
Ti::TiHelper::Log("[ERROR] something failed on \"pushReceived\"");
}
} else if (request.action().compare(BB_OPEN_INVOCATION_ACTION) == 0){
// Received an invoke request to open an existing push (ie. from a notification in the BlackBerry Hub)
Expand All @@ -359,7 +359,7 @@ void TiPushNotificationProxy::pushReceived(const bb::system::InvokeRequest &requ
}
else
{
qDebug() << "[PushNotificationProxy] something failed...";
Ti::TiHelper::Log("[DEBUG] something PushNotificationProxy - failed on \"pushReceived\"");
}

}
Expand Down
8 changes: 0 additions & 8 deletions src/tibb/Modules/Blackberry/PushNotification/service/RegisterService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ void RegisterService::subscribeToPushInitiator(const User& user, const QString&
url.addQueryItem("type","bds");
}

qDebug() << "URL: " << url;
m_reply = m_accessManager.get(QNetworkRequest(url));

// Connect to the reply finished signal.
Expand All @@ -60,15 +59,12 @@ void RegisterService::subscribeToPushInitiator(const User& user, const QString&

void RegisterService::httpFinished()
{
qDebug() << "httpFinished called";

int code = -1;
QString description;

if (m_reply->error() == QNetworkReply::NoError) {
// Load the data using the reply QIODevice
const QString returnCode = QString::fromUtf8(m_reply->readAll());
qDebug() << "returnCode: " << returnCode;

if (returnCode == "rc=200") {
m_userDAO.save(m_currentUser);
Expand Down Expand Up @@ -115,7 +111,6 @@ void RegisterService::httpFinished()
description = tr("Error: Unknown error code: %0.").arg(returnCode);
}
} else {
qDebug() << "network error";
code = m_reply->error();
description = m_reply->errorString();
}
Expand All @@ -135,7 +130,6 @@ void RegisterService::onSslErrors(QNetworkReply * reply, const QList<QSslError>
// "SSL error: The root CA certificate is not trusted for this purpose"
// Seems to be a problem with how the server is set up and a known QT issue QTBUG-23625

qDebug() << "onSslErrors called";
reply->ignoreSslErrors(errors);
}

Expand All @@ -144,7 +138,6 @@ QString RegisterService::deviceVersion() const
QString deviceVersion;

if (bps_initialize() == BPS_SUCCESS) {
qDebug() << "bps initialized";
deviceinfo_details_t *deviceDetails = 0;

if (deviceinfo_get_details(&deviceDetails) == BPS_SUCCESS) {
Expand All @@ -167,7 +160,6 @@ QString RegisterService::deviceModel() const
QString deviceModel;

if (bps_initialize() == BPS_SUCCESS) {
qDebug() << "bps initialized";
deviceinfo_details_t *deviceDetails = 0;

if (deviceinfo_get_details(&deviceDetails) == BPS_SUCCESS) {
Expand Down
5 changes: 0 additions & 5 deletions src/tibb/Modules/Blackberry/PushNotification/service/UnregisterService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ void UnregisterService::unsubscribeFromPushInitiator(const User& user)
url.addQueryItem("username",user.userId());
url.addQueryItem("password",user.password());

qDebug() << "URL: " << url;
m_reply = m_accessManager.get(QNetworkRequest(url));

// Connect to the reply finished signal.
Expand All @@ -58,15 +57,13 @@ void UnregisterService::unsubscribeFromPushInitiator(const User& user)

void UnregisterService::httpFinished()
{
qDebug() << "httpFinished called";

int code = -1;
QString description;

if (m_reply->error() == QNetworkReply::NoError) {
// Load the data using the reply QIODevice
const QString returnCode = QString::fromUtf8(m_reply->readAll());
qDebug() << "returnCode: " << returnCode;

if (returnCode == "rc=200"){
const User storedUser = getCurrentlyRegisteredUser();
Expand Down Expand Up @@ -108,7 +105,6 @@ void UnregisterService::httpFinished()
description = tr("Error: Unknown error code: %0.").arg(returnCode);
}
} else {
qDebug() << "network error";
code = m_reply->error();
description = m_reply->errorString();
}
Expand All @@ -128,6 +124,5 @@ void UnregisterService::onSslErrors(QNetworkReply * reply, const QList<QSslError
// "SSL error: The root CA certificate is not trusted for this purpose"
// Seems to be a problem with how the server is set up and a known QT issue QTBUG-23625

qDebug() << "onSslErrors called";
reply->ignoreSslErrors(errors);
}
21 changes: 0 additions & 21 deletions src/tibb/Modules/Filesystem/TiFilesystemBlobProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,37 +44,30 @@ void TiFilesystemBlobProxy::setRemoteBackup(Ti::TiValue)

Ti::TiValue TiFilesystemBlobProxy::append(Ti::TiValue)
{
qDebug() << "Cannot call " << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::copy(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::createDirectory(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::createFile(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::createTimestamp(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::deleteDirectory(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::deleteFile(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::exists(Ti::TiValue value)
Expand All @@ -87,7 +80,6 @@ Ti::TiValue TiFilesystemBlobProxy::extension(Ti::TiValue value)
}
Ti::TiValue TiFilesystemBlobProxy::getDirectoryListing(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::isDirectory(Ti::TiValue value)
Expand All @@ -100,17 +92,14 @@ Ti::TiValue TiFilesystemBlobProxy::isFile(Ti::TiValue value)
}
Ti::TiValue TiFilesystemBlobProxy::modificationTimestamp(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::move(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::open(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::read(Ti::TiValue value)
Expand All @@ -119,28 +108,23 @@ Ti::TiValue TiFilesystemBlobProxy::read(Ti::TiValue value)
}
Ti::TiValue TiFilesystemBlobProxy::rename(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::resolve(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::spaceAvailable(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::write(Ti::TiValue)
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}

Ti::TiValue TiFilesystemBlobProxy::getExecutable()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::getName()
Expand All @@ -158,7 +142,6 @@ Ti::TiValue TiFilesystemBlobProxy::getParent()
}
Ti::TiValue TiFilesystemBlobProxy::getReadonly()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueTrue();
}
Ti::TiValue TiFilesystemBlobProxy::getSize()
Expand All @@ -167,22 +150,18 @@ Ti::TiValue TiFilesystemBlobProxy::getSize()
}
Ti::TiValue TiFilesystemBlobProxy::getSymbolicLink()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::getWritable()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::getHidden()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}
Ti::TiValue TiFilesystemBlobProxy::getRemoteBackup()
{
qDebug() << "Cannot call" << __func__ << "on Resources dir";
return valueFalse();
}

Expand Down
1 change: 0 additions & 1 deletion src/tibb/Modules/Filesystem/TiFilesystemFileProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ Ti::TiValue TiFilesystemFileProxy::getDirectoryListing(Ti::TiValue)
Ti::TiValue val;
val.setString(allFiles.at(i));
array.append(val);
Ti::TiHelper::Log(allFiles.at(i));
}
returnedValue.setList(array);
return returnedValue;
Expand Down

0 comments on commit 9c92832

Please sign in to comment.