Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 344e6191 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch '1246-refactor-AppConstants' into 'main' 

Convert AppConstant.java into kotlin

See merge request !238
parents c69952a2 38c2b77d

app/src/main/java/foundation/e/drive/receivers/AccountRemoveCallbackReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


package foundation.e.drive.receivers;



import static foundation.e.drive.utils.AppConstants.INITIALFOLDERS_NUMBER;

import static foundation.e.drive.utils.AppConstants.INITIAL_FOLDER_NUMBER;

import static foundation.e.drive.utils.AppConstants.INITIALIZATION_HAS_BEEN_DONE;



import android.accounts.AccountManager;
@@ -115,7 +115,7 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver { 
            prefs.edit().remove(AccountManager.KEY_ACCOUNT_NAME)

                    .remove(AccountManager.KEY_ACCOUNT_TYPE)

                    .remove(INITIALIZATION_HAS_BEEN_DONE)

                    .remove(INITIALFOLDERS_NUMBER)

                    .remove(INITIAL_FOLDER_NUMBER)

                    .remove(AppConstants.KEY_LAST_SYNC_TIME)

                    .apply();

        }

app/src/main/java/foundation/e/drive/utils/AppConstants.java

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/*

 * Copyright © CLEUS SAS 2018-2019.

 * Copyright © ECORP SAS 2022-2023.

 * All rights reserved. This program and the accompanying materials

 * are made available under the terms of the GNU Public License v3.0

 * which accompanies this distribution, and is available at

 * http://www.gnu.org/licenses/gpl.html

 */



package foundation.e.drive.utils;



import static com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR;



import android.os.Build;

import android.os.Environment;



import java.text.SimpleDateFormat;

import java.util.Locale;



import foundation.e.drive.BuildConfig;



/**

 * @author Vincent Bourgmayer

 * @author Abhishek Aggarwal

 */

public abstract class AppConstants {



    public static final String MEDIASYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.MediasSyncProvider";

    public static final String SETTINGSYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.SettingsSyncProvider";

    public static final String METERED_NETWORK_ALLOWED_AUTHORITY = "foundation.e.drive.providers.MeteredConnectionAllowedProvider";

    public static final String INITIALIZATION_HAS_BEEN_DONE = "initService_has_run";

    public static final String INITIALFOLDERS_NUMBER = "initial_folder_number";

    public static final String APPLICATIONS_LIST_FILE_NAME = "packages_list.csv";

    public static final String SHARED_PREFERENCE_NAME = "preferences";

    public static final String KEY_LAST_SYNC_TIME = "lastSyncTimestamp";



    public static final String ACCOUNT_DATA_NAME = "display_name";

    public static final String ACCOUNT_DATA_USED_QUOTA_KEY = "used_quota";

    public static final String ACCOUNT_DATA_TOTAL_QUOTA_KEY = "total_quota";

    public static final String ACCOUNT_DATA_RELATIVE_QUOTA_KEY = "relative_quota";

    public static final String ACCOUNT_DATA_GROUPS = "group";

    public static final String ACCOUNT_DATA_ALIAS_KEY = "alias";

    public static final String ACCOUNT_DATA_EMAIL = "email";

    public static final String ACCOUNT_USER_ID_KEY = "USERID";

    public static final String[] MEDIA_SYNCABLE_CATEGORIES = new String[]{"Images", "Movies", "Music", "Ringtones", "Documents", "Podcasts"};

    public static final String[] SETTINGS_SYNCABLE_CATEGORIES = new String[]{"Rom settings"};



    public static final String notificationChannelID = "foundation.e.drive";

    public static final String WORK_GENERIC_TAG = "eDrive";

    public static final String WORK_INITIALIZATION_TAG = "eDrive-init";

    public static final String USER_AGENT = "eos(" + getBuildTime() + ")-eDrive(" + BuildConfig.VERSION_NAME + ")";



    /**

     * Get a readable OS's build date String

     *

     * @return Os'build date

     */

    private static String getBuildTime() {

        long ts = Build.TIME;

        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());

        return sdf.format(ts);

    }

}

app/src/main/java/foundation/e/drive/utils/AppConstants.kt

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright © CLEUS SAS 2018-2019.

 * Copyright © MURENA SAS 2022-2023.

 * All rights reserved. This program and the accompanying materials

 * are made available under the terms of the GNU Public License v3.0

 * which accompanies this distribution, and is available at

 * http://www.gnu.org/licenses/gpl.html

 */

package foundation.e.drive.utils



import android.os.Build

import foundation.e.drive.BuildConfig

import java.text.SimpleDateFormat

import java.util.Locale



