AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Renamed bookmark statistics

Browse source
This commit is contained in:
Alexander Zatsepin 2018-04-17 19:57:04 +03:00 • committed by Aleksandr Zatsepin
parent 440d4f3b7f
commit bd9d7a1155
4 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java
View file

@ -31,7 +31,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
public void onClick(View v)
{
mAuthorizer.authorize();
Statistics.INSTANCE.trackBkmSyncProposalApproved(false);
Statistics.INSTANCE.trackBmSyncProposalApproved(false);
}
};
@NonNull
@ -42,7 +42,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
{
BookmarkManager.INSTANCE.setCloudEnabled(true);
update();
Statistics.INSTANCE.trackBkmSyncProposalApproved(mAuthorizer.isAuthorized());
Statistics.INSTANCE.trackBmSyncProposalApproved(mAuthorizer.isAuthorized());
}
};
@ -69,7 +69,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
mBackupView.hideProgressBar();
mBackupView.setClickListener(mSignInClickListener);
mBackupView.showButton();
Statistics.INSTANCE.trackBkmSyncProposalShown(mAuthorizer.isAuthorized());
Statistics.INSTANCE.trackBmSyncProposalShown(mAuthorizer.isAuthorized());
}
return;
}
@ -100,7 +100,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
mBackupView.setButtonLabel(context.getString(R.string.bookmarks_backup));
mBackupView.setClickListener(mEnableClickListener);
mBackupView.showButton();
Statistics.INSTANCE.trackBkmSyncProposalShown(mAuthorizer.isAuthorized());
Statistics.INSTANCE.trackBmSyncProposalShown(mAuthorizer.isAuthorized());
}
public void onStart()
@ -134,11 +134,11 @@ public class BookmarkBackupController implements Authorizer.Callback,
{
Notifier.cancelNotification(Notifier.ID_IS_NOT_AUTHENTICATED);
BookmarkManager.INSTANCE.setCloudEnabled(true);
Statistics.INSTANCE.trackEvent(Statistics.EventName.BMK_SYNC_PROPOSAL_ENABLED);
Statistics.INSTANCE.trackEvent(Statistics.EventName.BM_SYNC_PROPOSAL_ENABLED);
}
else
{
Statistics.INSTANCE.trackBkmSyncProposalError(Framework.TOKEN_MAPSME, "Unknown error");
Statistics.INSTANCE.trackBmSyncProposalError(Framework.TOKEN_MAPSME, "Unknown error");
}
update();
}
@ -146,20 +146,20 @@ public class BookmarkBackupController implements Authorizer.Callback,
@Override
public void onSocialAuthenticationError(@Framework.AuthTokenType int type, @Nullable String error)
{
Statistics.INSTANCE.trackBkmSyncProposalError(type, error);
Statistics.INSTANCE.trackBmSyncProposalError(type, error);
}
@Override
public void onSocialAuthenticationCancel(@Framework.AuthTokenType int type)
{
Statistics.INSTANCE.trackBkmSyncProposalError(type, "Cancel");
Statistics.INSTANCE.trackBmSyncProposalError(type, "Cancel");
}
@Override
public void onSynchronizationStarted(@BookmarkManager.SynchronizationType int type)
{
if (type == BookmarkManager.CLOUD_BACKUP)
Statistics.INSTANCE.trackEvent(Statistics.EventName.BMK_SYNC_STARTED);
Statistics.INSTANCE.trackEvent(Statistics.EventName.BM_SYNC_STARTED);
update();
}
@ -169,7 +169,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
@NonNull String errorString)
{
if (type == BookmarkManager.CLOUD_BACKUP)
Statistics.INSTANCE.trackBkmSynchronizationFinish(type, result, errorString);
Statistics.INSTANCE.trackBmSynchronizationFinish(type, result, errorString);
update();
}

5
android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java
View file

