Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stable-v0.95' into 'stable-v0.95'

Browse Source 
Hotfixes for 0.95.1

These fixes are rather simple, but just to be sure.

I'll release and push 0.95.1 once these are merged. I don't think any other important fixes need to make it into that release.

Ping @pserwylo @eighthave

See merge request !115
This commit is contained in:
Daniel Martí 2015-08-09 18:53:35 +00:00
commit 9fc58ab22c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
F-Droid/AndroidManifest.xml
View File

@ -55,6 +55,11 @@
<uses-permission android:name="android.permission.DELETE_PACKAGES" <uses-permission android:name="android.permission.DELETE_PACKAGES"
tools:ignore="ProtectedPermissions"/> tools:ignore="ProtectedPermissions"/>
<!-- Indicate that F-Droid may request root access (introduced by Koush's Superuser app)
This permission is deprecated, but necessary for some old superuser
apps to actually grant superuser access to F-Droid. -->
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
<application <application
android:name="FDroidApp" android:name="FDroidApp"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"

1
F-Droid/src/org/fdroid/fdroid/FDroidApp.java
View File

@ -86,6 +86,7 @@ public class FDroidApp extends Application {
public enum Theme { public enum Theme {
dark, dark,
light, light,
lightWithDarkActionBar, // Obsolete
} }
private static Theme curTheme = Theme.light; private static Theme curTheme = Theme.light;

4
F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
View File

@ -107,7 +107,9 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
protected void onPostExecute(Boolean probablyRoot) { protected void onPostExecute(Boolean probablyRoot) {
super.onPostExecute(probablyRoot); super.onPostExecute(probablyRoot);
if (probablyRoot) { // TODO: remove false condition once the install into system
// process is stable - #294, #346, #347, #348
if (false && probablyRoot) {
// looks like we have root, at least su has a version number and is present // looks like we have root, at least su has a version number and is present
Intent installIntent = new Intent(context, InstallIntoSystemDialogActivity.class); Intent installIntent = new Intent(context, InstallIntoSystemDialogActivity.class);