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

Fixed null pointer on rotation. Hided action bar from download index in update index

Browse source
This commit is contained in:
Denis 2014-09-12 10:59:08 +03:00
parent 49a7f0638d
commit fc7df97e9d
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -268,6 +268,10 @@ public class DownloadActivity extends SherlockFragmentActivity {
public void updateProgress(boolean updateOnlyProgress) { public void updateProgress(boolean updateOnlyProgress) {
BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask(); BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
//needed when rotation is performed and progress can be null
if (progressView == null){
return;
}
if(updateOnlyProgress) { if(updateOnlyProgress) {
if(!basicProgressAsyncTask.isIndeterminate()) { if(!basicProgressAsyncTask.isIndeterminate()) {
progressPercent.setText(basicProgressAsyncTask.getProgressPercentage() +"%"); progressPercent.setText(basicProgressAsyncTask.getProgressPercentage() +"%");

2
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -454,7 +454,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
ActionBar actionBar = getDownloadActivity().getSupportActionBar(); ActionBar actionBar = getDownloadActivity().getSupportActionBar();
//actionBar.removeAllTabs(); //hide action bar from downloadindexfragment
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
optionsMenuAdapter = new ContextMenuAdapter(getDownloadActivity()); optionsMenuAdapter = new ContextMenuAdapter(getDownloadActivity());
OnContextMenuClick listener = new OnContextMenuClick() { OnContextMenuClick listener = new OnContextMenuClick() {

10
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -6,7 +6,10 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.app.SherlockListFragment;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import net.osmand.map.OsmandRegions; import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -30,6 +33,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
format = getMyApplication().getResourceManager().getDateFormat(); format = getMyApplication().getResourceManager().getDateFormat();
osmandRegions = getMyApplication().getResourceManager().getOsmandRegions(); osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
setListAdapter(new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, DownloadActivity.downloadListIndexThread.getItemsToUpdate())); setListAdapter(new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, DownloadActivity.downloadListIndexThread.getItemsToUpdate()));
setHasOptionsMenu(true);
} }
@Override @Override
@ -111,5 +115,11 @@ public class UpdatesIndexFragment extends SherlockListFragment {
} }
} }
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
ActionBar actionBar = getDownloadActivity().getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
}
public OsmandApplication getMyApplication() { return getDownloadActivity().getMyApplication(); } public OsmandApplication getMyApplication() { return getDownloadActivity().getMyApplication(); }
} }