Skip to content

Removal of Form Requirement for creating an instance and Window Factory #2

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removal of Form Requirement for creating an instance and Window Factory #2

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
85c2b14
Removal of Form Requirement for creating an instance
May 24, 2019
cca8390
Changes to support Android Secure File
May 26, 2019
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
255 changes: 122 additions & 133 deletions Source/Android/UExternalFileViewer.Android.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,133 +1,122 @@
{****************************************************}
{ }
{ firemonkey-external-file-viewer }
{ }
{ Copyright (C) 2018 Code Partners Pty Ltd }
{ }
{ http://www.code-partners.com }
{ }
{****************************************************}
{ }
{ This Source Code Form is subject to the terms of }
{ the Mozilla Public License, v. 2.0. If a copy of }
{ the MPL was not distributed with this file, You }
{ can obtain one at }
{ }
{ http://mozilla.org/MPL/2.0/ }
{ }
{****************************************************}
unit UExternalFileViewer.Android;

interface

{$IFDEF ANDROID}

uses
System.SysUtils, System.Classes, FMX.Forms, UExternalFileViewer, System.IOUtils,
Androidapi.JNI.GraphicsContentViewText,
Androidapi.JNIBridge,
Androidapi.JNI.JavaTypes,
Androidapi.JNI.Net,
Androidapi.JNI.Os,
Androidapi.JNI.Util,
Androidapi.Helpers,
Androidapi.JNI.Environment,
Androidapi.JNI.Webkit,
FMX.Helpers.Android;

type
TAndroidExternalFileViewer = class (TExternalFileViewer)
private
function GetMimeType(Uri: Jnet_Uri): JString;
public
procedure OpenFile(Path: string); override;
procedure OpenURL(URL: string); override;
end;

{$ENDIF}

implementation

{$IFDEF ANDROID}

uses
FMX.Dialogs;

{ TAndroidExternalFileViewer }

procedure TAndroidExternalFileViewer.OpenFile(Path: string);
var
&OriginalFile, PublicDirectoryFile, PublicFile: JFile;
PublicDirectoryPath, PublicPath: string;

Uri: Jnet_Uri;
Intent: JIntent;
begin
inherited;

if Path.StartsWith(System.IOUtils.TPath.GetDocumentsPath()) then begin
&OriginalFile := TJFile.JavaClass.init(StringToJString(Path));

PublicDirectoryPath := (JStringToString(TJEnvironment.JavaClass.getExternalStorageDirectory.getAbsolutePath) + '/Documents');
PublicPath := PublicDirectoryPath + PathDelim + ExtractFileName(Path); PublicDirectoryFile := TJFile.JavaClass.init(StringToJString(PublicDirectoryPath)); if (not PublicDirectoryFile.exists) then begin PublicDirectoryFile.mkdir; end; if (not FileExists(PublicPath)) then TFile.Copy(JStringToString(&OriginalFile.getAbsolutePath), PublicPath);
PublicFile := TJFile.JavaClass.init(StringToJString(PublicPath));
end
else begin
PublicFile := TJFile.JavaClass.init(StringToJString(Path));
end;

Intent := TJIntent.JavaClass.init(TJIntent.JavaClass.ACTION_VIEW);
Uri := TJnet_Uri.JavaClass.fromFile(PublicFile);
// Intent.setDataAndType(Uri, StringToJString('application/pdf'));
Intent.setDataAndType(Uri, self.GetMimeType(Uri));
Intent.setFlags(TJIntent.JavaClass.FLAG_ACTIVITY_NO_HISTORY);

TAndroidHelper.Activity.startActivity(Intent);
end;

procedure TAndroidExternalFileViewer.OpenURL(URL: string);
var
Intent: JIntent;
Uri: Jnet_Uri;
begin
inherited;

Intent := TJIntent.JavaClass.init(TJIntent.JavaClass.ACTION_VIEW);

// Intent.setDataAndType(TJnet_Uri.JavaClass.parse(StringToJString(URL)), StringToJString('application/pdf'));

Uri := TJnet_Uri.JavaClass.parse(StringToJString(URL));
Intent.setDataAndType(Uri, self.GetMimeType(Uri));

Intent.setFlags(TJIntent.JavaClass.FLAG_ACTIVITY_NO_HISTORY);

TAndroidHelper.Activity.startActivity(Intent);
end;

function TAndroidExternalFileViewer.GetMimeType(Uri: Jnet_Uri): JString;
var
MimeType: JString;
ContentResolver: JContentResolver;
FileExtension: JString;
begin
// https://stackoverflow.com/a/31691791/2899073

MimeType := nil;
if (Uri.getScheme.equals(TJContentResolver.JavaClass.SCHEME_CONTENT)) then begin
ContentResolver := TAndroidHelper.Context.getContentResolver();
MimeType := ContentResolver.getType(uri);
end
else begin
FileExtension := TJMimeTypeMap.JavaClass.getFileExtensionFromUrl(uri.toString());

MimeType := TJMimeTypeMap.JavaClass.getSingleton().getMimeTypeFromExtension(
fileExtension.toLowerCase()
);
end;

Result := MimeType;
end;

{$ENDIF}

end.
{****************************************************}
{ }
{ firemonkey-external-file-viewer }
{ }
{ Copyright (C) 2018 Code Partners Pty Ltd }
{ }
{ http://www.code-partners.com }
{ }
{****************************************************}
{ }
{ This Source Code Form is subject to the terms of }
{ the Mozilla Public License, v. 2.0. If a copy of }
{ the MPL was not distributed with this file, You }
{ can obtain one at }
{ }
{ http://mozilla.org/MPL/2.0/ }
{ }
{****************************************************}
unit UExternalFileViewer.Android;

interface

{$IFDEF ANDROID}

uses
System.SysUtils, System.Classes, FMX.Forms, FMX.ExternalFileViewer,
System.IOUtils,
Androidapi.JNI.GraphicsContentViewText,
Androidapi.JNIBridge,
Androidapi.JNI.JavaTypes,
Androidapi.JNI.Net,
Androidapi.JNI.Os,
Androidapi.JNI.Util,
Androidapi.Helpers,
Androidapi.JNI.Environment,
Androidapi.JNI.Webkit,
FMX.Helpers.Android;

type
TAndroidExternalFileViewer = class(TExternalFileViewer)
private
function GetMimeType(Uri: Jnet_Uri): JString;
public
procedure OpenFile(Path: string); override;
procedure OpenURL(URL: string); override;
end;

{$ENDIF}

implementation

{$IFDEF ANDROID}

uses
FMX.Dialogs;

{ TAndroidExternalFileViewer }

procedure TAndroidExternalFileViewer.OpenFile(Path: string);
var
Uri: Jnet_Uri;
Intent: JIntent;
begin
inherited;

Intent := TJIntent.JavaClass.init(TJIntent.JavaClass.ACTION_VIEW);

Uri := TAndroidHelper.JFileToJURI
(TJFile.JavaClass.init(StringToJString(Path)));

Intent.setDataAndType(Uri, self.GetMimeType(Uri));
Intent.setFlags(TJIntent.JavaClass.FLAG_GRANT_READ_URI_PERMISSION);

TAndroidHelper.Activity.startActivity(Intent);
end;

procedure TAndroidExternalFileViewer.OpenURL(URL: string);
var
Intent: JIntent;
Uri: Jnet_Uri;
begin
inherited;

Intent := TJIntent.JavaClass.init(TJIntent.JavaClass.ACTION_VIEW);

Uri := TJnet_Uri.JavaClass.parse(StringToJString(URL));
Intent.setDataAndType(Uri, self.GetMimeType(Uri));

Intent.setFlags(TJIntent.JavaClass.FLAG_ACTIVITY_NO_HISTORY);

TAndroidHelper.Activity.startActivity(Intent);
end;

function TAndroidExternalFileViewer.GetMimeType(Uri: Jnet_Uri): JString;
var
MimeType: JString;
ContentResolver: JContentResolver;
FileExtension: JString;
begin
// https://stackoverflow.com/a/31691791/2899073

MimeType := nil;
if (Uri.getScheme.equals(TJContentResolver.JavaClass.SCHEME_CONTENT)) then
begin
ContentResolver := TAndroidHelper.Context.getContentResolver();
MimeType := ContentResolver.getType(Uri);
end
else
begin
FileExtension := TJMimeTypeMap.JavaClass.getFileExtensionFromUrl
(Uri.toString());

MimeType := TJMimeTypeMap.JavaClass.getSingleton().getMimeTypeFromExtension
(FileExtension.toLowerCase());
end;

Result := MimeType;
end;

{$ENDIF}

end.
97 changes: 56 additions & 41 deletions Source/UExternalFileViewer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{****************************************************}
{ }
{ firemonkey-external-file-viewer }
{ }
{ Copyright (C) 2018 Code Partners Pty Ltd }
{ }
{ http://www.code-partners.com }
{ }
{****************************************************}
{ }
{ This Source Code Form is subject to the terms of }
{ the Mozilla Public License, v. 2.0. If a copy of }
{ the MPL was not distributed with this file, You }
{ can obtain one at }
{ }
{ http://mozilla.org/MPL/2.0/ }
{ }
{****************************************************}
{ **************************************************** }
{ }
{ firemonkey-external-file-viewer }
{ }
{ Copyright (C) 2018 Code Partners Pty Ltd }
{ }
{ http://www.code-partners.com }
{ }
{ **************************************************** }
{ }
{ This Source Code Form is subject to the terms of }
{ the Mozilla Public License, v. 2.0. If a copy of }
{ the MPL was not distributed with this file, You }
{ can obtain one at }
{ }
{ http://mozilla.org/MPL/2.0/ }
{ }
{ **************************************************** }
unit UExternalFileViewer;

interface
Expand All @@ -24,52 +24,67 @@ interface
System.SysUtils, System.Classes, FMX.Forms;

type
TExternalFileViewer = class (TComponent)
TExternalFileViewer = class(TComponent)
protected
FForm: TForm;
FForm: TCommonCustomForm;

constructor Create(AOwner: TComponent; AForm: TForm); reintroduce; virtual;
constructor Create(AOwner: TComponent); reintroduce; virtual;
public
class function Factory(AOwner: TComponent; AForm: TForm): TExternalFileViewer;
class function Factory(AOwner: TComponent): TExternalFileViewer;

procedure OpenFile(Path: string); virtual; abstract;
procedure OpenURL(URL: string); virtual; abstract;
end;

TDummyExternalFileViewer = class (TExternalFileViewer)
TDummyExternalFileViewer = class(TExternalFileViewer)
public
procedure OpenFile(Path: string); override;
procedure OpenURL(URL: string); override;
end;

implementation

{$IF DEFINED(ANDROID)}
uses
UExternalFileViewer.Android;
{$ELSEIF DEFINED(IOS)}
uses
UExternalFileViewer.iOS;
{$ENDIF}
{$IF DEFINED(ANDROID)}

uses
UExternalFileViewer.Android;
{$ELSEIF DEFINED(IOS)}

uses
UExternalFileViewer.iOS;
{$ELSEIF DEFINED(MSWINDOWS)}

uses
UExternalFileViewer.Windows;
{$ENDIF}
{ TExternalFileViewer }

constructor TExternalFileViewer.Create(AOwner: TComponent; AForm: TForm);
constructor TExternalFileViewer.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
self.FForm := AForm;
if (AOwner is TCommonCustomForm) then
begin
self.FForm := (AOwner as TCommonCustomForm)
end
else
begin
self.FForm := Application.MainForm;
end;

end;

class function TExternalFileViewer.Factory(AOwner: TComponent;
AForm: TForm): TExternalFileViewer;
class function TExternalFileViewer.Factory(AOwner: TComponent)
: TExternalFileViewer;
begin
{$IF DEFINED(ANDROID)}
Result := TAndroidExternalFileViewer.Create(AOwner, AForm);
{$ELSEIF DEFINED(IOS)}
Result := TiOSExternalFileViewer.Create(AOwner, AForm);
{$ELSE}
Result := TDummyExternalFileViewer.Create(AOwner, AForm);
{$ENDIF}
{$IF DEFINED(MSWINDOWS)}
Result := TWindowsExternalFileViewer.Create(AOwner);
{$ELSEIF DEFINED(ANDROID)}
Result := TAndroidExternalFileViewer.Create(AOwner);
{$ELSEIF DEFINED(IOS)}
Result := TiOSExternalFileViewer.Create(AOwner);
{$ELSE}
Result := TDummyExternalFileViewer.Create(AOwner);
{$ENDIF}
end;

{ TDummyExternalFileViewer }
Expand Down
Loading