phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Philipp Schaefer 2014-02-19 00:15:52 +01:00
commit 89d99fa70a
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/src/com/cradle/iitc_mobile/share/IntentGenerator.java
View File

@ -92,6 +92,11 @@ public class IntentGenerator {
return list; return list;
} }
public void cleanup(final Intent intent) {
intent.removeExtra(EXTRA_FLAG_IS_DEFAULT);
intent.removeExtra(EXTRA_FLAG_TITLE);
}
public ArrayList<Intent> getBrowserIntents(final String title, final String url) { public ArrayList<Intent> getBrowserIntents(final String title, final String url) {
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)) final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); .addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);

11
mobile/src/com/cradle/iitc_mobile/share/IntentListFragment.java
View File

@ -15,10 +15,10 @@ import android.widget.ListView;
import java.util.ArrayList; import java.util.ArrayList;
public class IntentListFragment extends Fragment implements OnScrollListener, OnItemClickListener { public class IntentListFragment extends Fragment implements OnScrollListener, OnItemClickListener {
private ArrayList<Intent> mIntents;
private IntentAdapter mAdapter; private IntentAdapter mAdapter;
private int mScrollIndex, mScrollTop; private ArrayList<Intent> mIntents;
private ListView mListView; private ListView mListView;
private int mScrollIndex, mScrollTop;
public int getIcon() { public int getIcon() {
return getArguments().getInt("icon"); return getArguments().getInt("icon");
@ -38,6 +38,7 @@ public class IntentListFragment extends Fragment implements OnScrollListener, On
mAdapter.setIntents(mIntents); mAdapter.setIntents(mIntents);
mListView = new ListView(getActivity()); mListView = new ListView(getActivity());
mListView.setAdapter(mAdapter);
if (mScrollIndex != -1 && mScrollTop != -1) { if (mScrollIndex != -1 && mScrollTop != -1) {
mListView.setSelectionFromTop(mScrollIndex, mScrollTop); mListView.setSelectionFromTop(mScrollIndex, mScrollTop);
} }
@ -49,11 +50,7 @@ public class IntentListFragment extends Fragment implements OnScrollListener, On
@Override @Override
public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) { public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) {
final Intent intent = mAdapter.getItem(position); ((ShareActivity) getActivity()).launch(mAdapter.getItem(position));
((ShareActivity) getActivity()).getIntentComparator().trackIntentSelection(intent);
startActivity(intent);
getActivity().finish();
} }
@Override @Override

7
mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
View File

@ -140,6 +140,13 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
return mComparator; return mComparator;
} }
public void launch(final Intent intent) {
mComparator.trackIntentSelection(intent);
mGenerator.cleanup(intent);
startActivity(intent);
finish();
}
@Override @Override
public boolean onOptionsItemSelected(final MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {