Remove analytics

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

CONTRIBUTING.md

@@ -99,8 +99,8 @@ Our formatter setup is rather simple:
 ### Build variants
 There are three build variants
 * generic: no Google Stuff, used for FDroid
-* gplay: with Google Stuff (Push notification) and Analytics disabled, used for Google Play Store
-* modified: custom, with Google Stuff and Analytics enabled, used for branded releases
+* gplay: with Google Stuff (Push notification), used for Google Play Store
+* versionDev: based on master and library master, available as direct download and FDroid
 
 ## Contribution process
 * Contribute your code in the branch 'master'. It will give us a better chance to test your code before merging it with stable code.

SETUP.md

@@ -70,13 +70,10 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 
 ### 4. App flavours
 
-The app is currently equipped to be built with two flavours:
-* generic - the regular build, released as a Nextcloud Android app on the Play store
-* custom - a customized build, to be used by people who need features we can't or
-  won't include into the traditional build (like Firebase Analytics)
-
-When building the *generic*, you will *not* get the dependencies imposed by the *custom*
-build.
+The app is currently equipped to be built with three flavours:
+* generic - the regular build, released as Nextcloud Android app on FDroid
+* gplay - with Google Stuff (Push notification), used for Google Play Store
+* versionDev - based on master and library master, available as direct download and FDroid
 
 [0]: https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md
 [1]: https://git-scm.com/

build.gradle

@@ -232,9 +232,7 @@ dependencies {
 
     // uncomment for gplay
     // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
-    // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
     // implementation "com.google.android.gms:play-services-gcm:${googleLibraryVersion}"
-    // implementation "com.google.firebase:firebase-core:${googleLibraryVersion}"
     implementation 'org.parceler:parceler-api:1.1.9'
     annotationProcessor 'org.parceler:parceler:1.1.9'
     implementation ('com.github.bumptech.glide:glide:3.7.0') {
@@ -308,5 +306,5 @@ task combinedTestReport(type: JacocoReport) {
     ])
 }
 
-// uncomment for gplay (must be at the bottom)
-//apply plugin: 'com.google.gms.google-services'
+    // uncomment for gplay (must be at the bottom)
+    // apply plugin: 'com.google.gms.google-services'

src/generic/java/com/owncloud/android/utils/AnalyticsUtils.java

@@ -1,33 +0,0 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.utils;
-
-import android.app.Activity;
-
-public class AnalyticsUtils {
-    public static void setCurrentScreenName(Activity activity, String s, String s1) {
-        // do nothing
-    }
-
-    public static void disableAnalytics() {
-        // do nothing
-    }
-
-}

src/gplay/AndroidManifest.xml

@@ -28,9 +28,6 @@
         android:theme="@style/Theme.ownCloud.Toolbar"
         android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity">
 
-        <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-        <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-
         <meta-data android:name="com.google.android.gms.version"
                    android:value="@integer/google_play_services_version" />
 

src/gplay/java/com/owncloud/android/utils/AnalyticsUtils.java

@@ -1,35 +0,0 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.utils;
-
-import android.app.Activity;
-
-import com.google.firebase.analytics.FirebaseAnalytics;
-import com.owncloud.android.MainApp;
-
-public class AnalyticsUtils {
-    public static void setCurrentScreenName(Activity activity, String s, String s1) {
-        // do nothing
-    }
-
-    public static void disableAnalytics() {
-        FirebaseAnalytics.getInstance(MainApp.getAppContext()).setAnalyticsCollectionEnabled(false);
-    }
-}

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

@@ -64,7 +64,6 @@ import com.owncloud.android.ui.activity.Preferences;
 import com.owncloud.android.ui.activity.SyncedFoldersActivity;
 import com.owncloud.android.ui.activity.WhatsNewActivity;
 import com.owncloud.android.ui.notifications.NotificationUtils;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FilesSyncHelper;
 import com.owncloud.android.utils.PermissionUtil;
