Code refactoring.

Author: surinder-tsys

app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -350,6 +350,15 @@ default void onDarkThemeModeChanged(DarkMode mode) {
     void setDataAnalysis(boolean enableDataAnalysis);
     boolean isDataAnalysisEnabled();
 
+    /**
+     * Saves the privacy policy action taken by user
+     * this will maintain the state of current privacy policy action taken
+     * @see com.nmc.android.ui.LoginPrivacySettingsActivity for actions
+     * @param userAction taken by user
+     */
+    void setPrivacyPolicyAction(int userAction);
+    int getPrivacyPolicyAction();
+
     /**
      * Gets status of migration to user id, default false
      *

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

@@ -30,6 +30,7 @@
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.account.UserAccountManagerImpl;
+import com.nmc.android.ui.LoginPrivacySettingsActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -104,6 +105,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     private static final String PREF__IN_APP_REVIEW_DATA = "in_app_review_data";
 
     private static final String PREF__DATA_ANALYSIS = "data_analysis";
+    private static final String PREF__PRIVACY_POLICY_ACTION = "privacy_policy_action";
 
     private final Context context;
     private final SharedPreferences preferences;
@@ -584,6 +586,16 @@ public boolean isDataAnalysisEnabled() {
         return preferences.getBoolean(PREF__DATA_ANALYSIS, true);
     }
 
+    @Override
+    public void setPrivacyPolicyAction(int userAction) {
+        preferences.edit().putInt(PREF__PRIVACY_POLICY_ACTION, userAction).apply();
+    }
+
+    @Override
+    public int getPrivacyPolicyAction() {
+        return preferences.getInt(PREF__PRIVACY_POLICY_ACTION, LoginPrivacySettingsActivity.NO_ACTION);
+    }
+
     @Override
     public boolean isUserIdMigrated() {
         return preferences.getBoolean(PREF__MIGRATED_USER_ID, false);

app/src/main/java/com/nmc/android/marketTracking/MoEngageSdkUtils.kt

@@ -6,9 +6,13 @@ import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
 
 object MoEngageSdkUtils {
+
+    //enable/disable moengage as we are not using it right now due to no proper firebase api key
+    private const val MOENGAGE_ENABLED = false
+
     @JvmStatic
     fun initMoEngageSDK(application: Application) {
-        if (application.resources.getBoolean(R.bool.moengage_enabled)) {
+        if (MOENGAGE_ENABLED) {
             val moEngage = MoEngage.Builder(application, BuildConfig.MOENGAGE_APP_ID)
                 .build()
             MoEngage.initialise(moEngage)

app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -57,9 +57,9 @@
 import com.nextcloud.client.logger.ui.LogsActivity;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nmc.android.marketTracking.TealiumSdkUtils;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.nextcloud.client.preferences.DarkMode;
-import com.nmc.android.marketTracking.TealiumSdkUtils;
 import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -64,9 +64,9 @@
 import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
 import com.nextcloud.utils.EditorUtils;
 import com.nextcloud.utils.ShortcutUtil;
+import com.nmc.android.marketTracking.TrackingScanInterface;
 import com.nextcloud.utils.view.FastScrollUtils;
 import com.nmc.android.marketTracking.AdjustSdkUtils;
-import com.nmc.android.marketTracking.TrackingScanInterface;
 import com.nmc.android.marketTracking.TrackingScanInterfaceImpl;
 import com.nmc.android.marketTracking.TealiumSdkUtils;
 import com.owncloud.android.MainApp;

app/src/main/res/values/setup.xml

@@ -122,9 +122,6 @@
     <string name="dev_changelog">https://github.com/nextcloud/android/raw/dev/CHANGELOG.md</string>
 
     <string name="buildNumber" translatable="false"></string>
-
-    <!-- NMC Note: will be used to enable/disable moengage as we are not using it right now due to no proper api key -->
-    <bool name="moengage_enabled">false</bool>
 </resources>