Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/actions/build-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ runs:
agvtool new-version -all ${{ inputs.BUILD_VERSION }}
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./RocketChatRN/Info.plist
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./ShareRocketChatRN/Info.plist
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./RocketChatRN/Info.plist
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./ShareRocketChatRN/Info.plist
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./NotificationService/Info.plist
shell: bash

- name: Set Google Services
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
echo -e "hermesEnabled=true" >> ./gradle.properties
echo -e "VERSIONCODE=999999" >> ./gradle.properties
echo -e "KEYSTORE=release.keystore" >> ./gradle.properties
echo -e "KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}" >> ./gradle.properties
echo -e "KEY_ALIAS=${{ secrets.KEYSTORE_OFFICIAL_ALIAS }}" >> ./gradle.properties
echo -e "KEY_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}" >> ./gradle.properties
echo -e "BugsnagAPIKey=${{ secrets.BUGSNAG_KEY_OFFICIAL }}" >> ./gradle.properties
echo -e 'KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}' >> ./gradle.properties
echo -e 'KEY_ALIAS=${{ secrets.KEYSTORE_OFFICIAL_ALIAS }}' >> ./gradle.properties
echo -e 'KEY_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}' >> ./gradle.properties
echo -e 'BugsnagAPIKey=${{ secrets.BUGSNAG_KEY_OFFICIAL }}' >> ./gradle.properties

- name: Build Android Release APK
working-directory: android
Expand Down
6 changes: 6 additions & 0 deletions .maestro/helpers/login.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,9 @@ onFlowStart:
visible:
id: rooms-list-view
timeout: 60000
- runFlow:
when:
platform: iOS
visible: 'Not Now'
commands:
- tapOn: 'Not Now'
5 changes: 0 additions & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ android {
productFlavors {
official {
dimension = "app"
buildConfigField "boolean", "IS_OFFICIAL", "true"
}
experimental {
dimension = "app"
buildConfigField "boolean", "IS_OFFICIAL", "false"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/debug/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<resources>
<string name="app_name">[DEBUG] Rocket.Chat Experimental</string>
<string name="share_extension_name">[DEBUG] Rocket.Chat Experimental</string>
<string name="app_name">[DEBUG] Rocket.Chat</string>
<string name="share_extension_name">[DEBUG] Rocket.Chat</string>
</resources>
Binary file removed android/app/src/experimental/ic_launcher-web.png
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
114 changes: 0 additions & 114 deletions android/app/src/experimental/res/drawable/ic_launcher_foreground.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 0 additions & 6 deletions android/app/src/experimental/res/values/colors.xml

This file was deleted.

4 changes: 0 additions & 4 deletions android/app/src/experimental/res/values/strings.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import chat.rocket.mobilecrypto.algorithms.CryptoUtils;
import com.nozbe.watermelondb.WMDatabase;

import java.lang.reflect.Field;
import java.security.SecureRandom;
import java.util.Arrays;

Expand Down Expand Up @@ -215,23 +214,8 @@ public Room readRoom(final Ejson ejson, Context context) {
}

private String getDatabaseName(String serverUrl, Context context) {
int resId = context.getResources().getIdentifier("rn_config_reader_custom_package", "string", context.getPackageName());
String className = context.getString(resId);
Boolean isOfficial = false;

try {
Class<?> clazz = Class.forName(className + ".BuildConfig");
Field IS_OFFICIAL = clazz.getField("IS_OFFICIAL");
isOfficial = (Boolean) IS_OFFICIAL.get(null);
} catch (Exception e) {
e.printStackTrace();
}

// Match JS WatermelonDB naming: strip scheme, replace '/' with '.', add '-experimental' when needed, and append one ".db".
// Match JS WatermelonDB naming: strip scheme, replace '/' with '.', and append one ".db".
String name = serverUrl.replaceFirst("^(\\w+:)?//", "").replace("/", ".");
if (!isOfficial) {
name += "-experimental";
}
name += ".db";

// Important: return just the name (not an absolute path). WMDatabase will resolve and append its own ".db" internally,
Expand Down
3 changes: 0 additions & 3 deletions app/lib/constants/environment.ts

This file was deleted.

3 changes: 1 addition & 2 deletions app/lib/database/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import SQLiteAdapter from '@nozbe/watermelondb/adapters/sqlite';
import logger from '@nozbe/watermelondb/utils/common/logger';

import { appGroupPath } from '../methods/appGroup';
import { isOfficial } from '../constants/environment';
import Subscription from './model/Subscription';
import Room from './model/Room';
import Message from './model/Message';
Expand All @@ -30,7 +29,7 @@ if (__DEV__) {
console.log(appGroupPath);
}

const getDatabasePath = (name: string) => `${appGroupPath}${name}${isOfficial ? '' : '-experimental'}.db`;
const getDatabasePath = (name: string) => `${appGroupPath}${name}.db`;

export const getDatabase = (database = ''): Database => {
const path = database.replace(/(^\w+:|^)\/\//, '').replace(/\//g, '.');
Expand Down
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/100.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/114.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/120.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/144.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/152.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/167.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/180.png
Binary file not shown.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/20.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/29.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/40.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/50.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/57.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/58.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/60.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/72.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/76.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/80.png
Diff not rendered.
Binary file removed ios/Experimental.xcassets/AppIcon.appiconset/87.png
Diff not rendered.
164 changes: 0 additions & 164 deletions ios/Experimental.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

6 changes: 0 additions & 6 deletions ios/Experimental.xcassets/Contents.json

This file was deleted.

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading
Loading