Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bug report dash fix.

Browse source
This commit is contained in:
GaidamakUA 2015-09-09 15:04:07 +03:00
parent 7c0a084ba9
commit 46db91b19f
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -146,13 +146,15 @@ public class AppInitializer implements IProgress {
return false; return false;
} }
public boolean checkPreviousRunsForExceptions(Activity activity) { public boolean checkPreviousRunsForExceptions(Activity activity, boolean writeFileSize) {
initUiVars(activity); initUiVars(activity);
long size = activity.getPreferences(Context.MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0); long size = activity.getPreferences(Context.MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0);
final File file = app.getAppPath(OsmandApplication.EXCEPTION_PATH); final File file = app.getAppPath(OsmandApplication.EXCEPTION_PATH);
if (file.exists() && file.length() > 0) { if (file.exists() && file.length() > 0) {
if (size != file.length() && !firstTime) { if (size != file.length() && !firstTime) {
activity.getPreferences(Context.MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit(); if (writeFileSize) {
activity.getPreferences(Context.MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit();
}
return true; return true;
} }
} else { } else {

22
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.animation.Animation; import android.view.animation.Animation;
@ -32,6 +31,7 @@ import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ScrollState; import com.github.ksoichiro.android.observablescrollview.ScrollState;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
@ -64,7 +64,8 @@ import java.util.List;
/** /**
*/ */
public class DashboardOnMap implements ObservableScrollViewCallbacks { public class DashboardOnMap implements ObservableScrollViewCallbacks {
private static final org.apache.commons.logging.Log LOG =
PlatformUtil.getLog(DashboardOnMap.class);
private static final String TAG = "DashboardOnMap"; private static final String TAG = "DashboardOnMap";
public static boolean staticVisible = false; public static boolean staticVisible = false;
public static DashboardType staticVisibleType = DashboardType.DASHBOARD; public static DashboardType staticVisibleType = DashboardType.DASHBOARD;
@ -72,7 +73,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
private static final DashFragmentData.ShouldShowFunction rateUsShouldShow = new DashRateUsFragment.RateUsShouldShow(); private static final DashFragmentData.ShouldShowFunction rateUsShouldShow = new DashRateUsFragment.RateUsShouldShow();
private static final DefaultShouldShow defaultShouldShow = new DefaultShouldShow(); private static final DefaultShouldShow defaultShouldShow = new DefaultShouldShow();
private static final DefaultShouldShow errorShouldShow = new ErrorShouldShow(); private static final DashFragmentData.ShouldShowFunction errorShouldShow = new ErrorShouldShow();
private static final DashFragmentData.ShouldShowFunction firstTimeShouldShow = new FirstTimeShouldShow(); private static final DashFragmentData.ShouldShowFunction firstTimeShouldShow = new FirstTimeShouldShow();
private static final DashFragmentData.ShouldShowFunction chooseAppDirShouldShow = new ChooseAppDirShouldShow(); private static final DashFragmentData.ShouldShowFunction chooseAppDirShouldShow = new ChooseAppDirShouldShow();
@ -390,9 +391,11 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
public void hideDashboard() { public void hideDashboard() {
setDashboardVisibility(false, visibleType); setDashboardVisibility(false, visibleType);
} }
public void hideDashboard(boolean animation) { public void hideDashboard(boolean animation) {
setDashboardVisibility(false, visibleType, animation); setDashboardVisibility(false, visibleType, animation);
} }
public void setDashboardVisibility(boolean visible, DashboardType type) { public void setDashboardVisibility(boolean visible, DashboardType type) {
setDashboardVisibility(visible, type, this.visible ? visibleType : null, true); setDashboardVisibility(visible, type, this.visible ? visibleType : null, true);
} }
@ -656,11 +659,9 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
private void addOrUpdateDashboardFragments() { private void addOrUpdateDashboardFragments() {
Log.v(TAG, "addOrUpdateDashboardFragments(" + ")");
OsmandSettings settings = getMyApplication().getSettings(); OsmandSettings settings = getMyApplication().getSettings();
TransactionBuilder builder = TransactionBuilder builder =
new TransactionBuilder(mapActivity.getSupportFragmentManager(), settings, mapActivity); new TransactionBuilder(mapActivity.getSupportFragmentManager(), settings, mapActivity);
Log.v(TAG, "pluginsCards=" + OsmandPlugin.getPluginsCardsList());
builder.addFragmentsData(fragmentsData) builder.addFragmentsData(fragmentsData)
.addFragmentsData(OsmandPlugin.getPluginsCardsList()) .addFragmentsData(OsmandPlugin.getPluginsCardsList())
.getFragmentTransaction().commit(); .getFragmentTransaction().commit();
@ -911,10 +912,9 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
} }
public boolean hasCriticalMessages() { public boolean hasCriticalMessages() {
final OsmandSettings settings = getMyApplication().getSettings(); final OsmandSettings settings = getMyApplication().getSettings();
return rateUsShouldShow.shouldShow(settings, mapActivity, DashRateUsFragment.TAG) return rateUsShouldShow.shouldShow(settings, mapActivity, DashRateUsFragment.TAG)
|| errorShouldShow.shouldShow(settings, mapActivity, DashErrorFragment.TAG); || errorShouldShow.shouldShow(null, mapActivity, null);
} }
View getParentView() { View getParentView() {
@ -928,6 +928,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
.makeGlobal().get(); .makeGlobal().get();
} }
} }
public static class DefaultShouldShow extends SettingsShouldShow { public static class DefaultShouldShow extends SettingsShouldShow {
@Override @Override
public boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag) { public boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag) {
@ -936,11 +937,12 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
} }
} }
private static class ErrorShouldShow extends DefaultShouldShow { private static class ErrorShouldShow implements DashFragmentData.ShouldShowFunction {
// If settings null. No changes in setting will be made.
@Override @Override
public boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag) { public boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag) {
return super.shouldShow(settings, activity, tag) && activity.getMyApplication() return activity.getMyApplication().getAppInitializer()
.getAppInitializer().checkPreviousRunsForExceptions(activity); .checkPreviousRunsForExceptions(activity, settings != null);
} }
} }