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

[android] Fixed usage of crashlytics for open source mode to avoid crashes

Browse source
This commit is contained in:
Александр Зацепин 2019-12-27 12:53:45 +03:00 • committed by yoksnod
parent ad6316b0ae
commit 07d4bb71b9
3 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
View file

@ -4,14 +4,7 @@ import android.app.Activity;
import android.content.Intent;
import android.location.Location;
import android.os.Bundle;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -19,8 +12,15 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.cocosw.bottomsheet.BottomSheet;
import com.crashlytics.android.Crashlytics;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
@ -43,6 +43,7 @@ import com.mapswithme.maps.widget.placepage.EditBookmarkFragment;
import com.mapswithme.maps.widget.placepage.Sponsored;
import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.CrashlyticsUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.sharing.ShareOption;
import com.mapswithme.util.sharing.SharingHelper;
@ -99,7 +100,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
public void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Crashlytics.log("onCreate");
CrashlyticsUtils.log(Log.INFO, TAG, "onCreate");
BookmarkCategory category = getCategoryOrThrow();
mCategoryDataSource = new CategoryDataSource(category);
mCatalogListener = new CatalogListenerDecorator(this);
@ -134,7 +135,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
super.onViewCreated(view, savedInstanceState);
Crashlytics.log("onViewCreated");
CrashlyticsUtils.log(Log.INFO, TAG, "onViewCreated");
configureAdapter();
configureFab(view);
@ -155,7 +156,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
public void onStart()
{
super.onStart();
Crashlytics.log("onStart");
CrashlyticsUtils.log(Log.INFO, TAG, "onStart");
SearchEngine.INSTANCE.addBookmarkListener(this);
BookmarkManager.INSTANCE.addSortingListener(this);
BookmarkManager.INSTANCE.addSharingListener(this);
@ -166,7 +167,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
public void onResume()
{
super.onResume();
Crashlytics.log("onResume");
CrashlyticsUtils.log(Log.INFO, TAG, "onResume");
BookmarkListAdapter adapter = getAdapter();
adapter.notifyDataSetChanged();
updateSorting();
@ -178,14 +179,14 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
public void onPause()
{
super.onPause();
Crashlytics.log("onPause");
CrashlyticsUtils.log(Log.INFO, TAG,"onPause");
}
@Override
public void onStop()
{
super.onStop();
Crashlytics.log("onStop");
CrashlyticsUtils.log(Log.INFO, TAG, "onStop");
SearchEngine.INSTANCE.removeBookmarkListener(this);
BookmarkManager.INSTANCE.removeSortingListener(this);
BookmarkManager.INSTANCE.removeSharingListener(this);

5
android/src/com/mapswithme/maps/intent/Factory.java
View file

@ -4,12 +4,12 @@ import android.content.ContentResolver;
import android.content.Intent;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import com.crashlytics.android.Crashlytics;
import com.mapswithme.maps.DownloadResourcesLegacyActivity;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MapFragment;
@ -36,6 +36,7 @@ import com.mapswithme.maps.ugc.EditParams;
import com.mapswithme.maps.ugc.UGC;
import com.mapswithme.maps.ugc.UGCEditorActivity;
import com.mapswithme.util.Constants;
import com.mapswithme.util.CrashlyticsUtils;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.Utils;
@ -169,7 +170,7 @@ public class Factory
String msg = this.getClass().getSimpleName() + ": incoming intent uri: " + uri;
LOGGER.i(this.getClass().getSimpleName(), msg);
org.alohalytics.Statistics.logEvent(msg);
Crashlytics.log(msg);
CrashlyticsUtils.log(Log.INFO, getClass().getSimpleName(), msg);
return createMapTask(uri);
}

6
android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java
View file

@ -6,9 +6,8 @@ import android.app.job.JobScheduler;
import android.content.ComponentName;
import android.content.Context;
import android.os.Build;
import androidx.annotation.NonNull;
import com.crashlytics.android.Crashlytics;
import androidx.annotation.NonNull;
import com.firebase.jobdispatcher.Constraint;
import com.firebase.jobdispatcher.FirebaseJobDispatcher;
import com.firebase.jobdispatcher.GooglePlayDriver;
@ -18,6 +17,7 @@ import com.firebase.jobdispatcher.Trigger;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.util.CrashlyticsUtils;
import com.mapswithme.util.Utils;
import java.util.Objects;
@ -127,7 +127,7 @@ public class ConnectivityJobScheduler implements ConnectivityListener
{
IllegalStateException exception = new IllegalStateException("Play services doesn't exist on" +
" the device");
Crashlytics.logException(exception);
CrashlyticsUtils.logException(exception);
}
@Override