diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-10-25 15:45:59 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-11-13 15:27:57 +0100 |
| commit | c40014e75f5d1e5649f0b8416addd72982073d37 (patch) | |
| tree | 7ac05d6f3eb2d16087e59a0aad351d6974b712e5 /android/source/src/java | |
| parent | tdf#121325: Replace all of given length, even if replacement is shorter (diff) | |
| download | core-c40014e75f5d1e5649f0b8416addd72982073d37.tar.gz core-c40014e75f5d1e5649f0b8416addd72982073d37.zip | |
android: lock away editing mode in separate build flavor
Change-Id: I767cc1d512345aa20570001033ddb4d882e3ca35
Reviewed-on: https://gerrit.libreoffice.org/62362
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'android/source/src/java')
| -rw-r--r-- | android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 8 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/SettingsActivity.java | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 5472ac903de1..063c75bf2158 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -136,8 +136,6 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin super.onCreate(savedInstanceState); SettingsListenerModel.getInstance().setListener(this); - SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - mIsExperimentalMode = sPrefs.getBoolean(ENABLE_EXPERIMENTAL_PREFS_KEY, false); updatePreferences(); setContentView(R.layout.activity_main); @@ -265,8 +263,10 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin private void updatePreferences() { SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - mIsExperimentalMode = sPrefs.getBoolean(ENABLE_EXPERIMENTAL_PREFS_KEY, false); - mIsDeveloperMode = sPrefs.getBoolean(ENABLE_DEVELOPER_PREFS_KEY, false); + mIsExperimentalMode = BuildConfig.ALLOW_EDITING + && sPrefs.getBoolean(ENABLE_EXPERIMENTAL_PREFS_KEY, false); + mIsDeveloperMode = mIsExperimentalMode + && sPrefs.getBoolean(ENABLE_DEVELOPER_PREFS_KEY, false); if (sPrefs.getInt(ASSETS_EXTRACTED_PREFS_KEY, 0) != BuildConfig.VERSION_CODE) { if(copyFromAssets(getAssets(), "unpack", getApplicationInfo().dataDir)) { sPrefs.edit().putInt(ASSETS_EXTRACTED_PREFS_KEY, BuildConfig.VERSION_CODE).apply(); diff --git a/android/source/src/java/org/libreoffice/SettingsActivity.java b/android/source/src/java/org/libreoffice/SettingsActivity.java index de5f388c7c25..73ada55b9380 100644 --- a/android/source/src/java/org/libreoffice/SettingsActivity.java +++ b/android/source/src/java/org/libreoffice/SettingsActivity.java @@ -29,6 +29,9 @@ public class SettingsActivity extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.libreoffice_preferences); + if(!BuildConfig.ALLOW_EDITING) { + getPreferenceScreen().removePreference(findPreference("PREF_CATEGORY_GENERAL")); + } } @Override |