/**

 * @author Vincent Bourgmayer

 * @author Abhishek Aggarwal

 */

object AppConstants {

    const val MEDIA_SYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.MediasSyncProvider"

    const val SETTINGS_SYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.SettingsSyncProvider"

    const val METERED_NETWORK_ALLOWED_AUTHORITY =

        "foundation.e.drive.providers.MeteredConnectionAllowedProvider"

    const val INITIALIZATION_HAS_BEEN_DONE = "initService_has_run"

    const val INITIAL_FOLDER_NUMBER = "initial_folder_number"

    const val APPLICATIONS_LIST_FILE_NAME = "packages_list.csv"

    const val SHARED_PREFERENCE_NAME = "preferences"

    const val KEY_LAST_SYNC_TIME = "lastSyncTimestamp"

    const val ACCOUNT_DATA_NAME = "display_name"

    const val ACCOUNT_DATA_USED_QUOTA_KEY = "used_quota"

    const val ACCOUNT_DATA_TOTAL_QUOTA_KEY = "total_quota"

    const val ACCOUNT_DATA_RELATIVE_QUOTA_KEY = "relative_quota"

    const val ACCOUNT_DATA_GROUPS = "group"

    const val ACCOUNT_DATA_ALIAS_KEY = "alias"

    const val ACCOUNT_DATA_EMAIL = "email"

    const val ACCOUNT_USER_ID_KEY = "USERID"

    const val notificationChannelID = "foundation.e.drive"

    const val WORK_GENERIC_TAG = "eDrive"

    const val WORK_INITIALIZATION_TAG = "eDrive-init"

    @JvmField

    val USER_AGENT = "eos(" + buildTime + ")-eDrive(" + BuildConfig.VERSION_NAME + ")"



    /**

     * Get a readable OS's build date String

     *

     * @return Os'build date

     */

    private val buildTime: String

        get() {

            val ts = Build.TIME

            val sdf = SimpleDateFormat("yyyyMMdd", Locale.getDefault())

            return sdf.format(ts)

        }

}
 
 No newline at end of file

app/src/main/java/foundation/e/drive/utils/CommonUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ import foundation.e.drive.work.AccountUserInfoWorker; 
import foundation.e.drive.work.WorkRequestFactory;

import timber.log.Timber;



import static foundation.e.drive.utils.AppConstants.MEDIASYNC_PROVIDER_AUTHORITY;

import static foundation.e.drive.utils.AppConstants.MEDIA_SYNC_PROVIDER_AUTHORITY;

import static foundation.e.drive.utils.AppConstants.METERED_NETWORK_ALLOWED_AUTHORITY;

import static foundation.e.drive.utils.AppConstants.SETTINGSYNC_PROVIDER_AUTHORITY;

import static foundation.e.drive.utils.AppConstants.SETTINGS_SYNC_PROVIDER_AUTHORITY;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -137,7 +137,7 @@ public abstract class CommonUtils { 
     * @return true if media sync enabled

     */

    public static boolean isMediaSyncEnabled(@NonNull Account account) {

        return ContentResolver.getSyncAutomatically(account, MEDIASYNC_PROVIDER_AUTHORITY);

        return ContentResolver.getSyncAutomatically(account, MEDIA_SYNC_PROVIDER_AUTHORITY);

    }



    /**
@@ -147,7 +147,7 @@ public abstract class CommonUtils { 
     * @return true if enabled

     */

    public static boolean isSettingsSyncEnabled(@NonNull Account account) {

        return ContentResolver.getSyncAutomatically(account, SETTINGSYNC_PROVIDER_AUTHORITY);

        return ContentResolver.getSyncAutomatically(account, SETTINGS_SYNC_PROVIDER_AUTHORITY);

    }



    /**

app/src/main/java/foundation/e/drive/work/FirstStartWorker.java

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


package foundation.e.drive.work;



import static foundation.e.drive.utils.AppConstants.INITIALFOLDERS_NUMBER;

import static foundation.e.drive.utils.AppConstants.INITIAL_FOLDER_NUMBER;

import static foundation.e.drive.work.WorkRequestFactory.WorkType.ONE_TIME_APP_LIST;

import static foundation.e.drive.work.WorkRequestFactory.WorkType.PERIODIC_SCAN;
@@ -49,7 +49,7 @@ public class FirstStartWorker extends Worker { 
                Context.MODE_PRIVATE)

                .edit()

                .putBoolean(AppConstants.INITIALIZATION_HAS_BEEN_DONE, true)

                .putInt(INITIALFOLDERS_NUMBER, 9)

                .putInt(INITIAL_FOLDER_NUMBER, 9)

                .apply();



        registerPeriodicWork(appContext);