remove extensions

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/utils/extensions/ContextExtensions.kt

@@ -12,7 +12,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.RestrictionsManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
@@ -20,23 +19,6 @@ import android.widget.Toast
 import com.google.common.io.Resources
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ReceiverFlag
-import com.owncloud.android.utils.appConfig.AppConfigKeys
-
-fun <T : Any> Context.getRestriction(appConfigKey: AppConfigKeys, defaultValue: T): T {
-    val restrictionsManager = getSystemService(Context.RESTRICTIONS_SERVICE) as? RestrictionsManager
-    return restrictionsManager?.getRestriction(appConfigKey.key, defaultValue) ?: defaultValue
-}
-
-@Suppress("UNCHECKED_CAST")
-private fun <T : Any> RestrictionsManager.getRestriction(key: String, defaultValue: T): T {
-    val appRestrictions = getApplicationRestrictions()
-    return when (defaultValue) {
-        is String -> appRestrictions.getString(key, defaultValue) as T? ?: defaultValue
-        is Int -> appRestrictions.getInt(key, defaultValue) as T? ?: defaultValue
-        is Boolean -> appRestrictions.getBoolean(key, defaultValue) as T? ?: defaultValue
-        else -> defaultValue
-    }
-}
 
 fun Context.hourPlural(hour: Int): String = resources.getQuantityString(R.plurals.hours, hour, hour)
 

app/src/main/java/com/nextcloud/utils/mdm/MDMConfig.kt

@@ -8,7 +8,7 @@
 package com.nextcloud.utils.mdm
 
 import android.content.Context
-import com.nextcloud.utils.extensions.getRestriction
+import android.content.RestrictionsManager
 import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
 import com.owncloud.android.utils.appConfig.AppConfigKeys
@@ -95,4 +95,25 @@ object MDMConfig {
 
         return loggerEnabled && !disableLogViaMDM && BuildConfig.DEBUG
     }
+
+    fun getBaseUrl(context: Context): String = context.getRestriction(AppConfigKeys.BaseUrl, "")
+
+    fun getHost(context: Context): String =
+        context.getRestriction(AppConfigKeys.ProxyHost, context.getString(R.string.proxy_host))
+
+    fun getPort(context: Context): Int =
+        context.getRestriction(AppConfigKeys.ProxyPort, context.resources.getInteger(R.integer.proxy_port))
+
+    @Suppress("UNCHECKED_CAST")
+    private fun <T : Any> Context.getRestriction(appConfigKey: AppConfigKeys, defaultValue: T): T {
+        val restrictionsManager = getSystemService(Context.RESTRICTIONS_SERVICE) as? RestrictionsManager
+        val appRestrictions = restrictionsManager?.getApplicationRestrictions() ?: return defaultValue
+
+        return when (defaultValue) {
+            is String -> appRestrictions.getString(appConfigKey.key, defaultValue) as T? ?: defaultValue
+            is Int -> appRestrictions.getInt(appConfigKey.key, defaultValue) as T? ?: defaultValue
+            is Boolean -> appRestrictions.getBoolean(appConfigKey.key, defaultValue) as T? ?: defaultValue
+            else -> defaultValue
+        }
+    }
 }

app/src/main/java/com/owncloud/android/MainApp.java

@@ -87,7 +87,6 @@ import com.owncloud.android.utils.FilesSyncHelper;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.ReceiversHelper;
 import com.owncloud.android.utils.SecurityUtils;
-import com.owncloud.android.utils.appConfig.AppConfigKeys;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
 import org.conscrypt.Conscrypt;
@@ -422,8 +421,8 @@ public class MainApp extends Application implements HasAndroidInjector, NetworkC
             return;
         }
 
-        String host = ContextExtensionsKt.getRestriction(this, AppConfigKeys.ProxyHost, getString(R.string.proxy_host));
-        int port = ContextExtensionsKt.getRestriction(this, AppConfigKeys.ProxyPort, getResources().getInteger(R.integer.proxy_port));
+        String host = MDMConfig.INSTANCE.getHost(this);
+        int port = MDMConfig.INSTANCE.getPort(this);
 
         if (TextUtils.isEmpty(host) || port == -1) {
             Log_OC.d(TAG, "Proxy configuration cannot be found");

app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -70,7 +70,6 @@ import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.common.PlainClient;
 import com.nextcloud.operations.PostMethod;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
-import com.nextcloud.utils.extensions.ContextExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
@@ -113,7 +112,6 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.WebViewUtil;
-import com.owncloud.android.utils.appConfig.AppConfigKeys;
 import com.owncloud.android.utils.theme.CapabilityUtils;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
@@ -321,7 +319,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         String webloginUrl = null;
 
         if (MainApp.isClientBrandedPlus()) {
-            String baseUrl = ContextExtensionsKt.getRestriction(this, AppConfigKeys.BaseUrl, "");
+            String baseUrl = MDMConfig.INSTANCE.getBaseUrl(this);
             if (!TextUtils.isEmpty(baseUrl)) {
                 webloginUrl = baseUrl + WEB_LOGIN;
             }