changed target sdk and removed unused plugins

HorizenOfficial · Feb 28, 2019 · 47b14c1 · 47b14c1
1 parent 33538ea
commit 47b14c1
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 160 deletions.
diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@ Use node v6.15.1
 export ANDROID_HOME=<path to sdk>
 npm install -g yarn [email protected]
 yarn install
-cordova plugin add cordova-plugin-qrscanner cordova-plugin-file cordova-plugin-http cordova-clipboard cordova-plugin-inappbrowser cordova-plugin-device cordova-plugin-wkwebview-engine cordova-plugin-whitelist cordova-plugin-google-analytics
-cordova platform add [[email protected] | ios]
-cordova run [android | ios]
+cordova plugin add cordova-plugin-qrscanner cordova-plugin-file cordova-plugin-http cordova-clipboard cordova-plugin-inappbrowser cordova-plugin-device cordova-plugin-wkwebview-engine cordova-plugin-whitelist
+cordova platform add [email protected]
+cordova run android
 
 # Generate a Signed APK
 cordova build --release android

diff --git a/config.xml b/config.xml
@@ -18,6 +18,7 @@
     <platform name="android">
         <allow-intent href="market:*" />
         <preference name="android-minSdkVersion" value="19" />
+        <preference name="android-targetSdkVersion" value="26" />
         <preference name="android-maxSdkVersion" value="28" />
     </platform>
     <platform name="ios">
@@ -30,7 +31,6 @@
         <param name="ios-package" value="CDVWKWebViewEngine" />
     </feature>
     <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
-    <preference default="11.0.1" name="GMS_VERSION" />
     <hook src="./scripts/build.sh" type="before_prepare" />
     <icon src="./assets/img/zencash.png" />
     <allow-navigation href="http://*/*" />
@@ -40,9 +40,6 @@
     <allow-intent href="*" />
     <engine name="android" spec="^6.2.3" />
     <plugin name="cordova-plugin-file" spec="^4.3.3" />
-    <plugin name="cordova-plugin-google-analytics" spec="^1.8.6">
-        <variable name="GMS_VERSION" value="11.0.1" />
-    </plugin>
     <plugin name="cordova-plugin-qrscanner" spec="^2.6.0" />
     <plugin name="cordova-plugin-http" spec="^1.2.0" />
     <plugin name="cordova-clipboard" spec="^1.2.1" />

diff --git a/package.json b/package.json
@@ -80,7 +80,6 @@
     "cordova-plugin-compat": "^1.2.0",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-file": "^4.3.3",
-    "cordova-plugin-google-analytics": "^1.8.6",
     "cordova-plugin-http": "^1.2.0",
     "cordova-plugin-inappbrowser": "^3.0.0",
     "cordova-plugin-qrscanner": "^2.6.0",
