mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove firebase from branding branch and put it into branch "analytics"

Browse source
This commit is contained in:
tobiasKaminsky 2017-03-22 20:18:37 +01:00
parent 02e94fb21a
commit 71ea26df31
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
28 changed files with 11 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -179,8 +179,6 @@ dependencies {
compile 'com.google.android.gms:play-services:10.2.0'
compile 'com.github.evernote:android-job:v1.1.7'
modifiedCompile 'com.google.firebase:firebase-core:10.2.0'
/// dependencies for local unit tests
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'

20
src/main/java/com/owncloud/android/MainApp.java
View file

@ -34,7 +34,6 @@ import android.support.multidex.MultiDexApplication;
import android.support.v4.util.Pair;
import com.evernote.android.job.JobManager;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.owncloud.android.authentication.PassCodeManager;
import com.owncloud.android.datamodel.SyncedFolder;
import com.owncloud.android.datamodel.SyncedFolderProvider;
@ -81,8 +80,6 @@ public class MainApp extends MultiDexApplication {
private static SyncedFolderObserverService mObserverService;
private static FirebaseAnalytics firebaseAnalytics;
@SuppressWarnings("unused")
private boolean mBound;
@ -92,12 +89,6 @@ public class MainApp extends MultiDexApplication {
JobManager.create(this).addJobCreator(new NCJobCreator());
MainApp.mContext = getApplicationContext();
firebaseAnalytics = FirebaseAnalytics.getInstance(this);
if (!getResources().getBoolean(R.bool.analytics_enabled)) {
firebaseAnalytics.setAnalyticsCollectionEnabled(false);
}
SharedPreferences appPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
MainApp.storagePath = appPrefs.getString(Preferences.PreferenceKeys.STORAGE_PATH, Environment.
@ -329,15 +320,4 @@ public class MainApp extends MultiDexApplication {
}
};
public static FirebaseAnalytics getFirebaseAnalyticsInstance() {
/*
In order for Firebase Analytics to work, you also need to
put a proper google-services.json in src/custom folder
If that file is flawed, nothing will be sent to Firebase
*/
return firebaseAnalytics;
}
}

2
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -716,8 +716,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// bound here to avoid spurious changes triggered by Android on device rotations
mHostUrlInput.setOnFocusChangeListener(this);
mHostUrlInput.addTextChangedListener(mHostUrlInputWatcher);

7
src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
View file

@ -39,7 +39,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -134,12 +133,6 @@ public class ErrorsWhileCopyingHandlerActivity extends AppCompatActivity
okBtn.setOnClickListener(this);
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(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.

5
src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java
View file

@ -40,7 +40,6 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.operations.RemoteOperation;
@ -104,7 +103,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
caption = getIntent().getStringExtra(EXTRA_ACTION);
} else {
caption = getString(R.string.default_display_name_for_root_folder);
};
}
getSupportActionBar().setTitle(caption);
setIndeterminate(mSyncInProgress);
@ -237,8 +236,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
super.onResume();
Log_OC.e(TAG, "onResume() start");
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// refresh list of files
refreshListOfFilesFragment(false);

6
src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
View file

@ -97,12 +97,6 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
setupContent();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* sets up the UI elements and loads all media/synced folders.
*/

7
src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java
View file

@ -32,7 +32,6 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import java.util.ArrayList;
@ -85,12 +84,6 @@ public class GenericExplanationActivity extends AppCompatActivity {
}
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {
ArrayList<String> mList;

7
src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java
View file

@ -36,7 +36,6 @@ import android.widget.Button;
import android.widget.TextView;
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.ui.dialog.LoadingDialog;
@ -119,12 +118,6 @@ public class LogHistoryActivity extends ToolbarActivity {
}
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
boolean retval = true;

6
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java
View file

@ -118,12 +118,6 @@ public class ManageAccountsActivity extends FileActivity
initializeComponentGetters();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public void onBackPressed() {
Intent resultIntent = new Intent();

7
src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
View file

@ -32,7 +32,6 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -69,12 +68,6 @@ public class ManageSpaceActivity extends AppCompatActivity {
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
boolean retval = true;

6
src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
View file

@ -30,7 +30,6 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
/**
@ -57,11 +56,6 @@ public class ParticipateActivity extends FileActivity {
setupContent();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
private void setupContent() {
TextView betaView = (TextView) findViewById(R.id.participate_beta_text);

7
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
View file

@ -38,7 +38,6 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -141,12 +140,6 @@ public class PassCodeActivity extends AppCompatActivity {
setTextListeners();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Enables or disables the cancel button to allow the user interrupt the ACTION
* requested to the activity.

1
src/main/java/com/owncloud/android/ui/activity/Preferences.java
View file

@ -561,7 +561,6 @@ public class Preferences extends PreferenceActivity
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
SharedPreferences appPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

7
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -41,7 +41,6 @@ import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.db.PreferenceManager;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -298,12 +297,6 @@ public class UploadFilesActivity extends FileActivity implements
Log_OC.d(TAG, "onSaveInstanceState() end");
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Pushes a directory to the drop down list
* @param directory to push

5
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
View file

@ -39,7 +39,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
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;
@ -119,8 +118,6 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
Log_OC.v(TAG, "onResume() start");
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// Listen for upload messages
mUploadMessagesReceiver = new UploadMessagesReceiver();
IntentFilter uploadIntentFilter = new IntentFilter();
@ -324,7 +321,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
mUploaderBinder = null;
}
}
};
}
/**
* Once the file upload has changed its status -> update uploads list view

7
src/main/java/com/owncloud/android/ui/activity/UploadPathActivity.java
View file

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

6
src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
View file

@ -118,12 +118,6 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
updateNextButtonIfNeeded();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public void onBackPressed() {
onFinish();

9
src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
View file

@ -32,7 +32,6 @@ 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;
@ -377,14 +376,6 @@ public class EditShareFragment extends Fragment {
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* Get {@link OCShare} instance from DB and updates the UI.
*

7
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -107,13 +107,6 @@ 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) {

22
src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file

@ -32,7 +32,6 @@ 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;
@ -65,13 +64,6 @@ public class LocalFileListFragment extends ExtendedListFragment {
setHasOptionsMenu(true);
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* {@inheritDoc}
@ -141,7 +133,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
} else { /// Click on a file
ImageView checkBoxV = (ImageView) v.findViewById(R.id.custom_checkbox);
if (checkBoxV != null) {
if (((AbsListView)getListView()).isItemChecked(position)) {
if (getListView().isItemChecked(position)) {
checkBoxV.setImageResource(R.drawable.ic_checkbox_marked);
} else {
checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
@ -222,7 +214,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
}
// by now, only files in the same directory will be kept as selected
((AbsListView)mCurrentListView).clearChoices();
mCurrentListView.clearChoices();
mAdapter.swapDirectory(directory);
if (mDirectory == null || !mDirectory.equals(directory)) {
mCurrentListView.setSelection(0);
@ -238,7 +230,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*/
public String[] getCheckedFilePaths() {
ArrayList<String> result = new ArrayList<String>();
SparseBooleanArray positions = ((AbsListView)mCurrentListView).getCheckedItemPositions();
SparseBooleanArray positions = mCurrentListView.getCheckedItemPositions();
if (positions.size() > 0) {
for (int i = 0; i < positions.size(); i++) {
if (positions.get(positions.keyAt(i)) == true) {
@ -270,7 +262,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
* @param select <code>true</code> to select all, <code>false</code> to deselect all
*/
public void selectAllFiles(boolean select) {
AbsListView listView = (AbsListView) getListView();
AbsListView listView = getListView();
for (int position = 0; position < listView.getCount(); position++) {
File file = (File) mAdapter.getItem(position);
if (file.isFile()) {
@ -289,7 +281,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @param directory
*/
public void onDirectoryClick(File directory);
void onDirectoryClick(File directory);
/**
* Callback method invoked when a file (non directory)
@ -297,7 +289,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @param file
*/
public void onFileClick(File file);
void onFileClick(File file);
/**
@ -306,7 +298,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @return Directory to list firstly. Can be NULL.
*/
public File getInitialDirectory();
File getInitialDirectory();
}

7
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -166,13 +166,6 @@ 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() {

9
src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java
View file

@ -35,7 +35,6 @@ 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;
@ -105,14 +104,6 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* {@inheritDoc}
*/

9
src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
View file

@ -44,7 +44,6 @@ 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;
@ -178,14 +177,6 @@ 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) {

11
src/main/java/com/owncloud/android/ui/fragment/UploadListFragment.java
View file

@ -27,7 +27,6 @@ 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;
@ -72,14 +71,6 @@ public class UploadListFragment extends ExpandableListFragment {
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
@ -143,7 +134,7 @@ public class UploadListFragment extends ExpandableListFragment {
* @param file the file that has been clicked on.
* @return return true if click was handled.
*/
public boolean onUploadItemClick(OCUpload file);
boolean onUploadItemClick(OCUpload file);
}
public void binderReady(){

9
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -39,7 +39,6 @@ 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;
@ -333,14 +332,6 @@ public class PreviewImageFragment extends FileFragment {
mContainerActivity.showDetails(getFile());
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
@Override
public void onPause() {
super.onPause();

6
src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -50,7 +50,6 @@ 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;
@ -190,7 +189,7 @@ public class PreviewMediaFragment extends FileFragment implements
}
else {
file = (OCFile) savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
file = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
setFile(file);
mAccount = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_ACCOUNT);
mSavedPlaybackPosition =
@ -516,9 +515,6 @@ 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");
}

4
src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
View file

@ -33,7 +33,6 @@ 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;
@ -397,9 +396,6 @@ 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");
}

6
src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file

@ -33,7 +33,6 @@ 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;
@ -106,11 +105,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
mVideoPlayer.setKeepScreenOn(true);
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* {@inheritDoc}