diff --git a/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java b/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java index 2ee244c0c..714cceefb 100644 --- a/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java +++ b/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java @@ -47,7 +47,7 @@ public class AdvancedSettingsFragment extends SettingsFragment { mBackgroundMode, mStartAtBoot, mDarkMode; - private TextSetting mRemoteProvisioningUrl, mDisplayName, mUsername, mDeviceName; + private TextSetting mRemoteProvisioningUrl, mDisplayName, mUsername, mDeviceName, mLogUploadUrl; private BasicSetting mAndroidAppSettings; @Nullable @@ -78,6 +78,9 @@ public class AdvancedSettingsFragment extends SettingsFragment { mJavaLogger.setVisibility( Build.MANUFACTURER.equals("BlackBerry") ? View.VISIBLE : View.GONE); + mLogUploadUrl = mRootView.findViewById(R.id.pref_log_collection_upload_server_url); + mLogUploadUrl.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI); + mFriendListSubscribe = mRootView.findViewById(R.id.pref_friendlist_subscribe); mBackgroundMode = mRootView.findViewById(R.id.pref_background_mode); @@ -116,6 +119,14 @@ public class AdvancedSettingsFragment extends SettingsFragment { } }); + mLogUploadUrl.setListener( + new SettingListenerBase() { + @Override + public void onTextValueChanged(String newValue) { + mPrefs.setLogCollectionUploadServerUrl(newValue); + } + }); + mFriendListSubscribe.setListener( new SettingListenerBase() { @Override @@ -206,6 +217,8 @@ public class AdvancedSettingsFragment extends SettingsFragment { mJavaLogger.setChecked(mPrefs.useJavaLogger()); + mLogUploadUrl.setValue(mPrefs.getLogCollectionUploadServerUrl()); + mFriendListSubscribe.setChecked(mPrefs.isFriendlistsubscriptionEnabled()); mBackgroundMode.setChecked(mPrefs.getServiceNotificationVisibility()); diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java index 1785efd6d..f52952a92 100644 --- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java +++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java @@ -708,6 +708,16 @@ public class LinphonePreferences { getLc().setFileTransferServer(url); } + public String getLogCollectionUploadServerUrl() { + if (getLc() == null) return null; + return getLc().getLogCollectionUploadServerUrl(); + } + + public void setLogCollectionUploadServerUrl(String url) { + if (getLc() == null) return; + getLc().setLogCollectionUploadServerUrl(url); + } + public String getRemoteProvisioningUrl() { if (getLc() == null) return null; return getLc().getProvisioningUri(); diff --git a/app/src/main/res/layout/settings_advanced.xml b/app/src/main/res/layout/settings_advanced.xml index 54c33fc27..752f435a1 100644 --- a/app/src/main/res/layout/settings_advanced.xml +++ b/app/src/main/res/layout/settings_advanced.xml @@ -63,6 +63,14 @@ linphone:hint="@string/pref_remote_provisioning_title" linphone:title="@string/pref_remote_provisioning_title" /> + + Primary account Display name Username + Logs upload server + Do not edit unless you know what you are doing! Audio hacks