From 16f1ce1fc6df0cac394760f8086473de9a32fffb Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Thu, 5 Jun 2014 15:51:10 +0200
Subject: [PATCH] check for scheme setting in intel-url generation

---
 mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
index 0e923b53..42ad36a2 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
@@ -68,7 +68,8 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
     }
 
     private String getIntelUrl(final String ll, final int zoom, final boolean isPortal) {
-        String url = "http://www.ingress.com/intel?ll=" + ll + "&z=" + zoom;
+        final String scheme = mSharedPrefs.getBoolean("pref_force_https", true) ? "https" : "http";
+        String url = scheme + "://www.ingress.com/intel?ll=" + ll + "&z=" + zoom;
         if (isPortal) {
             url += "&pll=" + ll;
         }
@@ -107,6 +108,8 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
 
         mFragmentAdapter = new FragmentAdapter(getSupportFragmentManager());
 
+        mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+
         final ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
 
@@ -175,7 +178,6 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
             actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
         }
 
-        mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         final int selected = mSharedPrefs.getInt("pref_share_selected_tab", 0);
         if (selected < mFragmentAdapter.getCount()) {
             mViewPager.setCurrentItem(selected);