Skip to content
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

Jump to bottom

Remove AppLab build #1569

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Remove AppLab build #1569

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
13 changes: 2 additions & 11 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,15 +382,6 @@ android {
dimension "store"
}

appLab {
dimension "store"
externalNativeBuild {
cmake {
cppFlags "-DSTORE_BUILD", "-DMETA_APP_ID=4812663595466206"
}
}
}

metaStore {
dimension "store"
applicationIdSuffix ".metastore"
Expand Down Expand Up @@ -430,8 +421,8 @@ android {
if (backend == 'webkit' && !isWebKitAvailable())
variant.setIgnore(true);

// MetaStore and AppLab only apply to oculusvr builds.
if ((store == 'metaStore' || store == "appLab") && !platform.startsWith('oculusvr'))
// MetaStore only apply to oculusvr builds.
if (store == 'metaStore' && !platform.startsWith('oculusvr'))
variant.setIgnore(true);

}
Expand Down
36 changes: 0 additions & 36 deletions app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,6 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

// Show the deprecated version dialog, if needed.
showDeprecatedVersionDialogIfNeeded();

getLifecycleRegistry().setCurrentState(Lifecycle.State.CREATED);
}

Expand Down Expand Up @@ -488,39 +485,6 @@ private void initializeSpeechRecognizer() {
}
}

// A dialog to tell App Lab users to download Wolvic from the Meta store.
// Returns true if the dialog was shown, false otherwise.
private void showDeprecatedVersionDialogIfNeeded() {
// Only show this dialog to users running the App Lab version of Wolvic.
if (!DeviceType.getStoreType().equals(DeviceType.StoreType.META_APP_LAB))
return;

DeprecatedVersionDialogWidget deprecatedVersionDialog = new DeprecatedVersionDialogWidget(this);

deprecatedVersionDialog.setDelegate(response -> {
switch (response) {
case DeprecatedVersionDialogWidget.OPEN_STORE:
Intent storeIntent = getStoreIntent();
if (storeIntent != null) {
Log.w(LOGTAG, "Start app store activity.");
startActivity(storeIntent);
} else {
Log.e(LOGTAG, "Unsupported: can not start app store activity.");
}
break;

case DeprecatedVersionDialogWidget.SHOW_INFO:
mWindows.openNewTabAfterRestore(getString(R.string.deprecated_version_dialog_info_url), Windows.OPEN_IN_FOREGROUND);
break;

case DeprecatedVersionDialogWidget.DISMISS:
// no action
}
});
deprecatedVersionDialog.attachToWindow(mWindows.getFocusedWindow());
deprecatedVersionDialog.show(UIWidget.REQUEST_FOCUS);
}

// Returns true if the dialog was shown, false otherwise.
private boolean showTermsServiceDialogIfNeeded() {
if (SettingsStore.getInstance(this).isTermsServiceAccepted()) {
Expand Down
4 changes: 1 addition & 3 deletions app/src/common/shared/com/igalia/wolvic/utils/DeviceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,11 @@ public static String getDeviceTypeId() {
}

// Identifiers for store-specific builds.
public enum StoreType {NONE, META_STORE, META_APP_LAB, MAINLAND_CHINA}
public enum StoreType {NONE, META_STORE, MAINLAND_CHINA}

public static StoreType getStoreType() {
if (BuildConfig.FLAVOR_store.toLowerCase().contains("metastore"))
return StoreType.META_STORE;
else if (BuildConfig.FLAVOR_store.toLowerCase().contains("applab"))
return StoreType.META_APP_LAB;
else if (BuildConfig.FLAVOR_store.toLowerCase().contains("mainlandchina"))
return StoreType.MAINLAND_CHINA;
else
Expand Down
Loading