revert meeting change

This commit is contained in:
adbenitez
2025-06-20 19:04:42 +02:00
parent 365f1dbbe6
commit 571f49ab13
3 changed files with 9 additions and 10 deletions
@@ -92,6 +92,10 @@ public class AttachmentTypeSelector extends PopupWindow {
ViewUtil.findById(layout, R.id.location_linear_layout).setVisibility(View.GONE);
}
if (!DcHelper.isWebrtcConfigOk(DcHelper.getContext(context))) {
ViewUtil.findById(layout, R.id.invite_video_chat_linear_layout).setVisibility(View.GONE);
}
setLocationButtonImage(context);
setContentView(layout);
@@ -74,9 +74,6 @@ public class DcHelper {
public static final String CONFIG_WEBXDC_REALTIME_ENABLED = "webxdc_realtime_enabled";
public static final String CONFIG_PRIVATE_TAG = "private_tag";
public static final String DEFAULT_VIDEOCHAT_URL_PREFIX = "https://meet.systemli.org/";
public static final String DEFAULT_VIDEOCHAT_URL = DEFAULT_VIDEOCHAT_URL_PREFIX + "$ROOM#config.prejoinConfig.enabled=false&config.notifications=[]&config.toolbarButtons=[%22microphone%22,%22camera%22,%22hangup%22]";
public static DcContext getContext(@NonNull Context context) {
return ApplicationContext.getInstance(context).dcContext;
}
@@ -406,12 +403,9 @@ public class DcHelper {
}
public static String getVideochatURL(DcContext dcContext) {
public static boolean isWebrtcConfigOk(DcContext dcContext) {
String instance = dcContext.getConfig(DcHelper.CONFIG_WEBRTC_INSTANCE);
if (instance != null && !instance.isEmpty()) {
return instance;
}
return DEFAULT_VIDEOCHAT_URL;
return (instance != null && !instance.isEmpty());
}
@NonNull
@@ -338,7 +338,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
View gl = View.inflate(requireActivity(), R.layout.single_line_input, null);
EditText inputField = gl.findViewById(R.id.input_field);
inputField.setHint(R.string.videochat_instance_placeholder);
inputField.setText(DcHelper.getVideochatURL(dcContext));
inputField.setText(dcContext.getConfig(DcHelper.CONFIG_WEBRTC_INSTANCE));
inputField.setSelection(inputField.getText().length());
inputField.setInputType(TYPE_TEXT_VARIATION_URI);
new AlertDialog.Builder(requireActivity())
@@ -381,7 +381,8 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
private void updateWebrtcSummary() {
Preference webrtcInstance = this.findPreference("pref_webrtc_instance");
if (webrtcInstance != null) {
webrtcInstance.setSummary(DcHelper.getVideochatURL(dcContext));
webrtcInstance.setSummary(DcHelper.isWebrtcConfigOk(dcContext)?
dcContext.getConfig(DcHelper.CONFIG_WEBRTC_INSTANCE) : getString(R.string.none));
}
}