@ -11,7 +11,6 @@ import android.view.ViewGroup;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.EditTextDialogFragment;
import com.mapswithme.util.statistics.Statistics;
@ -89,7 +88,7 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment
if (mListener != null)
mListener.onCategoryChanged(categoryId);
dismiss();
Statistics.INSTANCE.trackEvent(Statistics.EventName.BMK_GROUP_CREATED);
Statistics.INSTANCE.trackEvent(Statistics.EventName.BM_GROUP_CREATED);
}
@Override
@ -102,7 +101,7 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment
mListener.onCategoryChanged(categoryId);
}
dismiss();
Statistics.INSTANCE.trackEvent(Statistics.EventName.BMK_GROUP_CHANGED);
Statistics.INSTANCE.trackEvent(Statistics.EventName.BM_GROUP_CHANGED);
}
@Override

2
android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
View file

@ -727,7 +727,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
{
Boolean value = (Boolean) newValue;
BookmarkManager.INSTANCE.setCloudEnabled(value);
Statistics.INSTANCE.trackBkmSettingsToggle(value);
Statistics.INSTANCE.trackBmSettingsToggle(value);
return true;
});
}

68
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -51,12 +51,12 @@ import static com.mapswithme.util.BatteryState.CHARGING_STATUS_PLUGGED;
import static com.mapswithme.util.BatteryState.CHARGING_STATUS_UNKNOWN;
import static com.mapswithme.util.BatteryState.CHARGING_STATUS_UNPLUGGED;
import static com.mapswithme.util.statistics.Statistics.EventName.APPLICATION_COLD_STARTUP_INFO;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_PROPOSAL_APPROVED;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_PROPOSAL_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_PROPOSAL_SHOWN;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_PROPOSAL_TOGGLE;
import static com.mapswithme.util.statistics.Statistics.EventName.BMK_SYNC_SUCCESS;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_PROPOSAL_APPROVED;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_PROPOSAL_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_PROPOSAL_SHOWN;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_PROPOSAL_TOGGLE;
import static com.mapswithme.util.statistics.Statistics.EventName.BM_SYNC_SUCCESS;
import static com.mapswithme.util.statistics.Statistics.EventName.DISCOVERY_OPEN;
import static com.mapswithme.util.statistics.Statistics.EventName.DOWNLOADER_DIALOG_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_BLANK;
@ -148,18 +148,18 @@ public enum Statistics
static final String DOWNLOADER_DIALOG_ERROR = "Downloader_OnStartScreen_error";
// bookmarks
public static final String BMK_GROUP_CREATED = "Bookmark. Group created";
public static final String BMK_GROUP_CHANGED = "Bookmark. Group changed";
public static final String BMK_COLOR_CHANGED = "Bookmark. Color changed";
public static final String BMK_CREATED = "Bookmark. Bookmark created";
public static final String BMK_SYNC_PROPOSAL_SHOWN = "Bookmarks_SyncProposal_shown";
public static final String BMK_SYNC_PROPOSAL_APPROVED = "Bookmarks_SyncProposal_approved";
public static final String BMK_SYNC_PROPOSAL_ERROR = "Bookmarks_SyncProposal_error";
public static final String BMK_SYNC_PROPOSAL_ENABLED = "Bookmarks_SyncProposal_enabled";
public static final String BMK_SYNC_PROPOSAL_TOGGLE = "Settings_BookmarksSync_toggle";
public static final String BMK_SYNC_STARTED = "Bookmarks_sync_started";
public static final String BMK_SYNC_ERROR = "Bookmarks_sync_error";
public static final String BMK_SYNC_SUCCESS = "Bookmarks_sync_success";
public static final String BM_GROUP_CREATED = "Bookmark. Group created";
public static final String BM_GROUP_CHANGED = "Bookmark. Group changed";
public static final String BM_COLOR_CHANGED = "Bookmark. Color changed";
public static final String BM_CREATED = "Bookmark. Bookmark created";
public static final String BM_SYNC_PROPOSAL_SHOWN = "Bookmarks_SyncProposal_shown";
public static final String BM_SYNC_PROPOSAL_APPROVED = "Bookmarks_SyncProposal_approved";
public static final String BM_SYNC_PROPOSAL_ERROR = "Bookmarks_SyncProposal_error";
public static final String BM_SYNC_PROPOSAL_ENABLED = "Bookmarks_SyncProposal_enabled";
public static final String BM_SYNC_PROPOSAL_TOGGLE = "Settings_BookmarksSync_toggle";
public static final String BM_SYNC_STARTED = "Bookmarks_sync_started";
public static final String BM_SYNC_ERROR = "Bookmarks_sync_error";
public static final String BM_SYNC_SUCCESS = "Bookmarks_sync_success";
// search
public static final String SEARCH_CAT_CLICKED = "Search. Category clicked";
@ -533,13 +533,13 @@ public enum Statistics
public void trackColorChanged(String from, String to)
{
trackEvent(EventName.BMK_COLOR_CHANGED, params().add(EventParam.FROM, from)
.add(EventParam.TO, to));
trackEvent(EventName.BM_COLOR_CHANGED, params().add(EventParam.FROM, from)
.add(EventParam.TO, to));
}
public void trackBookmarkCreated()
{
trackEvent(EventName.BMK_CREATED, params().add(EventParam.COUNT, String.valueOf(++mBookmarksCreated)));
trackEvent(EventName.BM_CREATED, params().add(EventParam.COUNT, String.valueOf(++mBookmarksCreated)));
}
public void trackPlaceShared(String channel)
@ -1029,45 +1029,45 @@ public enum Statistics
.get());
}
public void trackBkmSyncProposalShown(boolean hasAuth)
public void trackBmSyncProposalShown(boolean hasAuth)
{
trackEvent(BMK_SYNC_PROPOSAL_SHOWN, params().add(HAS_AUTH, hasAuth ? 1 : 0).get());
trackEvent(BM_SYNC_PROPOSAL_SHOWN, params().add(HAS_AUTH, hasAuth ? 1 : 0).get());
}
public void trackBkmSyncProposalApproved(boolean hasAuth)
public void trackBmSyncProposalApproved(boolean hasAuth)
{
trackEvent(BMK_SYNC_PROPOSAL_APPROVED, params()
trackEvent(BM_SYNC_PROPOSAL_APPROVED, params()
.add(HAS_AUTH, hasAuth ? 1 : 0)
.add(NETWORK, getConnectionState())
.get());
}
public void trackBkmSyncProposalError(@Framework.AuthTokenType int type, @Nullable String message)
public void trackBmSyncProposalError(@Framework.AuthTokenType int type, @Nullable String message)
{
trackEvent(BMK_SYNC_PROPOSAL_ERROR, params()
trackEvent(BM_SYNC_PROPOSAL_ERROR, params()
.add(PROVIDER, getAuthProvider(type))
.add(ERROR, message)
.get());
}
public void trackBkmSettingsToggle(boolean checked)
public void trackBmSettingsToggle(boolean checked)
{
trackEvent(BMK_SYNC_PROPOSAL_TOGGLE, params()
trackEvent(BM_SYNC_PROPOSAL_TOGGLE, params()
.add(STATE, checked ? 1 : 0)
.get());
}
public void trackBkmSynchronizationFinish(@BookmarkManager.SynchronizationType int type,
@BookmarkManager.SynchronizationResult int result,
@NonNull String errorString)
public void trackBmSynchronizationFinish(@BookmarkManager.SynchronizationType int type,
@BookmarkManager.SynchronizationResult int result,
@NonNull String errorString)
{
if (result == BookmarkManager.CLOUD_SUCCESS)
{
trackEvent(BMK_SYNC_SUCCESS);
trackEvent(BM_SYNC_SUCCESS);
return;
}
trackEvent(BMK_SYNC_ERROR, params()
trackEvent(BM_SYNC_ERROR, params()
.add(TYPE, getTypeForErrorSyncResult(result))
.add(ERROR, errorString));
}