fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow mPropertiesList to be null for SharedProperties

Browse Source 
This will allow all keys that are read from file to be stored in mMap without knowing their names beforehand.
This commit is contained in:
agnostic-apollo
2021-03-24 02:27:28 +05:00
parent 8612a1d0f8
commit f393e9b2cf
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/termux/app/settings/properties/SharedProperties.java
View File

@@ -42,8 +42,8 @@ public class SharedProperties {
/** /**
* The {@link Properties} object that maintains an in-memory cache of values loaded from the * The {@link Properties} object that maintains an in-memory cache of values loaded from the
* {@link #mPropertiesFile} file. The key/value pairs are of any keys defined by * {@link #mPropertiesFile} file. The key/value pairs are of any keys that are found in the file
* {@link #mPropertiesList} that are found in the file against their literal values in the file. * against their literal values in the file.
*/ */
private Properties mProperties; private Properties mProperties;
@@ -85,9 +85,11 @@ public class SharedProperties {
* @param context The Context for operations. * @param context The Context for operations.
* @param propertiesFile The {@link File} object to load properties from. * @param propertiesFile The {@link File} object to load properties from.
* @param propertiesList The {@link Set<String>} object that defined which properties to load. * @param propertiesList The {@link Set<String>} object that defined which properties to load.
* If this is set to {@code null}, then all properties that exist in
* {@code propertiesFile} will be read by {@link #loadPropertiesFromDisk()}
* @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface. * @param sharedPropertiesParser The implementation of the {@link SharedPropertiesParser} interface.
*/ */
public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, @Nonnull Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) { public SharedProperties(@Nonnull Context context, @Nullable File propertiesFile, Set<String> propertiesList, @Nonnull SharedPropertiesParser sharedPropertiesParser) {
mContext = context; mContext = context;
mPropertiesFile = propertiesFile; mPropertiesFile = propertiesFile;
mPropertiesList = propertiesList; mPropertiesList = propertiesList;
@@ -98,8 +100,9 @@ public class SharedProperties {
} }
/** /**
* Load the properties defined by {@link #mPropertiesList} from the {@link #mPropertiesFile} file * Load the properties defined by {@link #mPropertiesList} or all properties if its {@code null}
* to update the {@link #mProperties} and {@link #mMap} in-memory cache. * from the {@link #mPropertiesFile} file to update the {@link #mProperties} and {@link #mMap}
* in-memory cache.
* Properties are not loading automatically when constructor is called and must be manually called. * Properties are not loading automatically when constructor is called and must be manually called.
*/ */
public void loadPropertiesFromDisk() { public void loadPropertiesFromDisk() {
@@ -115,9 +118,13 @@ public class SharedProperties {
HashMap<String, Object> map = new HashMap<String, Object>(); HashMap<String, Object> map = new HashMap<String, Object>();
Properties newProperties = new Properties(); Properties newProperties = new Properties();
Set<String> propertiesList = mPropertiesList;
if(propertiesList == null)
propertiesList = properties.stringPropertyNames();
String value; String value;
Object internalValue; Object internalValue;
for (String key : mPropertiesList) { for (String key : propertiesList) {
value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile value = properties.getProperty(key); // value will be null if key does not exist in propertiesFile
Logger.logDebug(LOG_TAG, key + " : " + value); Logger.logDebug(LOG_TAG, key + " : " + value);
@@ -126,7 +133,7 @@ public class SharedProperties {
internalValue = mSharedPropertiesParser.getInternalPropertyValueFromValue(mContext, key, value); internalValue = mSharedPropertiesParser.getInternalPropertyValueFromValue(mContext, key, value);
// If the internal value was successfully added to map, then also add value to newProperties // If the internal value was successfully added to map, then also add value to newProperties
// We only store values in-memory defined by {@link #mPropertiesList} // We only store values in-memory defined by propertiesList
if (putToMap(map, key, internalValue)) { // null internalValue will be put into map if (putToMap(map, key, internalValue)) { // null internalValue will be put into map
putToProperties(newProperties, key, value); // null value will **not** be into properties putToProperties(newProperties, key, value); // null value will **not** be into properties
} }