Merge pull request #13 from akansha-maheshwari-axway/MOD-2583

fix(android) : [MOD-2583] fix crypto module android example
tidev · May 1, 2020 · ffbf646 · ffbf646
2 parents c8bc568 + 887047a
commit ffbf646
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/android/example/app.js b/android/example/app.js
@@ -7,7 +7,7 @@ var App = {
             Ti.API.warn('Trying to load an object that does not exist in the App namespace');
             return false;
         } else if (App[type][name] == null) {
-            Ti.include(type.toLowerCase() + '/' + name + '.js');
+            require(type.toLowerCase() + '/' + name);
             Ti.API.info(type + ' ' + name + ' loaded');
             return new App[type][name](params);
         } else {
@@ -16,11 +16,13 @@ var App = {
         }
     }
 };
+global.App = App;
 
 // Load the crypto modules
 var Crypto = require('ti.crypto');
+global.Crypto = Crypto;
 
-Ti.include('ui.js');
-Ti.include('test.js');
+require('./ui');
+require('./test');
 
 App.UI.createAppWindow().open();
diff --git a/android/example/ui.js b/android/example/ui.js
@@ -45,7 +45,7 @@ App.UI = (function () {
         var tableView = Ti.UI.createTableView({});
         var cnt = algorithms.length;
         for (var index = 0; index < cnt; index++) {
-            row = Ti.UI.createTableViewRow({ height: 45, layout:'vertical', hasChild:true });
+            var row = Ti.UI.createTableViewRow({ height: 45, layout:'vertical', hasChild:true });
             row.add(Ti.UI.createLabel({ text:algorithms[index].title, top:0, left:4, height:Ti.UI.SIZE || 'auto', width:Ti.UI.SIZE || 'auto', font:{ fontSize:16, fontWeight:'bold' } }));
             row.add(Ti.UI.createLabel({ text:algorithms[index].subTitle, top:0, left:4, height:Ti.UI.SIZE || 'auto', width:Ti.UI.SIZE || 'auto', font:{ fontSize:12 } }));
             tableView.appendRow(row);