resolve conflicts

Author: harshjv

manifest.json

@@ -13,7 +13,9 @@
   "permissions": [
     "http://github.com/*",
     "https://github.com/*",
-    "storage"
+    "https://api.github.com/*",
+    "storage",
+    "activeTab"
   ],
   "background" : {
     "scripts" : [ "src/background.js" ]

src/background.js

@@ -3,25 +3,27 @@
 const GITHUB_TOKEN_KEY = 'x-github-token'
 const TOKEN_FEATURE_INFORMATION_KEY = 'user-knows-token-feature'
 
-const setGithubToken = (key, cb) => {
+const storage = chrome.storage.sync || chrome.storage.local
+
+function setGithubToken (key, cb) {
   const obj = {}
 
   obj[GITHUB_TOKEN_KEY] = key
 
-  chrome.storage.sync.set(obj, () => {
+  storage.set(obj, function () {
     alert('Your Github token has been set successfully. Reload the Github page to see changes.')
 
     cb()
   })
 }
 
-const handleOldGithubToken = (cb) => {
-  chrome.storage.sync.get(GITHUB_TOKEN_KEY, (storedData) => {
+function handleOldGithubToken (cb) {
+  storage.get(GITHUB_TOKEN_KEY, function (storedData) {
     const oldGithubToken = storedData[GITHUB_TOKEN_KEY]
 
     if (oldGithubToken) {
       if (confirm('You have already set your Github token. Do you want to remove it?')) {
-        chrome.storage.sync.remove(GITHUB_TOKEN_KEY, () => {
+        storage.remove(GITHUB_TOKEN_KEY, function () {
           alert('You have successfully removed Github token. Click extension icon again to set a new token.')
 
           cb(false)
@@ -39,11 +41,11 @@ const userNowKnowsAboutGithubTokenFeature = (cb) => {
   const obj = {}
   obj[TOKEN_FEATURE_INFORMATION_KEY] = true
 
-  chrome.storage.sync.set(obj, cb)
+  storage.set(obj, cb)
 }
 
-const informUserAboutGithubTokenFeature = () => {
-  chrome.storage.sync.get(TOKEN_FEATURE_INFORMATION_KEY, (storedData) => {
+function informUserAboutGithubTokenFeature () {
+  storage.get(TOKEN_FEATURE_INFORMATION_KEY, function (storedData) {
     const userKnows = storedData[TOKEN_FEATURE_INFORMATION_KEY]
 
     if (!userKnows) {

src/inject.js

@@ -4,6 +4,8 @@ const API = 'https://api.github.com/repos/'
 const LI_TAG_ID = 'github-repo-size'
 const GITHUB_TOKEN_KEY = 'x-github-token'
 
+const storage = chrome.storage.sync || chrome.storage.local
+
 let githubToken
 
 const isTree = (uri) => {
@@ -153,7 +155,7 @@ const checkForRepoPage = () => {
   }
 }
 
-chrome.storage.sync.get(GITHUB_TOKEN_KEY, (data) => {
+storage.get(GITHUB_TOKEN_KEY, function (data) {
   githubToken = data[GITHUB_TOKEN_KEY]
 
   chrome.storage.onChanged.addListener((changes, namespace) => {