@@ -92,9 +91,6 @@
   "cordova": {
     "plugins": {
       "cordova-plugin-file": {},
-      "cordova-plugin-google-analytics": {
-        "GMS_VERSION": "11.0.1"
-      },
       "cordova-plugin-qrscanner": {},
       "cordova-plugin-http": {},
       "cordova-clipboard": {},

diff --git a/src/containers/AboutPage.js b/src/containers/AboutPage.js
@@ -12,9 +12,6 @@ import {
 import TRANSLATIONS from '../translations'
 
 class RecoverWalletPage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('About Page')
-  }
 
   renderToolbar () {
     const CUR_LANG = this.props.settings.language

diff --git a/src/containers/AddressInfoPage.js b/src/containers/AddressInfoPage.js
@@ -24,9 +24,6 @@ class AddressInfoPage extends React.Component {
     }
   }
 
-  componentDidMount () {
-    window.ga.trackView('Address Info Page')
-  }
 
   renderToolbar () {
     const CUR_LANG = this.props.settings.language

diff --git a/src/containers/ContactsPage.js b/src/containers/ContactsPage.js
@@ -105,9 +105,7 @@ const getContactDetails = (curLang, navigator, addContact, deleteContact, contac
 }
 
 class ContactsPage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('Contact Page')
-  }
+
 
   gotoComponent (c) {
     this.props.navigator.pushPage({component: c})

diff --git a/src/containers/MainPage.js b/src/containers/MainPage.js
@@ -264,8 +264,6 @@ class MainPage extends React.Component {
   }
 
   componentDidMount () {
-    // Dispatch every 30 seconds
-    window.ga.startTrackerWithId('UA-71060764-11', 30)
 
     if (this.props.secrets.items.length > 0) {
       const address = this.props.secrets.items[0].address

diff --git a/src/containers/SelectCurrencyPage.js b/src/containers/SelectCurrencyPage.js
@@ -17,9 +17,6 @@ import {
 import TRANSLATIONS from '../translations'
 
 class SelectCurrencyPage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('Currency Page')
-  }
 
   renderToolbar () {
     const CUR_LANG = this.props.settings.language

diff --git a/src/containers/SelectInsightPage.js b/src/containers/SelectInsightPage.js
@@ -19,9 +19,7 @@ import {
 import TRANSLATIONS from '../translations'
 
 class SelectInsightPage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('Insight Page')
-  }
+
 
   renderToolbar () {
     return (

diff --git a/src/containers/SelectLanguagePage.js b/src/containers/SelectLanguagePage.js
@@ -17,9 +17,7 @@ import {
 import TRANSLATIONS from '../translations'
 
 class SelectLanguagePage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('Language Page')
-  }
+
 
   renderToolbar () {
     const CUR_LANG = this.props.settings.language

diff --git a/src/containers/SendPage.js b/src/containers/SendPage.js
@@ -146,8 +146,7 @@ class SendPage extends React.Component {
   }
 
   componentDidMount () {
-    // Track event
-    window.ga.trackView('Send Page')
+
 
     // Get fees dynamically each time component is mounted
     const statusURL = urlAppend(this.props.settings.insightAPI, 'status')
@@ -375,29 +374,21 @@ class SendPage extends React.Component {
                     })
                   })
                   .catch((err) => {       
-                    window.ga.trackEvent('Send rawtx error', JSON.stringify(err))
-                    window.ga.dispatch()
                     alert('Send failure: ' + JSON.stringify(err))
 
                     this.setProgressValue(0)
                   })
               }).catch((err) => {
-                window.ga.trackEvent('Get blockinfo error', JSON.stringify(err))
-                window.ga.dispatch()
                 alert('GET failure: ' + JSON.stringify(err))
 
                 this.setProgressValue(0)
               })
           }).catch((err) => {
-            window.ga.trackEvent('Get blockheight and blockhash error', JSON.stringify(err))
-            window.ga.dispatch()
             alert('GET failure: ' + JSON.stringify(err))
 
             this.setProgressValue(0)
           })
       }).catch((err) => {
-        window.ga.trackEvent('Get utxo error', JSON.stringify(err))
-        window.ga.dispatch()
         alert('GET failure: ' + JSON.stringify(err))
 
         this.setProgressValue(0)

diff --git a/src/containers/SettingsPage.js b/src/containers/SettingsPage.js
@@ -26,9 +26,7 @@ import SelectInsightPage from './SelectInsightPage'
 import TRANSLATIONS from '../translations'
 
 class SettingsPage extends React.Component {
-  componentDidMount() {    
-    window.ga.trackView('Settings Page')
-  }
+
 
   gotoComponent (c) {
     this.props.navigator.pushPage({component: c})

diff --git a/src/containers/SetupPage.js b/src/containers/SetupPage.js
@@ -27,10 +27,6 @@ class SetupPage extends React.Component {
     this.handleNewWallet = this.handleNewWallet.bind(this)
   }
 
-  componentDidMount () {
-    window.ga.trackView('Setup Page')
-  }
-
   handleNewWallet () {
     var seed = new Mnemonic(Mnemonic.Words.ENGLISH)
     this.handleLoadWallet(seed.toString())