@@ -119,10 +118,6 @@ public class MainApp extends MultiDexApplication {
         new SecurityUtils();
         DisplayUtils.useCompatVectorIfNeeded();
 
-        if (!getResources().getBoolean(R.bool.analytics_enabled)) {
-            AnalyticsUtils.disableAnalytics();
-        }
-
         appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         fixStoragePath();

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

@@ -122,7 +122,6 @@ import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 
@@ -145,8 +144,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();
 
-    private static final String SCREEN_NAME = "Login";
-
     public static final String EXTRA_ACTION = "ACTION";
     public static final String EXTRA_ACCOUNT = "ACCOUNT";
 
@@ -952,8 +949,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     protected void onResume() {
         super.onResume();
 
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-
         if (!webViewLoginMethod) {
             // bound here to avoid spurious changes triggered by Android on device rotations
             mHostUrlInput.setOnFocusChangeListener(this);

src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -48,7 +48,6 @@ import com.owncloud.android.ui.adapter.ActivityListAdapter;
 import com.owncloud.android.ui.interfaces.ActivityListInterface;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
@@ -61,7 +60,6 @@ import butterknife.Unbinder;
 
 public class ActivitiesActivity extends FileActivity implements ActivityListInterface, ActivitiesContract.View {
     private static final String TAG = ActivitiesActivity.class.getSimpleName();
-    private static final String SCREEN_NAME = "Activities";
 
     @BindView(R.id.empty_list_view)
     public LinearLayout emptyContentContainer;
@@ -232,8 +230,6 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
         super.onResume();
 
         setupContent();
-
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
     }
 
     @Override

src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java

@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
@@ -45,7 +46,6 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.File;
@@ -134,12 +134,6 @@ public class ErrorsWhileCopyingHandlerActivity  extends AppCompatActivity implem
         okBtn.setOnClickListener(this);
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
         /**
          * Customized adapter, showing the local files as main text in two-lines list item and the
          * remote files as the secondary text.
@@ -159,8 +153,9 @@ public class ErrorsWhileCopyingHandlerActivity  extends AppCompatActivity implem
         /**
          * {@inheritDoc}
          */
+        @NonNull
         @Override
-        public View getView (int position, View convertView, ViewGroup parent) {
+        public View getView (int position, View convertView, @NonNull ViewGroup parent) {
             View view = convertView;
             if (view == null) {
                 LayoutInflater vi = (LayoutInflater) getSystemService(

src/main/java/com/owncloud/android/ui/activity/FingerprintActivity.java

@@ -48,7 +48,6 @@ import android.widget.Toast;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.IOException;
@@ -157,7 +156,6 @@ public class FingerprintActivity extends AppCompatActivity {
     @Override
     public void onResume(){
         super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
         startFingerprint();
         ImageView imageView = findViewById(R.id.fingerprinticon);
         imageView.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_fingerprint, ThemeUtils.primaryColor(this)));

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -53,7 +53,6 @@ import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DataHolderUtil;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
@@ -265,8 +264,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
         super.onResume();
         Log_OC.e(TAG, "onResume() start");
 
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-
         // refresh list of files
         refreshListOfFilesFragment(false);
 

src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -23,6 +23,7 @@ package com.owncloud.android.ui.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
@@ -33,7 +34,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
-import com.owncloud.android.utils.AnalyticsUtils;
 
 import java.util.ArrayList;
 
@@ -46,17 +46,12 @@ import java.util.ArrayList;
  */
 public class GenericExplanationActivity  extends AppCompatActivity {
 
-    public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() +
-            ".EXTRA_LIST";
-    public static final String EXTRA_LIST_2 = GenericExplanationActivity.class.getCanonicalName() +
-            ".EXTRA_LIST_2";
-    public static final String MESSAGE = GenericExplanationActivity.class.getCanonicalName() +
-            ".MESSAGE";
+    public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() + ".EXTRA_LIST";
+    public static final String EXTRA_LIST_2 = GenericExplanationActivity.class.getCanonicalName() + ".EXTRA_LIST_2";
+    public static final String MESSAGE = GenericExplanationActivity.class.getCanonicalName() + ".MESSAGE";
 
     private static final String TAG = GenericExplanationActivity.class.getSimpleName();
 
-    private static final String SCREEN_NAME = "Information";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,12 +80,6 @@ public class GenericExplanationActivity  extends AppCompatActivity {
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     public class ExplanationListAdapterView extends ArrayAdapter<String> {
         
         ArrayList<String> mList;
@@ -111,8 +100,9 @@ public class GenericExplanationActivity  extends AppCompatActivity {
         /**
          * {@inheritDoc}
          */
+        @NonNull
         @Override
-        public View getView (int position, View convertView, ViewGroup parent) {
+        public View getView (int position, View convertView, @NonNull ViewGroup parent) {
             View view = super.getView(position, convertView, parent);
             if (mList2 != null && mList2.size() > 0 && position >= 0 &&
                     position < mList2.size()) {

src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -40,7 +40,6 @@ import android.widget.TextView;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.LoadingDialog;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.BufferedReader;
@@ -62,8 +61,6 @@ public class LogHistoryActivity extends ToolbarActivity {
 
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
 
-    private static final String SCREEN_NAME = "Logs";
-
     private String mLogPath = Log_OC.getLogPath();
     private File logDIR = null;
     private String mLogText;
@@ -122,12 +119,6 @@ public class LogHistoryActivity extends ToolbarActivity {
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;

src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -56,7 +56,6 @@ import com.owncloud.android.ui.adapter.AccountListAdapter;
 import com.owncloud.android.ui.adapter.AccountListItem;
 import com.owncloud.android.ui.events.AccountRemovedEvent;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
@@ -93,7 +92,6 @@ public class ManageAccountsActivity extends FileActivity
     String mOriginalCurrentAccount;
     private Drawable mTintedCheck;
 
-    private static final String SCREEN_NAME = "Logs";
     private ArbitraryDataProvider arbitraryDataProvider;
 
     @Override
@@ -152,7 +150,6 @@ public class ManageAccountsActivity extends FileActivity
     @Override
     protected void onResume() {
         super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
     }
 
     @Override

src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java

@@ -34,7 +34,6 @@ import android.widget.TextView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.AnalyticsUtils;
 
 import java.io.File;
 
@@ -68,13 +67,6 @@ public class ManageSpaceActivity extends AppCompatActivity {
         });
     }
 
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;

src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -56,7 +56,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.GetRemoteNotificationsOperation;
 import com.owncloud.android.lib.resources.notifications.models.Notification;
 import com.owncloud.android.ui.adapter.NotificationListAdapter;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.PushUtils;
 import com.owncloud.android.utils.ThemeUtils;
@@ -358,11 +357,4 @@ public class NotificationsActivity extends FileActivity {
             emptyContentIcon.setVisibility(View.VISIBLE);
         }
     }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
 }

src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java

@@ -33,7 +33,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 /**
@@ -42,7 +41,6 @@ import com.owncloud.android.utils.ThemeUtils;
 public class ParticipateActivity extends FileActivity {
 
     private static final String TAG = ParticipateActivity.class.getSimpleName();
-    private static final String SCREEN_NAME = "Participate";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,12 +62,6 @@ public class ParticipateActivity extends FileActivity {
         setupContent();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     private void setupContent() {
         TextView rcView = findViewById(R.id.participate_release_candidate_text);
         rcView.setMovementMethod(LinkMovementMethod.getInstance());

src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -41,7 +41,6 @@ import android.widget.TextView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.util.Arrays;
@@ -50,8 +49,6 @@ public class PassCodeActivity extends AppCompatActivity {
 
     private static final String TAG = PassCodeActivity.class.getSimpleName();
 
-    private static final String SCREEN_NAME = "Passcode lock";
-
     public final static String ACTION_REQUEST_WITH_RESULT = "ACTION_REQUEST_WITH_RESULT";
     public final static String ACTION_CHECK_WITH_RESULT = "ACTION_CHECK_WITH_RESULT";
     public final static String ACTION_CHECK = "ACTION_CHECK";
@@ -158,12 +155,6 @@ public class PassCodeActivity extends AppCompatActivity {
         setTextListeners();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     /**
      * Enables or disables the cancel button to allow the user interrupt the ACTION
      * requested to the activity.

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -46,6 +46,7 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
@@ -68,7 +69,6 @@ import com.owncloud.android.lib.common.ExternalLinkType;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
@@ -88,8 +88,6 @@ public class Preferences extends PreferenceActivity
     public final static String PREFERENCE_USE_FINGERPRINT = "use_fingerprint";
     public static final String PREFERENCE_EXPERT_MODE = "expert_mode";
 
-    private static final String SCREEN_NAME = "Settings";
-
     private static final int ACTION_REQUEST_PASSCODE = 5;
     private static final int ACTION_CONFIRM_PASSCODE = 6;
 
@@ -823,10 +821,8 @@ public class Preferences extends PreferenceActivity
     @Override
     protected void onResume() {
         super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
 
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean state = appPrefs.getBoolean(PassCodeActivity.PREFERENCE_SET_PASSCODE, false);
         pCode.setChecked(state);
     }
@@ -869,6 +865,7 @@ public class Preferences extends PreferenceActivity
         }
     }
 
+    @NonNull
     @Override
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -60,7 +60,6 @@ import com.owncloud.android.ui.adapter.SyncedFolderAdapter;
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
 import com.owncloud.android.ui.dialog.SyncedFolderPreferencesDialogFragment;
 import com.owncloud.android.ui.dialog.parcel.SyncedFolderParcelable;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FilesSyncHelper;
 import com.owncloud.android.utils.PermissionUtil;
@@ -160,12 +159,6 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     /**
      * sets up the UI elements and loads all media/synced folders.
      */

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -54,7 +54,6 @@ import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.SortingOrderDialogFragment;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.ThemeUtils;
@@ -87,8 +86,6 @@ public class UploadFilesActivity extends FileActivity implements
     private DialogFragment mCurrentDialog;
     private Menu mOptionsMenu;
 
-    private static final String SCREEN_NAME = "Choose local files to upload";
-
     public static final String EXTRA_CHOSEN_FILES =
             UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CHOSEN_FILES";
 
@@ -333,12 +330,6 @@ public class UploadFilesActivity extends FileActivity implements
         Log_OC.d(TAG, "onSaveInstanceState() end");
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     /**
      * Pushes a directory to the drop down list
      * @param directory to push

src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -56,7 +56,6 @@ import com.owncloud.android.operations.CheckCurrentCredentialsOperation;
 import com.owncloud.android.ui.EmptyRecyclerView;
 import com.owncloud.android.ui.adapter.UploadListAdapter;
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FilesSyncHelper;
 
@@ -198,8 +197,6 @@ public class UploadListActivity extends FileActivity {
         Log_OC.v(TAG, "onResume() start");
         super.onResume();
 
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-
         // Listen for upload messages
         mUploadMessagesReceiver = new UploadMessagesReceiver();
         IntentFilter uploadIntentFilter = new IntentFilter();

src/main/java/com/owncloud/android/ui/activity/UploadPathActivity.java

@@ -26,7 +26,6 @@ import android.view.View.OnClickListener;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 
 public class UploadPathActivity extends FolderPickerActivity implements FileFragment.ContainerActivity,
         OnClickListener, OnEnforceableRefreshListener {
@@ -49,12 +48,6 @@ public class UploadPathActivity extends FolderPickerActivity implements FileFrag
         setFile(folder);
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     /**
      * Called when the ownCloud {@link Account} associated to the Activity was
      * just updated.

src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java

@@ -30,6 +30,7 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -58,7 +59,6 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.features.FeatureList;
 import com.owncloud.android.features.FeatureList.FeatureItem;
 import com.owncloud.android.ui.whatsnew.ProgressIndicator;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 /**
@@ -68,8 +68,6 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
 
     public static final String KEY_LAST_SEEN_VERSION_CODE = "lastSeenVersionCode";
 
-    private static final String SCREEN_NAME = "What's new";
-
     private static final String TAG = WhatsNewActivity.class.getSimpleName();
 
     private ImageButton mForwardFinishButton;
@@ -161,12 +159,6 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         updateNextButtonIfNeeded();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     @Override
     public void onBackPressed() {
         onFinish();
@@ -277,8 +269,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
 
         @Nullable
         @Override
-        public View onCreateView(LayoutInflater inflater,
-                                 @Nullable ViewGroup container,
+        public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, 
                                  @Nullable Bundle savedInstanceState) {
             View v = inflater.inflate(R.layout.whats_new_webview_element, container, false);
 
@@ -332,8 +323,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
 
         @Nullable
         @Override
-        public View onCreateView(LayoutInflater inflater,
-                                 @Nullable ViewGroup container,
+        public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, 
                                  @Nullable Bundle savedInstanceState) {
             View v = inflater.inflate(R.layout.whats_new_element, container, false);
             int fontColor = ThemeUtils.fontColor(getContext());

src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java

@@ -23,6 +23,7 @@ package com.owncloud.android.ui.fragment;
 import android.accounts.Account;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatCheckBox;
 import android.support.v7.widget.SwitchCompat;
@@ -45,7 +46,6 @@ import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 public class EditShareFragment extends Fragment {
@@ -57,8 +57,6 @@ public class EditShareFragment extends Fragment {
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
 
-    private static final String SCREEN_NAME = "Share with Sharee";
-
     /** Ids of CheckBoxes depending on R.id.canEdit CheckBox */
     private static final int sSubordinateCheckBoxIds[] = {
             R.id.canEditCreateCheckBox,
@@ -133,8 +131,7 @@ public class EditShareFragment extends Fragment {
      * {@inheritDoc}
      */
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Log_OC.d(TAG, "onCreateView");
 
         // Inflate the layout for this fragment
@@ -424,15 +421,6 @@ public class EditShareFragment extends Fragment {
         }
     }
 
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
     /**
      * Get {@link OCShare} instance from DB and updates the UI.
      *

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -56,7 +56,6 @@ import com.owncloud.android.ui.activity.ToolbarActivity;
 import com.owncloud.android.ui.adapter.FileDetailTabAdapter;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
@@ -85,8 +84,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
 
-    private static final String SCREEN_NAME = "File details";
-
     /**
      * Public factory method to create new FileDetailFragment instances.
      *
@@ -121,9 +118,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     @Override
     public void onResume() {
         super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
 
         if (previewImage != null && MimeTypeUtil.isImage(getFile()) && previewLoaded) {
             activatePreviewImage();

src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java

@@ -33,7 +33,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 import com.owncloud.android.ui.interfaces.LocalFileListFragmentInterface;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.FileSortOrder;
 
 import java.io.File;
@@ -62,14 +61,6 @@ public class LocalFileListFragment extends ExtendedListFragment implements Local
         setHasOptionsMenu(true);
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
     /**
      * {@inheritDoc}
      */

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

@@ -33,6 +33,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.design.widget.BottomNavigationView;
@@ -97,7 +98,6 @@ import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.FileSortOrder;
@@ -149,8 +149,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private static final String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 
-    private static final String SCREEN_NAME = "Remote/Server file browser";
-
     private FileFragment.ContainerActivity mContainerActivity;
 
     private OCFile mFile = null;
@@ -272,15 +270,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
         return v;
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
     @Override
     public void onDetach() {
         setOnRefreshListener(null);
@@ -445,12 +434,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
         private HashSet<OCFile> mSelectionWhenActionModeClosedByDrawer = new HashSet<>();
 
         @Override
-        public void onDrawerSlide(View drawerView, float slideOffset) {
+        public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
             // nothing to do
         }
 
         @Override
-        public void onDrawerOpened(View drawerView) {
+        public void onDrawerOpened(@NonNull View drawerView) {
             // nothing to do
         }
 
@@ -461,7 +450,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
          * @param drawerView Navigation drawer just closed.
          */
         @Override
-        public void onDrawerClosed(View drawerView) {
+        public void onDrawerClosed(@NonNull View drawerView) {
             if (mActionModeClosedByDrawer && mSelectionWhenActionModeClosedByDrawer.size() > 0) {
                 FragmentActivity actionBarActivity = getActivity();
                 actionBarActivity.startActionMode(mMultiChoiceModeListener);

src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java

@@ -26,6 +26,7 @@ import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.SearchView;
 import android.view.LayoutInflater;
@@ -41,7 +42,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
-import com.owncloud.android.utils.AnalyticsUtils;
 
 import java.util.ArrayList;
 
@@ -64,8 +64,6 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
 
-    private static final String SCREEN_NAME = "Sharee search";
-
     // Parameters
     private OCFile mFile;
     private Account mAccount;
@@ -104,20 +102,11 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
 
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.search_users_groups_layout, container, false);
 

src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author masensio
@@ -28,6 +28,7 @@ import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatButton;
@@ -56,7 +57,6 @@ import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
@@ -88,8 +88,6 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
 
-    private static final String SCREEN_NAME = "Share file/folder";
-
 //    /** Tag for dialog */
 //    private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
@@ -175,16 +173,7 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Log_OC.d(TAG, "onCreateView");
 
         // use grey as fallback for elements where custom theming is not available

src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -63,7 +63,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
@@ -93,7 +92,6 @@ public class PreviewImageFragment extends FileFragment {
     private static final String ARG_FILE = "FILE";
     private static final String ARG_IGNORE_FIRST = "IGNORE_FIRST";
     private static final String ARG_SHOW_RESIZED_IMAGE = "SHOW_RESIZED_IMAGE";
-    private static final String SCREEN_NAME = "Image Preview";
     private static final String MIME_TYPE_PNG = "image/png";
     private static final String MIME_TYPE_GIF = "image/gif";
     private static final String MIME_TYPE_SVG = "image/svg+xml";
@@ -179,8 +177,7 @@ public class PreviewImageFragment extends FileFragment {
      * {@inheritDoc}
      */
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         View view = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = view.findViewById(R.id.image);
@@ -226,7 +223,7 @@ public class PreviewImageFragment extends FileFragment {
      * {@inheritDoc}
      */
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());
     }
@@ -447,14 +444,6 @@ public class PreviewImageFragment extends FileFragment {
         mContainerActivity.showDetails(getFile());
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-    }
-
     @SuppressFBWarnings("Dm")
     @Override
     public void onDestroy() {

src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -37,6 +37,7 @@ import android.media.MediaPlayer.OnPreparedListener;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -66,7 +67,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
 
@@ -110,8 +110,6 @@ public class PreviewMediaFragment extends FileFragment implements
 
     private static final String TAG = PreviewMediaFragment.class.getSimpleName();
 
-    private static final String SCREEN_NAME = "Audio/Video Preview";
-
     private static final String FILE = "FILE";
     private static final String ACCOUNT = "ACCOUNT";
     private static final String PLAYBACK_POSITION = "PLAYBACK_POSITION";
@@ -178,8 +176,7 @@ public class PreviewMediaFragment extends FileFragment implements
      * {@inheritDoc}
      */
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         Log_OC.v(TAG, "onCreateView");
 
@@ -300,7 +297,7 @@ public class PreviewMediaFragment extends FileFragment implements
      * {@inheritDoc}
      */
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         Log_OC.v(TAG, "onSaveInstanceState");
 
@@ -581,9 +578,6 @@ public class PreviewMediaFragment extends FileFragment implements
         super.onResume();
         mOnResume = !mOnResume;
 
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
         Log_OC.v(TAG, "onResume");
     }
 

src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java

@@ -22,6 +22,7 @@ package com.owncloud.android.ui.preview;
 import android.accounts.Account;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -43,7 +44,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
 import org.mozilla.universalchardet.ReaderFactory;
@@ -63,8 +63,6 @@ public class PreviewTextFragment extends FileFragment {
     private static final String EXTRA_ACCOUNT = "ACCOUNT";
     private static final String TAG = PreviewTextFragment.class.getSimpleName();
 
-    private static final String SCREEN_NAME = "Text Preview";
-
     private Account mAccount;
     private TextView mTextPreview;
     private TextLoadAsyncTask mTextLoadTask;
@@ -96,7 +94,7 @@ public class PreviewTextFragment extends FileFragment {
      * {@inheritDoc}
      */
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         Log_OC.e(TAG, "onCreateView");
@@ -430,27 +428,6 @@ public class PreviewTextFragment extends FileFragment {
         mContainerActivity.showDetails(getFile());
     }
 
-    @Override
-    public void onPause() {
-        Log_OC.e(TAG, "onPause");
-        super.onPause();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getActivity() != null) {
-            AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG);
-        }
-        Log_OC.e(TAG, "onResume");
-    }
-
-    @Override
-    public void onDestroy() {
-        Log_OC.e(TAG, "onDestroy");
-        super.onDestroy();
-    }
-
     @Override
     public void onStop() {
         super.onStop();

src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -40,7 +40,6 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.media.MediaService;
 import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
 /**
@@ -110,12 +109,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
-    }
-
     /**
      * {@inheritDoc}
      */

src/main/res/values/setup.xml

@@ -139,9 +139,6 @@
     If set, will replace all other login methods available -->
     <string name="webview_login_url" translatable="false"></string>
 
-    <!-- analytics enabled -->
-    <bool name="analytics_enabled">false</bool>
-
     <!-- Files becomes Home -->
     <bool name="use_home">false</bool>
 

src/versionDev/java/com/owncloud/android/utils/AnalyticsUtils.java

@@ -1,33 +0,0 @@
-/*
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.utils;
-
-import android.app.Activity;
-
-public class AnalyticsUtils {
-    public static void setCurrentScreenName(Activity activity, String s, String s1) {
-        // do nothing
-    }
-
-    public static void disableAnalytics() {
-        // do nothing
-    }
-
-}