Skip to content

wip android keystore #8627

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

Draft
ClementPasteau wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

wip android keystore #8627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion newIDE/app/src/ExportAndShare/BrowserExporters/BrowserOnlineCordovaExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as React from 'react';
import assignIn from 'lodash/assignIn';
import {
type Build,
type BuildSigningOptions,
buildCordovaAndroid,
getBuildFileUploadOptions,
} from '../../Utils/GDevelopServices/Build';
Expand Down Expand Up @@ -65,6 +66,7 @@ export const browserOnlineCordovaExportPipeline: ExportPipeline<
getInitialExportState: () => ({
targets: ['androidApk'],
keystore: 'new',
buildSigningOptions: null,
signingDialogOpen: false,
}),

Expand Down Expand Up @@ -189,12 +191,17 @@ export const browserOnlineCordovaExportPipeline: ExportPipeline<
if (!firebaseUser)
return Promise.reject(new Error('User is not authenticated'));

const signing: BuildSigningOptions =
exportState.keystore === 'custom' && exportState.buildSigningOptions
? exportState.buildSigningOptions
: { keystore: exportState.keystore };

return buildCordovaAndroid(
getAuthorizationHeader,
firebaseUser.uid,
uploadBucketKey,
exportState.targets,
exportState.keystore,
signing,
gameId,
options,
payWithCredits
Expand Down
76 changes: 71 additions & 5 deletions newIDE/app/src/ExportAndShare/GenericExporters/OnlineCordovaExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { Trans } from '@lingui/macro';
import * as React from 'react';
import Text from '../../UI/Text';
import { Column, Line } from '../../UI/Grid';
import { type TargetName } from '../../Utils/GDevelopServices/Build';
import {
type TargetName,
type BuildSigningOptions,
} from '../../Utils/GDevelopServices/Build';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
Expand All @@ -14,10 +17,15 @@ import { type HeaderProps, type ExportFlowProps } from '../ExportPipeline.flow';
import BuildStepsProgress from '../Builds/BuildStepsProgress';
import RaisedButton from '../../UI/RaisedButton';
import { ColumnStackLayout } from '../../UI/Layout';
import { AndroidSigningCredentialsSelector } from '../SigningCredentials/AndroidSigningCredentialsSelector';
import TextField from '../../UI/TextField';
import { t } from '@lingui/macro';
import AlertMessage from '../../UI/AlertMessage';

export type ExportState = {|
targets: Array<TargetName>,
keystore: 'old' | 'new',
keystore: 'old' | 'new' | 'custom',
buildSigningOptions: BuildSigningOptions | null,
signingDialogOpen: boolean,
|};

Expand All @@ -26,6 +34,7 @@ export const SetupExportHeader = ({
updateExportState,
isExporting,
build,
authenticatedUser,
}: HeaderProps<ExportState>): null | React.Node => {
// Build is finished, hide options.
if (!!build && build.status === 'complete') return null;
Expand Down Expand Up @@ -79,7 +88,9 @@ export const SetupExportHeader = ({
}));
}}
disabled={
exportState.targets[0] !== 'androidAppBundle' || isExporting
(exportState.targets[0] === 'androidApk' &&
exportState.keystore !== 'custom') ||
isExporting
}
/>
</Line>
Expand Down Expand Up @@ -153,10 +164,65 @@ export const SetupExportHeader = ({
<FormControlLabel
value={'custom'}
control={<Radio color="primary" />}
label={<Trans>Custom upload key (not available yet)</Trans>}
disabled
label={<Trans>Custom upload key</Trans>}
/>
</RadioGroup>
{exportState.keystore === 'custom' && (
<ColumnStackLayout noMargin>
<AndroidSigningCredentialsSelector
authenticatedUser={authenticatedUser}
buildSigningOptions={exportState.buildSigningOptions}
onSelectBuildSigningOptions={buildSigningOptions => {
updateExportState(prevExportState => ({
...prevExportState,
buildSigningOptions,
}));
}}
disabled={isExporting}
/>
{exportState.targets[0] === 'androidApk' && (
<ColumnStackLayout noMargin>
<AlertMessage kind="info">
<Trans>
If Google Play asks you to prove package name ownership,
paste the content of your{' '}
<b>adi-registration.properties</b> file from Google Play
Console here.
</Trans>
</AlertMessage>
<TextField
floatingLabelText={
<Trans>Package name verification token (optional)</Trans>
}
hintText={t`Paste the content of adi-registration.properties`}
value={
exportState.buildSigningOptions &&
exportState.buildSigningOptions.verificationTokenAsBase64
? atob(
exportState.buildSigningOptions
.verificationTokenAsBase64
)
: ''
}
onChange={(e, value) => {
updateExportState(prevExportState => ({
...prevExportState,
buildSigningOptions: {
...prevExportState.buildSigningOptions,
verificationTokenAsBase64: value
? btoa(value)
: undefined,
},
}));
}}
multiline
rows={4}
fullWidth
/>
</ColumnStackLayout>
)}
</ColumnStackLayout>
)}
</Dialog>
)}
</Column>
Expand Down
9 changes: 8 additions & 1 deletion newIDE/app/src/ExportAndShare/LocalExporters/LocalOnlineCordovaExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as React from 'react';
import assignIn from 'lodash/assignIn';
import {
type Build,
type BuildSigningOptions,
buildCordovaAndroid,
getBuildFileUploadOptions,
} from '../../Utils/GDevelopServices/Build';
Expand Down Expand Up @@ -63,6 +64,7 @@ export const localOnlineCordovaExportPipeline: ExportPipeline<
getInitialExportState: () => ({
targets: ['androidApk'],
keystore: 'new',
buildSigningOptions: null,
signingDialogOpen: false,
}),

Expand Down Expand Up @@ -201,12 +203,17 @@ export const localOnlineCordovaExportPipeline: ExportPipeline<
if (!firebaseUser)
return Promise.reject(new Error('User is not authenticated'));

const signing: BuildSigningOptions =
exportState.keystore === 'custom' && exportState.buildSigningOptions
? exportState.buildSigningOptions
: { keystore: exportState.keystore };

return buildCordovaAndroid(
getAuthorizationHeader,
firebaseUser.uid,
uploadBucketKey,
exportState.targets,
exportState.keystore,
signing,
gameId,
options,
payWithCredits
Expand Down
Loading
Loading