follow the v3.4.0.6.1 's modify to change app-id

Author: Akkariiin

.travis.yml

@@ -45,12 +45,3 @@ install:
 
 script:
     - sbt native-build android:package-release
-deploy:
-  provider: releases
-  api_key:
-    secure: 
-fHITx5JBIyE4dTXsIui9pNUjiPY/KCQUyf1drvZe0b6lYq4JG+Vd/4gsYKDU64UYFtVFLAmWb1/arii9LGRJep8zlbXwawmTyJFzFA4FMTfiwPYlHv2E9ZDsuMEdz4cNUJ3ZxtMipV18/B5db42/sNf9mjeoulBYiWSVQF5Ef5EVZBFpUVTT4xuXBzDANS6URfdi6WVDlrKfSP6EzCwgsKL+T8igrQXAMeFySAM3247jsgAVvFjxaP32F5F4ShP+bFz8JhS7+XxViitXFenX7QG7gW6C2W90SIMkkfsyevwOJMwgbbZMWYRBlX6JoPubIFZ4x3U0pDRPIfsENNjJRhysrU7Ps4LKpozprDHwbkkg0rlSmk7UZvpmuFv5LCsasWIYuvIL7kS3jBiOrC0qAXvEDWugY3gPA1umDg2oLytA6B+LtDmbWZPMrczZAgea9D6eWoH1x2DG0OtU68S6kF11h3RH4RheK28Xk6qcxT5Up27B1Mmvl44ScWo7IBdCd91pyllYWT88ktPQXdcBGUTop5fdQ5cKs9P4AEtw2h1uXOCCEoyOzOWz6m88U7hEh1F/86DecYEhQ2xWZQutRvkg8Rn6cx7QV7nElrT8hrK+P38K845MjKDn8/d+HDwyJ+fk11lbQamwRf7DOA9a0tZYj4imNCv2zGIC0sEPs4Y=
-  file: "/home/travis/build/milkice233/shadowsocksr-android/target/android/output/shadowsocksr-release.apk"
-  skip_cleanup: true
-  on:
-    tags: true

build.sbt

@@ -6,7 +6,7 @@ android.useSupportVectors
 
 name := "shadowsocksr"
 
-applicationId := "in.zhaoj.shadowsocksr.nobackground"
+applicationId := "in.zhaoj.shadowsocksrr"
 
 platformTarget := "android-25"
 

src/main/AndroidManifest.xml

@@ -76,11 +76,11 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.intent.action.SORT"/>
+                <action android:name="in.zhaoj.shadowsocksrr.intent.action.SORT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.intent.action.SCAN"/>
+                <action android:name="in.zhaoj.shadowsocksrr.intent.action.SCAN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
@@ -134,7 +134,7 @@
                   android:taskAffinity=""
                   android:theme="@style/PopupTheme.QuickSwitch">
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.QUICK_SWITCH" />
+                <action android:name="in.zhaoj.shadowsocksrr.QUICK_SWITCH" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>

src/main/jni/Android.mk

@@ -607,8 +607,8 @@ LOCAL_CFLAGS :=  	-fPIC -pthread -ldl -Wl,--no-as-needed -Wl,-soname=libproxycha
 									-I$(LOCAL_PATH)/include/proxychains \
 									-I$(LOCAL_PATH)/proxychains/src \
 				   				-I$(LOCAL_PATH)/libancillary \
-									-DLIB_DIR=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/lib\" -DINSTALL_PREFIX=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/\" \
-									-DDLL_NAME=\"libproxychains4.so\" -DSYSCONFDIR=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/\"
+									-DLIB_DIR=\"/data/user/0/in.zhaoj.shadowsocksrr/lib\" -DINSTALL_PREFIX=\"/data/user/0/in.zhaoj.shadowsocksrr/\" \
+									-DDLL_NAME=\"libproxychains4.so\" -DSYSCONFDIR=\"/data/user/0/in.zhaoj.shadowsocksrr/\"
 
 LOCAL_STATIC_LIBRARIES := libancillary
 

src/main/res/xml/pref_all.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res/in.zhaoj.shadowsocksr.nobackground">
+                  xmlns:app="http://schemas.android.com/apk/res/in.zhaoj.shadowsocksrr">
 
     <PreferenceCategory
             android:title="@string/proxy_cat">

src/main/res/xml/shortcuts.xml

@@ -5,15 +5,15 @@
               android:shortcutShortLabel="@string/quick_toggle"
               android:shortcutLongLabel="@string/quick_toggle">
         <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="in.zhaoj.shadowsocksr.nobackground"
+                android:targetPackage="in.zhaoj.shadowsocksrr"
                 android:targetClass="com.github.shadowsocks.QuickToggleShortcut" />
     </shortcut>
     <shortcut android:shortcutId="switch"
               android:icon="@drawable/ic_qu_shadowsocks_launcher"
               android:shortcutShortLabel="@string/quick_switch"
               android:shortcutLongLabel="@string/quick_switch">
         <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="in.zhaoj.shadowsocksr.nobackground"
+                android:targetPackage="in.zhaoj.shadowsocksrr"
                 android:targetClass="com.github.shadowsocks.ShadowsocksQuickSwitchActivity" />
     </shortcut>
     <shortcut android:shortcutId="scan"
@@ -22,9 +22,9 @@
               android:shortcutLongLabel="@string/add_profile_methods_scan_qr_code">
         <intent android:action="android.intent.action.MAIN"
                 android:targetClass="com.github.shadowsocks.Shadowsocks"
-                android:targetPackage="in.zhaoj.shadowsocksr.nobackground" />
-        <intent android:action="in.zhaoj.shadowsocksr.nobackground.intent.action.SCAN"
-                android:targetPackage="in.zhaoj.shadowsocksr.nobackground"
+                android:targetPackage="in.zhaoj.shadowsocksrr" />
+        <intent android:action="in.zhaoj.shadowsocksrr.intent.action.SCAN"
+                android:targetPackage="in.zhaoj.shadowsocksrr"
                 android:targetClass="com.github.shadowsocks.ProfileManagerActivity" />
     </shortcut>
 </shortcuts>

src/main/scala/com/github/shadowsocks/utils/Constants.scala

@@ -214,11 +214,11 @@ object State {
 }
 
 object Action {
-  val SERVICE = "in.zhaoj.shadowsocksr.nobackground.SERVICE"
-  val CLOSE = "in.zhaoj.shadowsocksr.nobackground.CLOSE"
-  val QUICK_SWITCH = "in.zhaoj.shadowsocksr.nobackground.QUICK_SWITCH"
-  val SCAN = "in.zhaoj.shadowsocksr.nobackground.intent.action.SCAN"
-  val SORT = "in.zhaoj.shadowsocksr.nobackground.intent.action.SORT"
+  val SERVICE = "in.zhaoj.shadowsocksrr.SERVICE"
+  val CLOSE = "in.zhaoj.shadowsocksrr.CLOSE"
+  val QUICK_SWITCH = "in.zhaoj.shadowsocksrr.QUICK_SWITCH"
+  val SCAN = "in.zhaoj.shadowsocksrr.intent.action.SCAN"
+  val SORT = "in.zhaoj.shadowsocksrr.intent.action.SORT"
 }
 
 object Route {