Skip to content

Mobile 3532 #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Mobile 3532 #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbae55b
MOBILE-3532 ionic: Half Revert Fix check device during loading
crazyserver Sep 15, 2020
c69d108
MOBILE-3532 ionic: Apply ios mode on iPadOS
crazyserver Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 56 additions & 6 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

import { Component, OnInit, NgZone } from '@angular/core';
import { Platform, IonicApp } from 'ionic-angular';
import { Config, Platform, IonicApp } from 'ionic-angular';
import { Network } from '@ionic-native/network';
import { CoreApp, CoreAppProvider } from '@providers/app';
import { CoreEventsProvider } from '@providers/events';
Expand All @@ -28,6 +28,7 @@ import { Keyboard } from '@ionic-native/keyboard';
import { ScreenOrientation } from '@ionic-native/screen-orientation';
import { CoreLoginSitesPage } from '@core/login/pages/sites/sites';
import { CoreWindow } from '@singletons/window';
import { Device } from '@ionic-native/device';

@Component({
templateUrl: 'app.html'
Expand All @@ -40,13 +41,62 @@ export class MoodleMobileApp implements OnInit {
protected lastUrls = {};
protected lastInAppUrl: string;

constructor(private platform: Platform, logger: CoreLoggerProvider, keyboard: Keyboard, private app: IonicApp,
private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone,
private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider,
private screenOrientation: ScreenOrientation, private urlSchemesProvider: CoreCustomURLSchemesProvider,
private utils: CoreUtilsProvider, private urlUtils: CoreUrlUtilsProvider, private network: Network) {
constructor(
private platform: Platform,
logger: CoreLoggerProvider,
keyboard: Keyboard,
config: Config,
device: Device,
private app: IonicApp,
private eventsProvider: CoreEventsProvider,
private loginHelper: CoreLoginHelperProvider,
private zone: NgZone,
private appProvider: CoreAppProvider,
private langProvider: CoreLangProvider,
private sitesProvider: CoreSitesProvider,
private screenOrientation: ScreenOrientation,
private urlSchemesProvider: CoreCustomURLSchemesProvider,
private utils: CoreUtilsProvider,
private urlUtils: CoreUrlUtilsProvider,
private network: Network
) {
this.logger = logger.getInstance('AppComponent');

if (this.appProvider.isIOS() && !platform.is('ios')) {
// Solve problem with wrong detected iPadOS.
const platforms = platform.platforms();
const index = platforms.indexOf('core');
if (index > -1) {
platforms.splice(index, 1);
}
platforms.push('mobile');
platforms.push('ios');
platforms.push('ipad');
platforms.push('tablet');

app.setElementClass('app-root-ios', true);
platform.ready().then(() => {
if (device.version) {
const [major, minor]: string[] = device.version.split('.', 2);
app.setElementClass('platform-ios' + major, true);
app.setElementClass('platform-ios' + major + '_' + minor, true);
}
});

app._elementRef.nativeElement.classList.remove('app-root-md');

const iosConfig = config.getModeConfig('ios');

config.set('mode', 'ios');

Object.keys(iosConfig).forEach((key) => {
// Already overriden: pageTransition, do not change.
if (key != 'pageTransition') {
config.set('ios', key, iosConfig[key]);
}
});
}

platform.ready().then(() => {
// Okay, so the platform is ready and our plugins are available.
// Here you can do any higher level native things you might need.
Expand Down
48 changes: 23 additions & 25 deletions src/core/sharedfiles/sharedfiles.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,31 @@ export class CoreSharedFilesModule {
// Register the handler.
delegate.registerHandler(handler);

platform.ready().then(() => {
if (appsProvider.isIOS()) {
let lastCheck = 0;
if (appsProvider.isIOS()) {
let lastCheck = 0;

// Check if there are new files at app start and when the app is resumed.
helper.searchIOSNewSharedFiles();
platform.resume.subscribe(() => {
// Wait a bit to make sure that APP_LAUNCHED_URL is treated before this callback.
setTimeout(() => {
if (Date.now() - lastCheck < 1000) {
// Last check less than 1s ago, don't do anything.
return;
}
// Check if there are new files at app start and when the app is resumed.
helper.searchIOSNewSharedFiles();
platform.resume.subscribe(() => {
// Wait a bit to make sure that APP_LAUNCHED_URL is treated before this callback.
setTimeout(() => {
if (Date.now() - lastCheck < 1000) {
// Last check less than 1s ago, don't do anything.
return;
}

lastCheck = Date.now();
helper.searchIOSNewSharedFiles();
}, 200);
});
lastCheck = Date.now();
helper.searchIOSNewSharedFiles();
}, 200);
});

eventsProvider.on(CoreEventsProvider.APP_LAUNCHED_URL, (url) => {
if (url && url.indexOf('file://') === 0) {
// We received a file in iOS, it's probably a shared file. Treat it.
lastCheck = Date.now();
helper.searchIOSNewSharedFiles(url);
}
});
}
});
eventsProvider.on(CoreEventsProvider.APP_LAUNCHED_URL, (url) => {
if (url && url.indexOf('file://') === 0) {
// We received a file in iOS, it's probably a shared file. Treat it.
lastCheck = Date.now();
helper.searchIOSNewSharedFiles(url);
}
});
}
}
}
10 changes: 3 additions & 7 deletions src/providers/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { Platform, App, NavController, MenuController } from 'ionic-angular';
import { Keyboard } from '@ionic-native/keyboard';
import { Network } from '@ionic-native/network';
import { StatusBar } from '@ionic-native/status-bar';
import { Device } from '@ionic-native/device';

import { CoreDbProvider } from './db';
import { CoreLoggerProvider } from './logger';
Expand Down Expand Up @@ -179,7 +178,6 @@ export class CoreAppProvider {
zone: NgZone,
private menuCtrl: MenuController,
private statusBar: StatusBar,
private device: Device,
appRef: ApplicationRef) {

this.logger = logger.getInstance('CoreAppProvider');
Expand Down Expand Up @@ -392,8 +390,7 @@ export class CoreAppProvider {
* @return Whether the app is running in an Android mobile or tablet device.
*/
isAndroid(): boolean {
return this.isMobile() &&
((this.device.platform && this.device.platform.toLowerCase() == 'android') || this.platform.is('android'));
return this.isMobile() && this.platform.is('android');
}

/**
Expand All @@ -413,8 +410,7 @@ export class CoreAppProvider {
* @return Whether the app is running in an iOS mobile or tablet device.
*/
isIOS(): boolean {
return this.isMobile() &&
((this.device.platform && this.device.platform.toLowerCase() == 'ios') || this.platform.is('ios'));
return this.isMobile() && !this.platform.is('android');
}

/**
Expand Down Expand Up @@ -572,7 +568,7 @@ export class CoreAppProvider {
*/
openKeyboard(): void {
// Open keyboard is not supported in desktop and in iOS.
if (this.isMobile() && !this.isIOS()) {
if (this.isAndroid()) {
this.keyboard.show();
}
}
Expand Down
41 changes: 19 additions & 22 deletions src/providers/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,31 +81,28 @@ export class CoreFileProvider {

this.logger = logger.getInstance('CoreFileProvider');

platform.ready().then(() => {
if (appProvider.isAndroid() && !Object.getOwnPropertyDescriptor(FileReader.prototype, 'onloadend')) {
// Cordova File plugin creates some getters and setter for FileReader, but
// Ionic's polyfills override them in Android.
// Create the getters and setters again. This code comes from FileReader.js in cordova-plugin-file.
this.defineGetterSetter(FileReader.prototype, 'readyState', function(): any {
return this._localURL ? this._readyState : this._realReader.readyState;
});
if (appProvider.isAndroid() && !Object.getOwnPropertyDescriptor(FileReader.prototype, 'onloadend')) {
// Cordova File plugin creates some getters and setter for FileReader, but Ionic's polyfills override them in Android.
// Create the getters and setters again. This code comes from FileReader.js in cordova-plugin-file.
this.defineGetterSetter(FileReader.prototype, 'readyState', function(): any {
return this._localURL ? this._readyState : this._realReader.readyState;
});

this.defineGetterSetter(FileReader.prototype, 'error', function(): any {
return this._localURL ? this._error : this._realReader.error;
});
this.defineGetterSetter(FileReader.prototype, 'error', function(): any {
return this._localURL ? this._error : this._realReader.error;
});

this.defineGetterSetter(FileReader.prototype, 'result', function(): any {
return this._localURL ? this._result : this._realReader.result;
});
this.defineGetterSetter(FileReader.prototype, 'result', function(): any {
return this._localURL ? this._result : this._realReader.result;
});

this.defineEvent('onloadstart');
this.defineEvent('onprogress');
this.defineEvent('onload');
this.defineEvent('onerror');
this.defineEvent('onloadend');
this.defineEvent('onabort');
}
});
this.defineEvent('onloadstart');
this.defineEvent('onprogress');
this.defineEvent('onload');
this.defineEvent('onerror');
this.defineEvent('onloadend');
this.defineEvent('onabort');
}
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/providers/utils/iframe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ export class CoreIframeUtilsProvider {

const win = <WKUserScriptWindow> window;

platform.ready().then(() => {
if (appProvider.isIOS() && win.WKUserScript) {
if (appProvider.isIOS() && win.WKUserScript) {
platform.ready().then(() => {
// Inject code to the iframes because we cannot access the online ones.
const wwwPath = fileProvider.getWWWAbsolutePath();
const linksPath = textUtils.concatenatePaths(wwwPath, 'assets/js/iframe-treat-links.js');
Expand All @@ -73,8 +73,8 @@ export class CoreIframeUtilsProvider {

// Handle post messages received by iframes.
window.addEventListener('message', this.handleIframeMessage.bind(this));
}
});
});
}
}

/**
Expand Down