Merge pull request #491 from Mygod/master

Hide adview if default profile is no longer active

src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
 
     <uses-feature
             android:name="android.hardware.touchscreen"

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

@@ -450,13 +450,13 @@ class Shadowsocks
 
   private def updatePreferenceScreen() {
     val profile = currentProfile
-    if (profile.host == "198.199.101.152" && adView == null) {
+    if (profile.host == "198.199.101.152") if (adView == null) {
       adView = new AdView(this)
       adView.setAdUnitId("ca-app-pub-9097031975646651/7760346322")
       adView.setAdSize(AdSize.SMART_BANNER)
       preferences.getView.asInstanceOf[ViewGroup].addView(adView, 0)
       adView.loadAd(new AdRequest.Builder().build())
-    }
+    } else adView.setVisibility(View.VISIBLE) else if (adView != null) adView.setVisibility(View.GONE)
 
     preferences.update(profile)
   }

src/main/scala/com/github/shadowsocks/database/DBHelper.scala

@@ -110,16 +110,11 @@ class DBHelper(val context: Context)
         profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN rx LONG;")
         profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN date VARCHAR;")
       }
-      if (oldVersion < 14) {
-        for (profile <- profileDao.queryForAll.asScala) {
-          profile.individual = updateProxiedApps(context, profile.individual)
-          profileDao.update(profile)
-        }
-      }
       if (oldVersion < 15) {
         profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN userOrder LONG;")
         var i = 0
         for (profile <- profileDao.queryForAll.asScala) {
+          if (oldVersion < 14) profile.individual = updateProxiedApps(context, profile.individual)
           profile.userOrder = i
           profileDao.update(profile)
           i += 1