Skip to content

Commit

Permalink
Update target SDK to version 34 (#5456)
Browse files Browse the repository at this point in the history
* Update target SDK to version 34

* update version codes

* improve instructions to build release file

* fix Try It feature no longer working

* Fix some errors/crashes on android

* fix search bar is small and not cancelling

* fix image detail graph misplaced

* fix graph detail not shown on tablet

* fix account gets deleted no matter if you select yes or no

* refs #5457 fix some translations of choose date

* Update release number
  • Loading branch information
tsteur authored Jul 18, 2024
1 parent 34b4937 commit c8f312e
Show file tree
Hide file tree
Showing 28 changed files with 60 additions and 49 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ If you don't have Titanium SDK installed on your system have a look at [From zer
### Build the app
* `ti build -p ios` or `ti build -p android` to build the app

### Build for release on Android

```
ti build -p android -b -K $pathKeyStoreFile -P $keystorePassword -L $alias -D production -T dist-playstore -O $outputDirectory
```

## Contact

https://matomo.org
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/account_creator_footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function tryIt ()

require('login').login(
accounts,
'https://demo.matomo.org',
'https://demo.matomo.cloud',
'',
'',
''
Expand Down
9 changes: 4 additions & 5 deletions app/controllers/accounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,17 @@ function deleteAccountIfUserConfirmsButNotOniOS(event)
cancel: 1,
buttonNames: [L('General_Yes'), L('General_No')],
selectedIndex: 1,
destructive: 0,
title: L('Mobile_ConfirmRemoveAccount')
});

dialog.addEventListener('click', function (clickEvent) {
if (!clickEvent ||
clickEvent.cancel === clickEvent.index ||
true === clickEvent.cancel) {

if (!clickEvent) {
return;
}

if (clickEvent.index == 1) {
return;
}
deleteAccount(event);
});

Expand Down
10 changes: 6 additions & 4 deletions app/controllers/all_websites_dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,19 @@ function showLoadingMessage()
$.loading.show();
}

function cancelSearchWebsite()
function changeSearchWebsite()
{
if (!$.searchBar) {

return;
}

$.searchBar.value = '';
$.searchBar.blur();
if (!$.searchBar.value) {

fetchListOfAvailableWebsites();
$.searchBar.blur();

fetchListOfAvailableWebsites();
}
}

function getSearchText()
Expand Down
18 changes: 11 additions & 7 deletions app/controllers/graph_detail.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ graphSwitcher.on('close', close);

graphSwitcher.on('switch', function () {
var url = getGraphUrlWithSize(getPictureWidth(), getPictureHeight());
console.debug('imageDetailUrlWithSize', url);
$.graphWidget.loadImage(url);
});

Expand Down Expand Up @@ -81,7 +82,7 @@ function getPictureHeight() {
} else {
pictureHeight = height - 20; // 10px space left and right
}

return pictureHeight;
}

Expand Down Expand Up @@ -158,11 +159,15 @@ function getImageView(url, width, height) {
return Alloy.createWidget('org.piwik.imageview', 'widget', options);
}

var pictureWidth = getPictureWidth();
var pictureHeight = getPictureHeight();
var graphUrlWithSize = getGraphUrlWithSize(pictureWidth, pictureHeight);
function onPostlayout() {

$.graphWidget.loadImage(graphUrlWithSize);
var pictureWidth = getPictureWidth();
var pictureHeight = getPictureHeight();
var graphUrlWithSize = getGraphUrlWithSize(pictureWidth, pictureHeight);

console.debug('imageDetailUrlWithSize', graphUrlWithSize);
$.graphWidget.loadImage(graphUrlWithSize);
}

if (isTablet) {

Expand All @@ -185,7 +190,6 @@ if (isTablet) {
try {
var pictureWidth = getOrientationSpecificWidth();
var pictureHeight = getOrientationSpecificHeight();

$.index.remove($.graph);
$.graph = null;

Expand Down Expand Up @@ -260,4 +264,4 @@ function open()
}
}

exports.open = open;
exports.open = open;
2 changes: 1 addition & 1 deletion app/controllers/report_without_dimension.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ function fixVerticalSeparatorHeight()
var height = parseInt($.dimensions.size.height, 10);

if (5 < height) {
$.verticalSeparator.setHeight($.dimensions.size.height);
$.verticalSeparator.height = ($.dimensions.size.height);
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var args = arguments[0] || {};
var visitor = args.visitor;

var accountModel = require('session').getAccount();
var accessUrl = accountModel ? accountModel.getBasePath() : 'https://demo.matomo.org/';
var accessUrl = accountModel ? accountModel.getBasePath() : 'https://demo.matomo.cloud/';

var rows = [];

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/visitor_overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function L(key)
}

var args = arguments[0] || {};
var accessUrl = args.account ? args.account.getBasePath() : 'https://demo.matomo.org/';
var accessUrl = args.account ? args.account.getBasePath() : 'https://demo.matomo.cloud/';
var visitor = args.visitor || null;

function goalConversionDescription(visitor)
Expand Down Expand Up @@ -132,4 +132,4 @@ function updateDisplayedValues(visitor)
}
}

updateDisplayedValues(visitor);
updateDisplayedValues(visitor);
2 changes: 1 addition & 1 deletion app/lib/Piwik/Network/HttpRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ HttpRequest.prototype.handle = function () {
var settings = Alloy.createCollection('AppSettings').settings();
var validateSsl = settings.shouldValidateSsl();

this.xhr = Ti.Network.createHTTPClient({validatesSecureCertificate: validateSsl, enableKeepAlive: false});
this.xhr = Ti.Network.createHTTPClient({validatesSecureCertificate: !!validateSsl, enableKeepAlive: false});
var that = this;

this.xhr.onload = function () { that.load(this); that = null; };
Expand Down
2 changes: 1 addition & 1 deletion app/lib/i18n/ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/lib/i18n/de.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/lib/i18n/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ module.exports = {
Mobile_Advanced: 'Advanced',
Mobile_AnonymousAccess: 'Anonymous access',
Mobile_AnonymousTracking: 'Anonymous tracking',
Mobile_AccessUrlLabel: 'URL eg https://demo.matomo.org',
Mobile_AccessUrlLabel: 'URL eg https://demo.matomo.cloud',
Mobile_AskForAnonymousTrackingPermission: 'When enabled, Matomo Mobile will send anonymous usage data to matomo.org. The intent is to use this data to help Matomo Mobile developers better understand how the app is used. Information sent is: menus and settings clicked on, OS name and version, any error displayed in Matomo Mobile. We will NOT track any of your analytics data. This anonymous data will never be made public. You can disable/enable anonymous tracking in Settings at any time.',
Mobile_ChooseHttpTimeout: 'Choose HTTP timeout value',
Mobile_ChooseMetric: 'Choose Metric',
Expand Down
2 changes: 1 addition & 1 deletion app/lib/i18n/en.js

Large diffs are not rendered by default.

Loading

0 comments on commit c8f312e

Please sign in to comment.