nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

Simplify main app get string logic 

Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-03-28 09:58:36 +01:00 committed by Alper Öztürk
parent 71cdd06415
commit 05729519f5
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/owncloud/android/MainApp.java
View File

@ -647,6 +647,13 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
}
}
public static String string(int id) {
return getAppContext().getString(id);
}
public static String string(int id, Object args) {
return getAppContext().getString(id, args);
}
public static Context getAppContext() {
return MainApp.mContext;
@ -674,32 +681,32 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
// From AccountAuthenticator
// public static final String AUTHORITY = "org.owncloud";
public static String getAuthority() {
return getAppContext().getResources().getString(R.string.authority);
return string(R.string.authority);
}
// From AccountAuthenticator
// public static final String AUTH_TOKEN_TYPE = "org.owncloud";
public static String getAuthTokenType() {
return getAppContext().getResources().getString(R.string.authority);
return string(R.string.authority);
}
// From ProviderMeta
// public static final String DB_FILE = "owncloud.db";
public static String getDBFile() {
return getAppContext().getResources().getString(R.string.db_file);
return string(R.string.db_file);
}
// From ProviderMeta
// private final String mDatabaseName = "ownCloud";
public static String getDBName() {
return getAppContext().getResources().getString(R.string.db_name);
return string(R.string.db_name);
}
/**
* name of data_folder, e.g., "owncloud"
*/
public static String getDataFolder() {
return getAppContext().getResources().getString(R.string.data_folder);
return string(R.string.data_folder);
}
public static void showOnlyFilesOnDevice(boolean state) {
@ -725,8 +732,8 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
// user agent
private static String getUserAgent(@StringRes int agent) {
String appString = getAppContext().getResources().getString(agent);
String brandedName = getAppContext().getString(R.string.name_for_branded_user_agent);
String appString = string(agent);
String brandedName = string(R.string.name_for_branded_user_agent);
String packageName = getAppContext().getPackageName();
String version = "";

2
app/src/main/java/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
View File

@ -40,7 +40,7 @@ public class SystemDefaultStoragePointProvider extends AbstractStoragePointProvi
public Vector<StoragePoint> getAvailableStoragePoint() {
Vector<StoragePoint> result = new Vector<>();
final String defaultStringDesc = MainApp.getAppContext().getString(R.string.storage_description_default);
final String defaultStringDesc = MainApp.string(R.string.storage_description_default);
// Add private internal storage data directory.
result.add(new StoragePoint(defaultStringDesc,
MainApp.getAppContext().getFilesDir().getAbsolutePath(), StoragePoint.StorageType.INTERNAL,

2
app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
View File

@ -180,7 +180,7 @@ public final class DisplayUtils {
*/
public static String bytesToHumanReadable(long bytes) {
if (bytes < 0) {
return MainApp.getAppContext().getString(R.string.common_pending);
return MainApp.string(R.string.common_pending);
} else {
double result = bytes;
int suffixIndex = 0;

2
app/src/main/java/com/owncloud/android/utils/theme/ThemeUtils.java
View File

@ -43,7 +43,7 @@ public final class ThemeUtils {
OCCapability capability = CapabilityUtils.getCapability(context);
if (MainApp.isOnlyOnDevice()) {
return MainApp.getAppContext().getString(R.string.drawer_item_on_device);
return MainApp.string(R.string.drawer_item_on_device);
} else {
if (capability.getServerName() == null || capability.getServerName().isEmpty()) {
return MainApp.getAppContext().getResources().getString(R.string.default_display_name_for_root_folder);