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

[android] Added bookmark backup statistic

Browse source
This commit is contained in:
Alexander Zatsepin 2018-04-17 14:03:55 +03:00 • committed by Aleksandr Zatsepin
parent 80de6d323c
commit 440d4f3b7f
2 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,8 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.Date;
public class BookmarkBackupController implements Authorizer.Callback
public class BookmarkBackupController implements Authorizer.Callback,
BookmarkManager.BookmarksCloudListener
{
@NonNull
private final BookmarkBackupView mBackupView;
@ -105,12 +106,14 @@ public class BookmarkBackupController implements Authorizer.Callback
public void onStart()
{
mAuthorizer.attach(this);
BookmarkManager.INSTANCE.addCloudListener(this);
update();
}
public void onStop()
{
mAuthorizer.detach();
BookmarkManager.INSTANCE.removeCloudListener(this);
}
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data)
@ -151,4 +154,35 @@ public class BookmarkBackupController implements Authorizer.Callback
{
Statistics.INSTANCE.trackBkmSyncProposalError(type, "Cancel");
}
@Override
public void onSynchronizationStarted(@BookmarkManager.SynchronizationType int type)
{
if (type == BookmarkManager.CLOUD_BACKUP)
Statistics.INSTANCE.trackEvent(Statistics.EventName.BMK_SYNC_STARTED);
update();
}
@Override
public void onSynchronizationFinished(@BookmarkManager.SynchronizationType int type,
@BookmarkManager.RestoringRequestResult int result,
@NonNull String errorString)
{
if (type == BookmarkManager.CLOUD_BACKUP)
Statistics.INSTANCE.trackBkmSynchronizationFinish(type, result, errorString);
update();
}
@Override
public void onRestoreRequested(@BookmarkManager.RestoringRequestResult int result,
long backupTimestampInMs)
{
// No op.
}
@Override
public void onRestoredFilesPrepared()
{
// No op.
}
}

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

@ -23,6 +23,7 @@ import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.ads.MwmNativeAd;
import com.mapswithme.maps.ads.NativeAdError;
import com.mapswithme.maps.api.ParsedMwmRequest;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.editor.Editor;
@ -50,10 +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.DISCOVERY_OPEN;
import static com.mapswithme.util.statistics.Statistics.EventName.DOWNLOADER_DIALOG_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_BLANK;
@ -154,6 +157,9 @@ public enum Statistics
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";
// search
public static final String SEARCH_CAT_CLICKED = "Search. Category clicked";
@ -402,6 +408,11 @@ public enum Statistics
public static final String GOOGLE = "google";
public static final String MAPSME = "mapsme";
public static final String PHONE = "phone";
static final String UNKNOWN = "unknown";
static final String NETWORK = "network";
static final String DISK = "disk";
static final String AUTH = "auth";
static final String USER_INTERRUPTED = "user_interrupted";
}
// Initialized once in constructor and does not change until the process restarts.
@ -1046,6 +1057,41 @@ public enum Statistics
.get());
}
public void trackBkmSynchronizationFinish(@BookmarkManager.SynchronizationType int type,
@BookmarkManager.SynchronizationResult int result,
@NonNull String errorString)
{
if (result == BookmarkManager.CLOUD_SUCCESS)
{
trackEvent(BMK_SYNC_SUCCESS);
return;
}
trackEvent(BMK_SYNC_ERROR, params()
.add(TYPE, getTypeForErrorSyncResult(result))
.add(ERROR, errorString));
}
@NonNull
private String getTypeForErrorSyncResult(@BookmarkManager.SynchronizationResult int result)
{
switch (result)
{
case BookmarkManager.CLOUD_AUTH_ERROR:
return ParamValue.AUTH;
case BookmarkManager.CLOUD_NETWORK_ERROR:
return ParamValue.NETWORK;
case BookmarkManager.CLOUD_DISK_ERROR:
return ParamValue.DISK;
case BookmarkManager.CLOUD_USER_INTERRUPTED:
return ParamValue.USER_INTERRUPTED;
case BookmarkManager.CLOUD_SUCCESS:
throw new AssertionError("It's not a error result!");
default:
throw new AssertionError("Unsupported error type: " + result);
}
}
public static ParameterBuilder params()
{
return new ParameterBuilder();