Merge remote-tracking branch 'upstream/master'

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
     android:installLocation="internalOnly"
-    android:versionCode="399"
-    android:versionName="2.99.31" >
+    android:versionCode="403"
+    android:versionName="2.99.34" >
 
     <uses-sdk
         android:minSdkVersion="15"

CHANGELOG.md

@@ -46,14 +46,32 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www
 
 **Next release**
 
+* Added support for [Mahdi ROM](https://plus.google.com/u/0/communities/116540622179206449806)
+* Updated in application documentation
+* Updated French translation
+* Updated traditional Chinese translation
+
+[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
+
+**Version 2.99.34 BETA**
+
+* Displaying if an application has specific fake values ([issue](/../../issues/1831))
+* Allow own package name for *Srv_getPackageInfo* and *Srv_getApplicationInfo*
+* Updated Dutch translation
+
+**Version 2.99.33 BETA**
+
+* Fixed crash caused by legacy restrictions ([issue](/../../issues/1893))
+* Updated Slovak translation
+
+**Version 2.99.32 BETA**
+
 * Added parameter package name to *Srv_getPackageInfo* and *Srv_getApplicationInfo*
 * Added support for [Android Revolution HD](http://forum.xda-developers.com/showthread.php?t=1925402)
 * Fixed all problems reported through the debug info
 * Updated French translation
 * Updated German translation
 
-[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
-
 **Version 2.99.31 BETA**
 
 * Flush will clear the asked once cache too
@@ -187,8 +205,20 @@ XPrivacy 2
 
 **Next release**
 
+* Displaying if an application has specific fake values ([issue](/../../issues/1831))
+* Allow own package name for *Srv_getPackageInfo* and *Srv_getApplicationInfo*
+* Updated in application documentation
+* Updated Dutch translation
+* Updated French translation
+* Updated traditional Chinese translation
+
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
+**Version 2.2.12 BETA**
+
+* Fixed crash caused by legacy restrictions ([issue](/../../issues/1893))
+* Updated Slovak translation
+
 **Version 2.2.11 BETA**
 
 * Filtering restrictions available from version 2.99.x only (reported on XDA)

README.md

@@ -725,6 +725,7 @@ No, because it's too difficult to implement something like XPrivacy on these OS'
 * Wi-Fi settings
 * Bluetooth settings
 * shortcuts
+* autostarting
 * starting other applications
 * Android version
 * vibration
@@ -968,6 +969,7 @@ Expert mode has the following sub-options which can be toggled individually:
 		* *freeze*: shows the on demand restriction dialog, even if there is the possibility it will freeze
 		* *resolve*, *noresolve*: enabled/disables resolving IP addresses to names for usage data / on demand restricting
 		* *test*: let check for updates check for test versions
+		* *safemode*: hide unsafe function restrictions
 
 <a name="FAQ58"></a>
 **(58) Can I write a thesis about XPrivacy?**
@@ -1144,6 +1146,7 @@ Nevertheless, the most sensitive data, like contacts and your location, can safe
 	* [Liquid Smooth](http://liquidsmooth.net/)
 	* [Paranoid Android](http://paranoidandroid.co/)
 	* [Android Revolution HD](http://forum.xda-developers.com/showthread.php?t=1925402)
+	* [Mahdi ROM](https://plus.google.com/u/0/communities/116540622179206449806)
 * Compatibility mode = all other Android versions/variants
 
 *About* will show if XPrivacy 3 is running in compatibility mode, which means XPrivacy 3 is behaving as XPrivay 2.
@@ -1279,6 +1282,11 @@ XPrivacy can restrict more data than any of the above solutions,
 also for closed source applications and libraries, like Google Play services.
 Unlike any other solution, XPrivacy has [crowd sourced restrictions](http://crowd.xprivacy.eu/).
 
+I do not recommend using XPrivacy in combination with any of the similar solutions, because this could result in conflicts and potential data leaks.
+
+I need all my time developing XPrivacy, so I will not test XPrivacy along side any of the similar solutions.
+If you test XPrivacy along side any of the similar solutions, you can probably help others by reporting your test results.
+
 News
 ----
 

res/layout/help.xml

@@ -186,6 +186,36 @@
                 android:textIsSelectable="false" />
         </LinearLayout>
 
+        <!-- application setting -->
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <LinearLayout
+                android:layout_width="48dip"
+                android:layout_height="48dip"
+                android:gravity="center_vertical|center_horizontal"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:layout_width="32dip"
+                    android:layout_height="32dip"
+                    android:contentDescription="@string/help_settings"
+                    android:src="@android:drawable/ic_menu_edit" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="48dip"
+                android:gravity="center_vertical"
+                android:paddingLeft="6dip"
+                android:text="@string/help_settings"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="false" />
+        </LinearLayout>
+
         <!-- dangerous -->
 
         <LinearLayout
@@ -218,8 +248,10 @@
             android:paddingTop="2dip" >
 
             <View
-                android:layout_width="48dip"
+                android:layout_width="12dip"
                 android:layout_height="48dip"
+                android:layout_marginLeft="18dip"
+                android:layout_marginRight="18dip"
                 android:background="?attr/color_state_attention" />
 
             <TextView
@@ -239,8 +271,10 @@
             android:paddingTop="2dip" >
 
             <View
-                android:layout_width="48dip"
+                android:layout_width="12dip"
                 android:layout_height="48dip"
+                android:layout_marginLeft="18dip"
+                android:layout_marginRight="18dip"
                 android:background="?attr/color_state_restricted" />
 
             <TextView
@@ -260,8 +294,10 @@
             android:paddingTop="2dip" >
 
             <View
-                android:layout_width="48dip"
+                android:layout_width="12dip"
                 android:layout_height="48dip"
+                android:layout_marginLeft="18dip"
+                android:layout_marginRight="18dip"
                 android:background="?attr/color_state_shared" />
 
             <TextView

res/layout/mainentry.xml

@@ -90,6 +90,16 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 tools:ignore="NestedWeights" />
 
+            <ImageView
+                android:id="@+id/imgSettings"
+                android:layout_width="24dip"
+                android:layout_height="24dip"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/help_application"
+                android:paddingLeft="3dip"
+                android:src="@android:drawable/ic_menu_edit"
+                android:visibility="gone" />
+
             <ImageView
                 android:id="@+id/imgCbRestricted"
                 android:layout_width="32dip"

res/values-ar/strings.xml

@@ -230,6 +230,7 @@
     <string name="help_attention">قيود تحتاج لعناية</string>
     <string name="help_restricted">القيود التي تم تغييرها</string>
     <string name="help_shared">القيود تم تسجيلها</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">إختر الفئة لتقييدها</string>
     <string name="tutorial_mainlist">إلمس مربع الإختيار لتقييد الفئة المحددة للتطبيق\n
 \nوسوف يتم إعطاء بيانات فارغة أو وهمية للفئات المقيدة\n

res/values-bg/strings.xml

@@ -230,6 +230,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-ca/strings.xml

@@ -228,6 +228,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-cs/strings.xml

@@ -230,6 +230,7 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a
     <string name="help_attention">má omezení vyžadující pozornost</string>
     <string name="help_restricted">má změněné omezení</string>
     <string name="help_shared">má odeslané omezení</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Pro omezení zvolené kategorie aplikace stiskněte zaškrtávací pole\n
 \nV rámci omezených kategorií aplikace obdrží prázdné nebo falešné údaje\n

res/values-da/strings.xml

@@ -228,6 +228,7 @@
     <string name="help_attention">begrænsninger kræver need opmærksomhed</string>
     <string name="help_restricted">begrænsninger er ændret</string>
     <string name="help_shared">begrænsninger er indsendt</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Vælg kategorien du vil begrænse</string>
     <string name="tutorial_mainlist">Tryk på en checkboks for at begrænse den valgte kategori for en app\n
 \nApps vil blive fodret tom eller falsk data for begrænsede kategorier\n

res/values-de/strings.xml

@@ -230,6 +230,7 @@ dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne A
     <string name="help_attention">Beschränkungen sollten überprüft werden</string>
     <string name="help_restricted">Beschränkungen wurden geändert</string>
     <string name="help_shared">Beschränkungen wurden gesendet (Crowd)</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Wählen Sie die zu beschränkende Kategorie</string>
     <string name="tutorial_mainlist">Tippen Sie auf ein Kontrollkästchen, um die ausgewählte Kategorie für eine App zu beschränken\n
 \nApps werden mit leeren Listen oder manipulierten Daten für die beschränkten Kategorien \"gefüttert\" \n

res/values-ee/strings.xml

@@ -230,6 +230,7 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega.
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-el/strings.xml

@@ -230,6 +230,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-es/strings.xml

@@ -230,6 +230,7 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi
     <string name="help_attention">Las restricciones requieren su atención</string>
     <string name="help_restricted">Restricciones cambiadas</string>
     <string name="help_shared">Restricciones subidas</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Seleccione la categoría que quiere restringir</string>
     <string name="tutorial_mainlist">Pulsa un checkbox para restringir la categoría seleccionada para la aplicación\n
 \nLas aplicaciones no recibirán información o se les proporcionará información falsa\n

res/values-fa/strings.xml

@@ -232,6 +232,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-fi/strings.xml

@@ -229,6 +229,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-fr/strings.xml

@@ -135,7 +135,7 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p
     <string name="whitelist_url">URLs</string>
     <string name="whitelist_transaction">Transactions</string>
     <string name="whitelist_permission">Permissions</string>
-    <string name="title_restrict">Cocher pour restreindre :</string>
+    <string name="title_restrict">Cocher pour restreindre / à la demande :</string>
     <string name="title_check_whitelist">Cocher pour permettre</string>
     <string name="title_fused">Filtrer utilisation des données</string>
     <string name="title_finternet">Filtrer ayant accès à Internet</string>
@@ -230,6 +230,7 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p
     <string name="help_attention">les restrictions ont besoin d\'attention</string>
     <string name="help_restricted">les restrictions sont changées</string>
     <string name="help_shared">les restrictions sont envoyées</string>
+    <string name="help_settings">a de fausses données définies spécifiquement</string>
     <string name="tutorial_mainheader">Sélectionnez la catégorie à restreindre.</string>
     <string name="tutorial_mainlist">Cocher une case pour restreindre la catégorie choisie pour l’appli.\n
 \nL’appli sera dupée par des données vides ou modifiées.\n

res/values-ga/strings.xml

@@ -230,6 +230,7 @@
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-he/strings.xml

@@ -230,6 +230,7 @@ however it is impossible to guarantee it will work flawless on each and every de
     <string name="help_attention">restrictions need attention</string>
     <string name="help_restricted">restrictions are changed</string>
     <string name="help_shared">restrictions are submitted</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Tap a check box to restrict the selected category for an app\n
 \nApps will be fed empty or fake data for restricted categories\n

res/values-hi/strings.xml

@@ -230,6 +230,7 @@
     <string name="help_attention">प्रतिबंध पर ध्यान आवश्यक</string>
     <string name="help_restricted">प्रतिबंध बदले गए</string>
     <string name="help_shared">प्रतिबंध submit हो गए</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">App कि चुनी गयी श्रेणी को प्रतिबंधित करने के लिए checkbox tap करे\n
 \nप्रतिबंधित श्रेणी के लिए Apps को खाली या नकली डेटा दिया जायेगा\n

res/values-hr/strings.xml

@@ -229,6 +229,7 @@
     <string name="help_attention">ograničenja zahtijevaju pažnju</string>
     <string name="help_restricted">ograničenja su promijenjena</string>
     <string name="help_shared">ograničenja su izvezena</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Odaberite kategoriju za ograničiti</string>
     <string name="tutorial_mainlist">Dodirnite kućicu za ograničavanje odabrane kategorije za aplikaciju\n\nAplikacijama će biti predani prazne ili lažni podaci\n\nDodirnite ikonu aplikacije za detaljan prikaz ograničenja i podešenja</string>
     <string name="tutorial_detailsheader">Odaberite ikonu aplikacije za više mogućnosti</string>

res/values-hu/strings.xml

@@ -230,6 +230,7 @@ de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön 
     <string name="help_attention">a korlátozásoknak beavatkozásra van szükségük</string>
     <string name="help_restricted">korlátozások megváltoztatva</string>
     <string name="help_shared">korlátozások beküldve</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Select the category to restrict</string>
     <string name="tutorial_mainlist">Kattintson a jelölőnégyzetre a kategória korlátozásához egy alkalmazásnál\n
 \nAz alkalmazások feltöltődnek üres vagy kamu adatokkal a korlátozott kategóriákban\n

res/values-it/strings.xml

@@ -230,6 +230,7 @@ tuttavia non è possibile garantire che funzioni perfettamente su qualunque disp
     <string name="help_attention">restrizioni necessitano di attenzione</string>
     <string name="help_restricted">restrizioni modificate</string>
     <string name="help_shared">restrizioni inviate</string>
+    <string name="help_settings">has application specific fake values</string>
     <string name="tutorial_mainheader">Seleziona la categoria da restringere</string>
     <string name="tutorial_mainlist">Tocca la casella di controllo per restringere la categoria selezionata per un\'applicazione\n
 \nAlle applicazioni verranno forniti dati vuoti o alterati per le categorie ristrette\n