Add all required screen names

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

@@ -32,6 +32,7 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -379,7 +380,9 @@ public class EditShareFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
     }
 
     /**

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

@@ -107,6 +107,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         mProgressListener = null;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {

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

@@ -32,6 +32,7 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
@@ -45,7 +46,7 @@ import java.util.ArrayList;
  * A Fragment that lists all files and folders in a given LOCAL path.
  */
 public class LocalFileListFragment extends ExtendedListFragment {
-    private static final String TAG = "LocalFileListFragment";
+    private static final String TAG = LocalFileListFragment.class.getSimpleName();
     
     /** Reference to the Activity which this fragment is attached to. For callbacks */
     private LocalFileListFragment.ContainerActivity mContainerActivity;
@@ -64,6 +65,14 @@ public class LocalFileListFragment extends ExtendedListFragment {
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */

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

@@ -166,7 +166,14 @@ public class OCFileListFragment extends ExtendedListFragment implements Extended
         return v;
     }
 
-    
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
+
     @Override
     public void onDetach() {
         setOnRefreshListener(null);

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

@@ -35,6 +35,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -104,6 +105,14 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
 
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */

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

@@ -44,6 +44,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
@@ -177,6 +178,14 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {

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

@@ -27,6 +27,7 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.ListView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -70,7 +71,15 @@ public class UploadListFragment extends ExpandableListFragment {
         setOnRefreshListener(this);
         return v;
     }
-    
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
+    }
+
     @Override
     public void onRefresh() {
         // remove the progress circle as soon as pull is triggered, like in the list of files

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

@@ -39,6 +39,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
@@ -72,6 +73,8 @@ 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 SCREEN_NAME = "Image Preview";
+
     private TouchImageViewCustom mImageView;
     private TextView mMessageView;
     private ProgressBar mProgressWheel;
@@ -333,9 +336,11 @@ public class PreviewImageFragment extends FileFragment {
     @Override
     public void onResume() {
         super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
     }
 
-
     @Override
     public void onPause() {
         super.onPause();

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

@@ -50,6 +50,7 @@ import android.widget.ImageView;
 import android.widget.Toast;
 import android.widget.VideoView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
@@ -96,6 +97,7 @@ public class PreviewMediaFragment extends FileFragment implements
 
     private static final String TAG = PreviewMediaFragment.class.getSimpleName();
 
+    private static final String SCREEN_NAME = "Audio/Video Preview";
 
     /**
      * Creates a fragment to preview a file.
@@ -514,6 +516,9 @@ public class PreviewMediaFragment extends FileFragment implements
     @Override
     public void onResume() {
         super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
         Log_OC.v(TAG, "onResume");
     }
 

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

@@ -33,6 +33,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
@@ -59,6 +60,8 @@ 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;
@@ -394,6 +397,9 @@ public class PreviewTextFragment extends FileFragment {
     @Override
     public void onResume() {
         super.onResume();
+        if (getActivity() != null) {
+            MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
+        }
         Log_OC.e(TAG, "onResume");
     }
 

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

@@ -33,6 +33,7 @@ import android.support.v7.app.AlertDialog;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
@@ -60,6 +61,8 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
     
     private static final String TAG = PreviewVideoActivity.class.getSimpleName();
 
+    private static final String SCREEN_NAME = "Video Preview";
+
     private int mSavedPlaybackPosition;         // in the unit time handled by MediaPlayer.getCurrentPosition()
     private boolean mAutoplay;                  // when 'true', the playback starts immediately with the activity
     private VideoView mVideoPlayer;             // view to play the file; both performs and show the playback
@@ -101,9 +104,14 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
           
         // keep the screen on while the playback is performed (prevents screen off by battery save)
         mVideoPlayer.setKeepScreenOn(true);
-    }    
-    
-    
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
+    }
+
     /**
      * {@inheritDoc}
      */